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
This commit is contained in:
@@ -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) {
|
||||
|
||||
Reference in New Issue
Block a user