From 6f4596b060145889a10c9e825696b3448f3fb8b2 Mon Sep 17 00:00:00 2001 From: Gagan290 Date: Fri, 6 Jan 2017 18:20:43 +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 | 6 +++--- 1 file changed, 3 insertions(+), 3 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 99f15b1..246218e 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java @@ -1458,9 +1458,9 @@ public class GSKOrangeDB extends SQLiteOpenHelper { values.put("STORE_ID", Integer.parseInt(data.getStore_id())); values.put("PROMO_ID", Integer.parseInt(data.getPromo_id())); values.put("PROMO", data.getPromo()); - values.put("IN_STOCK_VALUE", Integer.parseInt(data.getPromo())); - values.put("PROMO_ANNOUNCER_VALUE", Integer.parseInt(data.getPromo())); - values.put("RUNNING_POS_VALUE", Integer.parseInt(data.getPromo())); + values.put("IN_STOCK_VALUE", Integer.parseInt(data.getIn_stock())); + values.put("PROMO_ANNOUNCER_VALUE", Integer.parseInt(data.getPromo_announcer())); + values.put("RUNNING_POS_VALUE", Integer.parseInt(data.getRunning_pos())); db.insert(CommonString.TABLE_INSERT_ADDITIONAL_PROMO_COMPLIANCE, null, values); } catch (Exception ex) {