Commit Graph

337 Commits

Author SHA1 Message Date
YadavendraSinghYaduvanshi 3c901931ec Merge branch 'master' into GG_StockFacing_PlanogramTracker 2017-02-03 11:42:06 +05:30
Gagan290 d4ca1184cf //PromoCompliance Default Toggle Changes 2017-02-03 11:01:17 +05:30
YadavendraSinghYaduvanshi 4e34174194 Update GSKOrangeDB.java 2017-02-02 16:09:15 +05:30
ashishandroid d7172316ea review 2017-02-02 16:00:08 +05:30
ashishandroid 4bbc524824 review 2017-02-02 15:52:49 +05:30
ashishandroid 8fa42b16d6 review 2017-02-02 15:34:17 +05:30
Gagan290 5fca35c584 //PromoCompliance Default Toggle Changes 2017-02-02 12:29:55 +05:30
YadavendraSinghYaduvanshi 33f6dbb65f Merge branch 'master' into GG_T2P_Add_Camera 2017-02-01 13:43:16 +05:30
yadavendras 033f55adbc Merge branch 'master' of https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV1 into ysy_turk
# Conflicts:
#	GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java
2017-02-01 12:22:19 +05:30
Gagan290 f86f832b61 //Stock_FacingActivity Changes today 2017-01-31 18:01:49 +05:30
ashishchauhan009 c0d24675e5 Merge pull request #102 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/ac_settings
newcode
2017-01-25 19:14:05 +05:30
ashishandroid d71e92dc02 newcode 2017-01-25 19:01:41 +05:30
ashishchauhan009 68b1e9e756 Merge branch 'master' into StoreLISTAC 2017-01-25 18:18:45 +05:30
ashishandroid e07c6bc10e newcode 2017-01-25 18:16:14 +05:30
ashishandroid 56b5a42ff1 newcode 2017-01-25 11:24:41 +05:30
ashishandroid 5a00e4c298 newcode 2017-01-25 10:57:49 +05:30
yadavendras 16bdac6be1 Merge branch 'master' of https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV1 into ysy_turk
# Conflicts:
#	GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java
2017-01-25 10:47:58 +05:30
yadavendras c5efee08d6 Merge branch 'master' of https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV1 into ysy_turk
# Conflicts:
#	GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java
2017-01-24 17:28:56 +05:30
Gagan290 99b7c5788f //Stock_FacingActivity Changes today 2017-01-24 16:46:05 +05:30
Gagan290 423d80fd63 //Stock_FacingActivity Changes today 2017-01-24 16:31:34 +05:30
Gagan290 01b5ff071f //Stock_FacingActivity Changes today 2017-01-24 12:58:25 +05:30
Gagan290 4edb3666df //Stock_FacingActivity Changes today 2017-01-24 11:49:43 +05:30
ashishandroid f325d1d385 Merge branch 'master' of https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV1 into NewCODE 2017-01-23 17:38:20 +05:30
ashishandroid 7df66f1d5f newcode 2017-01-23 17:37:48 +05:30
Gagan290 7d6b772fa8 //Stock_FacingActivity Changes today 2017-01-23 17:35:59 +05:30
Gagan290 13c8c92e1e //Stock_FacingActivity Changes today 2017-01-23 10:33:08 +05:30
Yadavendra 1daef6b79b now title on main activity changes according to language 2017-01-23 00:16:39 +05:30
yadavendras 3ab90e2e9a T2P upload data newss 2017-01-21 16:34:50 +05:30
YadavendraSinghYaduvanshi 24f41426ef Merge pull request #91 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/ysy_new
T2P upload data newss
2017-01-21 16:18:51 +05:30
YadavendraSinghYaduvanshi 622c21e35e Merge pull request #90 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/finalBYAC
newcode
2017-01-21 16:15:36 +05:30
yadavendras cbc99474f5 T2P upload data newss 2017-01-21 16:14:43 +05:30
Gagan290 6c94212f60 //Stock_FacingActivity Changes today 2017-01-21 16:13:58 +05:30
Gagan290 53e769d234 //Stock_FacingActivity Changes today 2017-01-21 16:13:20 +05:30
ashishandroid 5b3b47dc1e newcode 2017-01-21 16:10:23 +05:30
YadavendraSinghYaduvanshi e286234be1 Merge branch 'master' into ysy_camera 2017-01-21 14:57:38 +05:30
yadavendras f42be9e473 T2P upload data newss 2017-01-21 14:23:49 +05:30
YadavendraSinghYaduvanshi 12ef109266 Merge branch 'master' into saturdayNEWAC 2017-01-21 13:40:05 +05:30
ashishandroid 2321b02268 newcode 2017-01-21 13:36:56 +05:30
Gagan290 e31005fe18 //Stock_FacingActivity Changes today 2017-01-21 13:36:51 +05:30
Gagan290 2b7cfd7f72 //Stock_FacingActivity Changes today 2017-01-21 13:34:45 +05:30
ashishandroid b8a10b5699 newcode 2017-01-21 12:37:10 +05:30
ashishandroid d50198b218 newcode 2017-01-21 11:50:57 +05:30
YadavendraSinghYaduvanshi 9297c97bc8 Merge pull request #85 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/yy_temp
T2P upload data newss
2017-01-21 10:10:42 +05:30
yadavendras d9d0048f4a T2P upload data newss 2017-01-21 10:05:27 +05:30
Gagan290 fd4c806d8d //Stock_FacingActivity Changes today 2017-01-21 09:53:23 +05:30
YadavendraSinghYaduvanshi 32f6197a10 Merge branch 'master' into yy_temp 2017-01-20 18:18:34 +05:30
ashishandroid bac28fa8b5 newcode 2017-01-20 18:14:52 +05:30
yadavendras 577f59d2f1 T2P upload data newss 2017-01-20 18:14:10 +05:30
YadavendraSinghYaduvanshi f7d800efc6 Merge pull request #82 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GG_Promo_Tick
//Stock_FacingActivity Changes today
2017-01-20 18:01:17 +05:30
Gagan290 48ce56ef85 //Stock_FacingActivity Changes today 2017-01-20 17:59:12 +05:30