From 065e43ea5b5e198732792d4d394c149519f47b70 Mon Sep 17 00:00:00 2001 From: Gagan290 Date: Fri, 30 Dec 2016 13:42:13 +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 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 409addf..26cbea5 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java @@ -49,12 +49,13 @@ public class GSKOrangeDB extends SQLiteOpenHelper { public void onCreate(SQLiteDatabase db) { db.execSQL(TableBean.getJourneyPlan()); + + //Gagan db.execSQL(TableBean.getBrandMaster()); db.execSQL(TableBean.getSkuMaster()); db.execSQL(TableBean.getCategoryMaster()); db.execSQL(TableBean.getSubCategoryMaster()); db.execSQL(TableBean.getDisplayMaster()); - db.execSQL(TableBean.getMappingStock()); db.execSQL(TableBean.getMappingT2p()); }