Commit Graph

200 Commits

Author SHA1 Message Date
gagangoel290 adc58aa2d4 Update StoreWisePerformanceActivity.java 2017-01-13 17:06:57 +05:30
gagangoel290 15f98f76d4 Update Stock_FacingActivity.java 2017-01-13 17:05:58 +05:30
gagangoel290 d9dda1b0a2 Update PromoComplianceActivity.java 2017-01-13 17:04:22 +05:30
gagangoel290 c209f800d8 Update MSL_AvailabilityActivity.java 2017-01-13 17:00:30 +05:30
gagangoel290 20707a2c97 Update CategoryWisePerformanceActivity.java 2017-01-13 16:57:58 +05:30
YadavendraSinghYaduvanshi 14931cde7b Merge pull request #47 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GG_MappingPlanogram_DialogDisplay
Gg mapping planogram dialog display
2017-01-13 16:02:12 +05:30
YadavendraSinghYaduvanshi cb53b7acf5 Merge branch 'master' into GG_MappingPlanogram_DialogDisplay 2017-01-13 16:02:04 +05:30
YadavendraSinghYaduvanshi 8f9c86d368 Merge pull request #46 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/ysy_latest_setting
T2P upload data newss
2017-01-13 15:58:15 +05:30
yadavendras e4d980a5f2 T2P upload data newss 2017-01-13 15:55:02 +05:30
YadavendraSinghYaduvanshi 14ab8a3de2 Merge pull request #45 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/ysy_xlatest
T2P upload data newss
2017-01-13 15:55:00 +05:30
YadavendraSinghYaduvanshi 06f2902c18 Merge branch 'master' into ysy_xlatest 2017-01-13 15:54:16 +05:30
Gagan290 c10d401354 Merge branch 'master' of https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV1 into GG_Update_Manifest
# Conflicts:
#	GSKMTOrange/src/main/AndroidManifest.xml
2017-01-13 15:49:51 +05:30
Gagan290 ce531be3df Merge branch 'master' of https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV1 into GG_Update_Manifest
# Conflicts:
#	GSKMTOrange/src/main/AndroidManifest.xml
2017-01-13 15:10:38 +05:30
Gagan290 a9f187943c Merge branch 'master' of https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV1 into GG_Update_Manifest
# Conflicts:
#	GSKMTOrange/src/main/AndroidManifest.xml
2017-01-13 12:12:46 +05:30
Gagan290 e4a80d6e1b Merge branch 'master' of https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV1 into GG_Update_Manifest
# Conflicts:
#	GSKMTOrange/src/main/AndroidManifest.xml
2017-01-13 10:19:25 +05:30
Gagan290 af4271360a Merge branch 'master' of https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV1 into GG_Update_Manifest
# Conflicts:
#	GSKMTOrange/src/main/AndroidManifest.xml
2017-01-13 10:07:07 +05:30
yadavendras 6d47719735 T2P upload data newss 2017-01-12 19:37:08 +05:30
YadavendraSinghYaduvanshi 18c68a6271 Merge pull request #44 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/ysy_total
T2P upload data newss
2017-01-12 19:09:13 +05:30
YadavendraSinghYaduvanshi 264814cbd2 Merge branch 'master' into ysy_total 2017-01-12 19:09:06 +05:30
yadavendras d3606ada7b T2P upload data newss 2017-01-12 19:05:45 +05:30
YadavendraSinghYaduvanshi b8765256a6 Update string.xml 2017-01-12 18:54:13 +05:30
YadavendraSinghYaduvanshi dfbc916266 Update DailyDataMenuActivity.java 2017-01-12 18:51:29 +05:30
YadavendraSinghYaduvanshi 5a02ac0d6b Merge pull request #43 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/AShishNewBranch
newcode
2017-01-12 18:45:33 +05:30
YadavendraSinghYaduvanshi 9e55ad63ab Merge branch 'master' into AShishNewBranch 2017-01-12 18:45:26 +05:30
YadavendraSinghYaduvanshi 5f9ca8db6e Merge pull request #42 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/ysy_upload_new
T2P upload data news
2017-01-12 18:41:17 +05:30
YadavendraSinghYaduvanshi 52e245fd8e Merge branch 'master' into ysy_upload_new 2017-01-12 18:41:10 +05:30
ashishandroid 88eff88838 newcode 2017-01-12 18:40:18 +05:30
yadavendras 5db229d980 T2P upload data news 2017-01-12 18:29:02 +05:30
YadavendraSinghYaduvanshi 4c243ab49b Merge pull request #41 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/ysy_upload_new
T2P upload data new
2017-01-12 17:55:18 +05:30
YadavendraSinghYaduvanshi 1f34b4fd91 Merge branch 'master' into ysy_upload_new 2017-01-12 17:55:00 +05:30
yadavendras 96b2ff2eb6 T2P upload data new 2017-01-12 17:49:12 +05:30
YadavendraSinghYaduvanshi 53d0eac19a Merge pull request #40 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GG_MappingPlanogram
Gg mapping planogram
2017-01-12 17:48:15 +05:30
Gagan290 1c48f2f8ad Merge branch 'master' of https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV1 into GG_Update_Manifest
# Conflicts:
#	GSKMTOrange/src/main/AndroidManifest.xml
2017-01-12 17:04:24 +05:30
Gagan290 11455f7702 Merge branch 'master' of https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV1 into GG_Update_Manifest
# Conflicts:
#	GSKMTOrange/src/main/AndroidManifest.xml
2017-01-12 13:22:38 +05:30
Gagan290 046b361e80 Merge branch 'master' of https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV1 into GG_Update_Manifest
# Conflicts:
#	GSKMTOrange/src/main/AndroidManifest.xml
2017-01-12 13:21:37 +05:30
Gagan290 3a2fb11823 Merge branch 'master' of https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV1 into GG_Update_Manifest
# Conflicts:
#	GSKMTOrange/src/main/AndroidManifest.xml
2017-01-12 13:21:02 +05:30
Gagan290 2b7f9fe882 Merge branch 'master' of https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV1 into GG_Update_Manifest
# Conflicts:
#	GSKMTOrange/src/main/AndroidManifest.xml
2017-01-12 13:04:42 +05:30
YadavendraSinghYaduvanshi dc4057b97d Merge pull request #39 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GG_StockFacing_MSL_Availability_Change
Gg stock facing msl availability change
2017-01-12 13:01:21 +05:30
YadavendraSinghYaduvanshi a5f158ad3b Merge pull request #38 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/ysy_T2P_upload
T2P upload data
2017-01-12 12:38:11 +05:30
YadavendraSinghYaduvanshi bb08eb983a Merge branch 'master' into ysy_T2P_upload 2017-01-12 12:38:05 +05:30
yadavendras 412c81ca4b T2P upload data 2017-01-12 12:28:09 +05:30
Gagan290 9384adeec3 Merge branch 'master' of https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV1 into GG_Update_Manifest
# Conflicts:
#	GSKMTOrange/src/main/AndroidManifest.xml
2017-01-12 12:04:18 +05:30
YadavendraSinghYaduvanshi 740d384df7 Delete PDR_done.png 2017-01-12 10:23:01 +05:30
YadavendraSinghYaduvanshi fb8dce4660 Delete PDR.png 2017-01-12 10:22:48 +05:30
YadavendraSinghYaduvanshi 9b06016641 Delete OHC_done.png 2017-01-12 10:22:36 +05:30
YadavendraSinghYaduvanshi 98afe0e18b Delete OHC.png 2017-01-12 10:22:22 +05:30
YadavendraSinghYaduvanshi cbaba8350b Delete HFD_done.png 2017-01-12 10:22:11 +05:30
YadavendraSinghYaduvanshi 6c33cfd2e8 Delete HFD.png 2017-01-12 10:21:59 +05:30
Gagan290 4a73e327ed Merge branch 'master' of https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV1 into GG_Update_Manifest
# Conflicts:
#	GSKMTOrange/src/main/AndroidManifest.xml
2017-01-12 10:19:00 +05:30
YadavendraSinghYaduvanshi 0623cf4919 Merge pull request #37 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GG_StorePerformance
Gg store performance
2017-01-12 10:07:44 +05:30