Commit Graph

422 Commits

Author SHA1 Message Date
Yan
178b3484be added license 2017-11-16 16:13:26 +06:30
Aung Myo
ccbdd5b2c8 update shift sale detail 2017-11-16 10:03:01 +06:30
Yan
c2095b4a61 adding license activation 2017-11-15 17:55:51 +06:30
Aung Myo
6f06e7a9d7 add booking list in transaction 2017-11-14 13:42:00 +06:30
Aung Myo
cb91ad307a update shop form 2017-11-09 14:40:15 +06:30
Yan
8aa834a487 delete btn for menu item instance 2017-11-07 17:31:14 +06:30
Aung Myo
97c03c1744 update survey 2017-11-07 14:49:42 +06:30
Aung Myo
b48625e25e update commission and seed for font 2017-11-07 10:31:10 +06:30
Aung Myo
b89340b85e update payment menthod report 2017-10-31 18:03:36 +06:30
yamin
1aea52619a UI change 2017-10-23 11:38:10 +06:30
Aung Myo
e3cf15c096 update admin bsb design 2017-10-16 11:41:53 +06:30
Yan
de1469bd5e Merge branch 'oqs' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui 2017-10-12 10:16:00 +06:30
Yan
476aafa791 add localization 2017-10-11 17:29:28 +06:30
Aung Myo
50756656a7 updat e addorder for product add 2017-10-10 18:05:09 +06:30
Yan
8966f290b5 pull origin master 2017-09-18 13:53:28 +06:30
Aung Myo
abde6745a4 update addorder modefined 2017-09-13 12:27:37 +06:30
Aung Myo
bbcce13a2e update addorder 2017-09-13 09:21:35 +06:30
Yan
a50becb365 merge with august_spring 2017-09-06 18:32:45 +06:30
Zin Lin Phyo
2e53b72574 Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring
* 'august_spring' of bitbucket.org:code2lab/sxrestaurant:
  Timepicker Bug Fix
  Show data in Edit
  Promotion Destory Bug Fix
2017-09-06 18:28:09 +06:30
Zin Lin Phyo
5e1e0cd5b9 stock_check report template 2017-09-06 18:27:58 +06:30
Phyo
4ca3b708c4 Show data in Edit 2017-09-06 17:01:33 +06:30
Zin Lin Phyo
784e740da3 rename in_juty to in_duty 2017-09-06 11:18:02 +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
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
Yan
e09559c508 merge with august spring but merge fail 2017-08-31 15:58:01 +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
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
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
Nweni
de45fb29b8 Update 2017-08-30 14:21:05 +06:30
Nweni
cabc78c373 inventory 2017-08-30 14:19:24 +06:30
Yan
7c5db11df5 merge with addorder 2017-08-29 18:08:05 +06:30
Aung Myo
2e48c1529e update addorder 2017-08-29 17:58:34 +06:30
Yan
bbd9a50868 merge with august spring 2017-08-28 18:33:49 +06:30
Yan
6472a2deac Merge branch 'addorder' of bitbucket.org:code2lab/sxrestaurant 2017-08-28 18:27:58 +06:30
Aung Myo
1372285c7f update add order 2017-08-28 18:27:22 +06:30
Zin Lin Phyo
63d97cce26 fix conflit 2017-08-28 18:22:32 +06:30
Zin Lin Phyo
1cbea173df product commission transaction in commissioner 2017-08-28 18:17:22 +06:30
yamin
81c928b375 InJutyUpdate 2017-08-28 17:55:47 +06:30
Zin Lin Phyo
36b4b15688 added commission report 2017-08-28 10:52:14 +06:30
Zin Lin Phyo
3131823ae0 commission update -> change route under settings 2017-08-28 09:46:36 +06:30
Nweni
c9998c0b65 Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring 2017-08-28 09:37:58 +06:30
Nweni
83ec17a3df inventory development 2017-08-28 09:37:36 +06:30
Zin Lin Phyo
ef9fe32b5b fix conflit 2017-08-25 13:46:50 +06:30
Zin Lin Phyo
b4eb27b8a9 commission in sale edit 2017-08-25 13:44:22 +06:30