Commit Graph

1055 Commits

Author SHA1 Message Date
phyusin
ed75030f57 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2017-12-07 15:29:34 +06:30
phyusin
e5e904e989 change orange color func: 2017-12-07 15:29:05 +06:30
Yan
cb0559a1ab rounding adj fix 2017-12-07 15:06:38 +06:30
phyusin
25473f33bf change alert for checkin process 2017-12-07 14:25:39 +06:30
Yan
e4b4a3d986 rounding adj in credit and other 2017-12-07 12:19:07 +06:30
Yan
69b786a91d shift update 2017-12-07 12:07:06 +06:30
Yan
93a735c55e Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant 2017-12-05 18:19:57 +06:30
Aung Myo
f4a7e1baa0 update sale item reoprt for item dis and foc 2017-12-05 18:19:18 +06:30
Yan
2cd86890fa checkin get method update 2017-12-05 18:10:01 +06:30
Aung Myo
97bb6ae211 update sale item xls 2017-12-05 16:28:21 +06:30
Yan
82657cdb8f Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant 2017-12-04 14:55:06 +06:30
Yan
9d27418e25 add menu item taxable 2017-12-04 14:54:47 +06:30
Aung Myo
79d7adf170 update sale item qty count update 2017-12-04 14:45:35 +06:30
Aung Myo
7ef75a285a update instanc code unique receipt bill and sale item 2017-12-04 12:18:20 +06:30
Yan
070ab18832 Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant 2017-12-01 18:54:32 +06:30
Yan
6493a648f9 oqs fix 2017-12-01 18:54:14 +06:30
Aung Myo
e30d468880 update sale payment report 2017-12-01 17:51:30 +06:30
Yan
43fd5f6cb2 Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant 2017-12-01 17:39:22 +06:30
Yan
6e8cc5afb2 Merge branch 'license' 2017-12-01 17:38:19 +06:30
phyusin
6f8f6940e4 remove edit controller for oqs print 2017-12-01 17:37:41 +06:30
Yan
4548813bfd license verify 2017-12-01 17:35:56 +06:30
phyusin
6bbac9d14c check OQS edit process 2017-12-01 16:23:50 +06:30
Yan
4b7cced87c license acti 2017-12-01 15:19:24 +06:30
phyusin
24284b4361 total account discount for close shift sale 2017-12-01 15:15:58 +06:30
Yan
7db4ace7b6 license 2017-12-01 14:15:06 +06:30
Yan
6fc3cdae06 Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant 2017-12-01 14:07:38 +06:30
Aung Myo
a687e77efa update ability and report xls 2017-12-01 13:54:58 +06:30
Aung Myo
3133248df0 update daily sale view 2017-12-01 12:07:03 +06:30
phyusin
a52a671e12 remove foc for other payment and show foc payment in shift sale report 2017-12-01 12:03:39 +06:30
Aung Myo
dbd3e3e69b update sale item with other charges 2017-12-01 11:47:17 +06:30
Aung Myo
3846b319af update conflix after pull 2017-12-01 09:23:07 +06:30
Yan
34450aa5d6 re-remove item discount for foc 2017-11-30 18:56:46 +06:30
Yan
769a4b7b4b check and no discount item when bill foc 2017-11-30 18:40:29 +06:30
Yan
72b8047754 remove check is taxable in sale item discount cal 2017-11-30 18:33:26 +06:30
Yan
f4116fe9fb oqs edit 2017-11-30 18:12:48 +06:30
Aung Myo
2e9847986d update paymentmenthd for foc 2017-11-30 17:58:42 +06:30
Yan
7552bbeefe Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant 2017-11-30 17:52:27 +06:30
Aung Myo
32aa3f581d update paymentmenthd for foc 2017-11-30 17:51:30 +06:30
Yan
caf7634d1b Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant 2017-11-30 17:35:16 +06:30
Yan
aa1d2e4f59 cloud change 2017-11-30 17:29:56 +06:30
Aung Myo
3ddd4121db update payment report 2017-11-30 17:24:15 +06:30
Aung Myo
5b9182c1d1 update rounding adj 2017-11-30 15:44:48 +06:30
Aung Myo
a871bf3789 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui 2017-11-30 12:05:28 +06:30
Yan
de9701100d to_i to to_f in shift 2017-11-30 11:23:44 +06:30
Aung Myo
7ce71a1960 update inventory hide and cancan update 2017-11-30 11:19:15 +06:30
Yan
313f745b6a Merge branch 'license' 2017-11-29 18:07:27 +06:30
Yan
29fa95d229 license activate 2017-11-29 17:59:46 +06:30
Yan
a1deab2b5e sale item 2017-11-29 11:36:31 +06:30
Yan
7740ab6ff7 add item instance code in sale item update 2017-11-29 11:22:54 +06:30
Yan
9bbdb22bfb Merge branch 'master' into license 2017-11-29 10:20:27 +06:30