Commit Graph

1672 Commits

Author SHA1 Message Date
Phyo
2eaf891748 Promotion multiple order 2017-09-04 10:22:54 +06:30
Aung Myo
d715809b20 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into oqs 2017-09-01 16:57:04 +06:30
Aung Myo
fc5192157b update 2017-09-01 16:55:51 +06:30
Yan
e9e7aec028 update item edit 2017-09-01 16:03:55 +06:30
Nweni
09ba513c1c fixed conflict 2017-09-01 09:42:10 +06:30
Nweni
ed17e5fd32 Update 2017-09-01 09:40:50 +06:30
Yan
3726e8a7c3 Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant 2017-08-31 18:09:35 +06:30
Zin Lin Phyo
0fbce1ca7c fix conflit 2017-08-31 18:07:05 +06:30
Zin Lin Phyo
0584530224 for pull 2017-08-31 18:06:13 +06:30
Phyo
e35378bd36 Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring 2017-08-31 18:05:43 +06:30
Yan
db248d69cd Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant 2017-08-31 17:18:23 +06:30
yamin
21a9f77c59 Update 2017-08-31 17:05:07 +06:30
yamin
b311df9a0b promotionDay 2017-08-31 16:59:32 +06:30
Yan
e09559c508 merge with august spring but merge fail 2017-08-31 15:58:01 +06:30
Nweni
a1341d0b10 fixed conflict 2017-08-31 15:30:02 +06:30
Nweni
12c8be597d Inventory Stock Check Print 2017-08-31 15:29:36 +06:30
Zin Lin Phyo
d1003e2f6a move load_commissioner to origamin/product_commission 2017-08-31 14:15:09 +06:30
Phyo
dd19b52ebd Promotion Index View Change 2017-08-31 14:03:43 +06:30
Aung Myo
2be93e413d Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into oqs 2017-08-31 13:48:24 +06:30
Aung Myo
122c4b72fd updat 2017-08-31 13:47:55 +06:30
Yan
2b3c294327 Merge branch 'addorder' of bitbucket.org:code2lab/sxrestaurant 2017-08-31 12:10:31 +06:30
Yan
2399f1d494 update form attr name to attr id to instances 2017-08-31 11:41:38 +06:30
Aung Myo
449969fa5b update addorder 2017-08-31 11:22:12 +06:30
Zin Lin Phyo
4b74f2c128 fix conflit 2017-08-31 10:23:19 +06:30
Zin Lin Phyo
2ee08e943d for pull 2017-08-31 10:22:21 +06:30
Phyo
012b771435 Set Auto Generate ID to exact 16 2017-08-31 10:07:44 +06:30
Nweni
65675a6683 Update 2017-08-31 09:22:40 +06:30
Nweni
d1172dae0d inventory 2017-08-31 09:21:24 +06:30
Yan
f50ca87e59 Merge branch 'addorder' of bitbucket.org:code2lab/sxrestaurant 2017-08-30 19:16:20 +06:30
Yan
51d8c986f1 merge with august_spring 2017-08-30 19:16:07 +06:30
Yan
3e8ead6a32 ui code review and edited 2017-08-30 19:04:06 +06:30
Phyo
883f5f575a Promotion by Instance 2017-08-30 18:57:35 +06:30
Aung Myo
84d483cad2 update addorder 2017-08-30 18:41:54 +06:30
Phyo
2f0a7c11ad Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring 2017-08-30 18:22:42 +06:30
Phyo
bf9f0cdbe7 CRUD Update for Promotion 2017-08-30 18:22:22 +06:30
Zin Lin Phyo
5a0ca4b39d fix conflit 2017-08-30 15:58:06 +06:30
Zin Lin Phyo
675ebd56a7 assign in_juty in sale edit 2017-08-30 15:57:15 +06:30
Nweni
bd00f16040 Update 2017-08-30 14:37:50 +06:30
Nweni
de45fb29b8 Update 2017-08-30 14:21:05 +06:30
Nweni
cabc78c373 inventory 2017-08-30 14:19:24 +06:30
Yan
c7018ee774 Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant 2017-08-30 11:14:11 +06:30
Zin Lin Phyo
bc84a384a5 Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring
* 'august_spring' of bitbucket.org:code2lab/sxrestaurant:
  Promo Phrase 1
2017-08-30 10:46:59 +06:30
Zin Lin Phyo
df4caa288d jquery date-time picker 2017-08-30 10:46:46 +06:30
Phyo
15e37f9ee2 Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring 2017-08-30 09:20:47 +06:30
Phyo
2208b8a526 Promo Phrase 1 2017-08-30 09:20:35 +06:30
Zin Lin Phyo
4b97cd530e commission report export excel 2017-08-29 23:05:03 +06:30
Yan
76fb16615d merge with august sprint for commission 2017-08-29 18:44:31 +06:30
Zin Lin Phyo
5fcfbdc020 fix conflit 2017-08-29 18:42:08 +06:30
Zin Lin Phyo
f03d8654e7 commission report 2017-08-29 18:36:46 +06:30
Yan
7c5db11df5 merge with addorder 2017-08-29 18:08:05 +06:30