Commit Graph

1487 Commits

Author SHA1 Message Date
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
83ed7abbde update rounding adj for foc 2017-12-01 18:51:09 +06:30
Aung Myo
bbfa6450d6 update rounding adj for foc 2017-12-01 17:39:10 +06:30
phyusin
6bbac9d14c check OQS edit process 2017-12-01 16:23:50 +06:30
phyusin
c5958f1599 add width for dailysale report 2017-12-01 15:06:52 +06:30
phyusin
62c0bc5836 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2017-12-01 14:15:13 +06:30
phyusin
534999b461 check foc when click Discount 2017-12-01 14:14:59 +06:30
Yan
6fc3cdae06 Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant 2017-12-01 14:07:38 +06:30
Yan
570fd04e25 Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant 2017-12-01 14:07:16 +06:30
Yan
b1217c19a2 add order for subcat 2017-12-01 13:57:56 +06:30
Aung Myo
a687e77efa update ability and report xls 2017-12-01 13:54:58 +06:30
Aung Myo
1dd920088b update conflic 2017-12-01 13:27:21 +06:30
Aung Myo
eecb896c23 update daily sale view 2017-12-01 13:25:56 +06:30
Yan
5257117e12 sub cat for add order 2017-12-01 13:22:01 +06:30
Aung Myo
3133248df0 update daily sale view 2017-12-01 12:07:03 +06:30
phyusin
e25be9e459 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2017-12-01 12:04:00 +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
Yan
c559222f36 add sub menu cat 2017-12-01 11:22:05 +06:30
Yan
f4116fe9fb oqs edit 2017-11-30 18:12:48 +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
Aung Myo
6cb7c1e0c4 update rounding adj 2017-11-30 12:05:01 +06:30
Yan
d15be90a9e Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant 2017-11-30 11:24:24 +06:30
Aung Myo
7ce71a1960 update inventory hide and cancan update 2017-11-30 11:19:15 +06:30
phyusin
0af1e5997f remove blank in account type 2017-11-30 11:18:08 +06:30
Aung Myo
67db27e35a Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui 2017-11-30 09:35:49 +06:30
Aung Myo
b3dae8c018 update paymentreport index 2017-11-30 09:34:51 +06:30
Yan
e4bebc2ca4 Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant 2017-11-29 18:26:35 +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
phyusin
ec1a8b6fc6 change card sale data in dashboard 2017-11-29 16:35:59 +06:30
phyusin
ea93de084e add font size for Total & Net Sales in close cashier and change closed time in transacctions 2017-11-29 14:11:56 +06:30
phyusin
75ee51fd9f change close cashier pdf and card sale in dashboard 2017-11-29 13:34:03 +06:30
Aung Myo
a759cda7c6 update daily sale report 2017-11-29 11:56:31 +06:30
Yan
9bbdb22bfb Merge branch 'master' into license 2017-11-29 10:20:27 +06:30
Yan
f29a5b95a4 Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant 2017-11-28 19:12:02 +06:30
Aung Myo
900efb3fa6 update report 2017-11-28 19:11:19 +06:30
Yan
f33be9e707 Merge branch 'master' into license 2017-11-28 17:07:58 +06:30
Yan
6cae1b613c javascript is card true 2017-11-28 16:47:12 +06:30
Yan
93db6130a1 some wrong in memberdiscount and no pay if any card payment 2017-11-28 15:57:19 +06:30
Yan
2e1ba833e8 remove recent amount in credit payment index 2017-11-28 15:05:02 +06:30
phyusin
ab337a3b8a add css for logout icon 2017-11-28 15:01:58 +06:30
phyusin
f669101d3c remove blank in collection select for menu item and menu item instance 2017-11-28 14:57:18 +06:30