Commit Graph

320 Commits

Author SHA1 Message Date
Yan
00c19fdd67 sub total fixed in origami shows 2017-06-26 14:16:22 +06:30
Yan
ecc9ab53ec Merge branch 'cancan' of bitbucket.org:code2lab/sxrestaurant 2017-06-26 09:59:16 +06:30
Yan
e01ecc6e0f merge origin master 2017-06-23 17:53:53 +06:30
Nweni
81c50f220a edit invoice 2017-06-23 17:37:08 +06:30
Yan
3a0e26b2ea accounts and discount updated 2017-06-23 17:05:08 +06:30
Aung Myo
01e5b7ba6c update authorize 2017-06-23 09:41:48 +06:30
Yan
139c3c997a Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-22 18:05:38 +06:30
Yan
5d60d620b4 add for room tab and complete 2017-06-22 18:03:16 +06:30
Yan
7bf2499e83 add options in oqs 2017-06-22 17:32:13 +06:30
Nweni
0c0e44c808 move table 2017-06-22 16:31:41 +06:30
Aung Myo
25b6a893f2 first cancan 2017-06-22 15:33:55 +06:30
Nweni
09252ba055 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-22 14:27:12 +06:30
Nweni
0ea2b778d1 multiple sale and order 2017-06-22 14:26:23 +06:30
Aung Myo
187caa5253 update customre 2017-06-22 11:58:16 +06:30
Yan
de8f577786 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-22 09:53:04 +06:30
Yan
3f15e7bc6f Merge branch 'crm' of bitbucket.org:code2lab/sxrestaurant 2017-06-22 09:51:22 +06:30
Nweni
0ff10f2f32 move multiple order and sales 2017-06-22 05:51:42 +06:30
Nweni
168c571a23 multiple invoice 2017-06-22 05:24:31 +06:30
Yan
2525bfbdd9 discount updated 2017-06-21 20:30:12 +06:30
Aung Myo
a6912d4e5b update customer search in card no 2017-06-21 18:30:51 +06:30
Nweni
64210f30ac move table 2017-06-21 17:53:44 +06:30
Aung Myo
d2549df2e9 update receipt bill payment 2017-06-21 17:37:16 +06:30
Aung Myo
7c5456d712 assign table ,membership transaction and queue 2017-06-21 16:22:53 +06:30
Yan
e3b3ff76b2 add account_id to od_item and sale_item table 2017-06-21 14:49:01 +06:30
Aung Myo
6c4c817453 fixed fonflict 2017-06-21 10:22:43 +06:30
Aung Myo
4ab5c311eb update crm 2017-06-21 10:05:07 +06:30
Nweni
fa309fb89a move whole table 2017-06-21 05:36:58 +06:30
Nweni
f69bee9b03 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-20 19:00:02 +06:30
Nweni
a9e1d8c3d1 origami 2017-06-20 18:59:34 +06:30
Aung Myo
0e619f3f2a Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into crm 2017-06-20 17:59:14 +06:30
Aung Myo
33cb8b64a3 finished customer form and update 2017-06-20 17:57:50 +06:30
Yan
6528845d82 oqs updated 2017-06-20 15:58:50 +06:30
Yan
dd2a2e54a4 Merge branch 'settings_backend' of bitbucket.org:code2lab/sxrestaurant into staging 2017-06-20 14:21:58 +06:30
Yan
e43818fdf5 oqs updated 2017-06-20 13:33:41 +06:30
Phyo
80362f87fe Rebate Option 2017-06-20 13:22:27 +06:30
Aung Myo
faae996d5d Rebate balance in receipt 2017-06-20 11:31:02 +06:30
Nweni
bdb42daad7 dining facility model 2017-06-20 07:42:05 +06:30
Nweni
a71ee3657a origami changes 2017-06-20 07:36:38 +06:30
Yan
9089eab196 temp remove options in oqs 2017-06-19 17:36:39 +06:30
Nweni
2cc8d2c00c Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-19 15:56:57 +06:30
Nweni
35fc649df3 pg order 2017-06-19 15:56:45 +06:30
Yan
d8930cb2b5 still 2017-06-19 15:55:21 +06:30
Phyo
184dcb53a1 Conflict fix din settings_backend 2017-06-19 15:24:15 +06:30
Yan
b826b479cd update for oqs print 2017-06-19 12:07:43 +06:30
Yan
dd3c429301 control paypar url and oqs fix 2017-06-19 11:56:26 +06:30
Aung Myo
675d83c80f sale item report and rebate balance 2017-06-19 11:54:34 +06:30
Yan
b747845cbf merge with settings_backend 2017-06-19 11:15:28 +06:30
Yan
cf5854c2bb Merge branch 'crm' of bitbucket.org:code2lab/sxrestaurant 2017-06-19 11:06:39 +06:30
Aung Myo
6ffa73fa6f Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into crm 2017-06-18 20:18:12 +06:30
Yan
b65d127fd0 bill print format and tax fix 2017-06-18 20:07:28 +06:30