From b22eb58f648a115fa98833a0f8def5ef61869bcd Mon Sep 17 00:00:00 2001
From: Gagan290 <gagan290@gmail.com>
Date: Fri, 6 Jan 2017 18:18:24 +0530
Subject: [PATCH] Merge branch 'master' of
 https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV1 into
 Category_G

# Conflicts:
#	GSKMTOrange/src/main/AndroidManifest.xml
#	GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java
---
 .../main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java   | 2 --
 .../main/java/cpm/com/gskmtorange/constant/CommonString.java  | 4 ++--
 .../gskmtorange/gsk_dailyentry/PromoComplianceActivity.java   | 1 -
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java
index b85c7f0..99f15b1 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java
@@ -1456,8 +1456,6 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
         ContentValues values = new ContentValues();
         try {
             values.put("STORE_ID", Integer.parseInt(data.getStore_id()));
-            values.put("SKU_ID", Integer.parseInt(data.getSku_id()));
-            values.put("SKU", data.getSku());
             values.put("PROMO_ID", Integer.parseInt(data.getPromo_id()));
             values.put("PROMO", data.getPromo());
             values.put("IN_STOCK_VALUE", Integer.parseInt(data.getPromo()));
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonString.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonString.java
index 0b46069..087a331 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonString.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonString.java
@@ -268,11 +268,11 @@ public class CommonString {
             + "STORE_ID"
             + " INTEGER,"
 
-            + "SKU_ID"
+            /*+ "SKU_ID"
             + " INTEGER,"
 
             + "SKU"
-            + " VARCHAR,"
+            + " VARCHAR,"*/
 
             + "PROMO_ID"
             + " INTEGER,"
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/PromoComplianceActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/PromoComplianceActivity.java
index e37fd66..6b2dc70 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/PromoComplianceActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/PromoComplianceActivity.java
@@ -192,7 +192,6 @@ public class PromoComplianceActivity extends AppCompatActivity {
         btn_add.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-
                 db.InsertAdditionalPromoData(cd);
                 AdditionalPromoListView();
             }