Commit Graph

255 Commits

Author SHA1 Message Date
Yan
58a8cdec6e still dev dis 2017-06-27 18:32:58 +06:30
Yan
def8ce34c2 Merge branch 'settings_backend' of bitbucket.org:code2lab/sxrestaurant 2017-06-27 12:07:35 +06:30
Phyo
7810fc693b Pending Payment 2017-06-27 12:06:18 +06:30
Yan
4f78c63b63 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-27 11:53:46 +06:30
Yan
e38886790c not show price 0 fixed 2017-06-27 11:52:51 +06:30
Nweni
463e8e5875 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-27 10:28:58 +06:30
Nweni
535a5825fb get update 2017-06-27 10:28:47 +06:30
Yan
e09dbb095c not to show price 0 and 10 2017-06-27 10:15:22 +06:30
Yan
6f741e0a0c Merge branch 'crm' of bitbucket.org:code2lab/sxrestaurant 2017-06-26 19:28:21 +06:30
Aung Myo
60fe3b9a67 update crmad ability 2017-06-26 19:22:16 +06:30
Zin Lin Phyo
5489da2066 route conflit fix 2017-06-26 18:02:08 +06:30
Zin Lin Phyo
feb1d66257 overall void 2017-06-26 18:00:48 +06:30
Nweni
089848ed4a credit note payment 2017-06-26 17:49:55 +06:30
Yan
e878275c1b Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-26 17:10:25 +06:30
Nweni
d4983fabf5 item void 2017-06-26 17:07:17 +06:30
Yan
c81663003f update in discount 2017-06-26 17:01:25 +06:30
Yan
0c2e299ced Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-26 16:37:02 +06:30
Nweni
04e44c4859 fixed conflict 2017-06-26 16:35:24 +06:30
Nweni
20afabd86d item void 2017-06-26 16:34:03 +06:30
Yan
813f2ecf2d merge with settings_backend 2017-06-26 14:46:31 +06:30
Phyo
46ad87314a Add color blue to orders 2017-06-26 14:39:25 +06:30
Yan
e1c981e8c2 merge with crm 2017-06-26 14:23:56 +06:30
Yan
00c19fdd67 sub total fixed in origami shows 2017-06-26 14:16:22 +06:30
Phyo
cb2124c6a6 refresh 10 sec 2017-06-26 12:57:36 +06:30
Phyo
a05fc0f646 Up to Amount bug fix 2017-06-26 12:55:44 +06:30
Phyo
5017549f86 Merge branch 'master' into settings_backend 2017-06-26 11:13:06 +06:30
Phyo
6e49f91b89 Multiple Invoices Phase 1 2017-06-26 11:10:49 +06:30
Aung Myo
12483aba97 update crm customer 2017-06-26 11:10:08 +06:30
Aung Myo
f426be57ab update crm 2017-06-26 10:21:56 +06:30
Yan
ecc9ab53ec Merge branch 'cancan' of bitbucket.org:code2lab/sxrestaurant 2017-06-26 09:59:16 +06:30
Yan
560ea343a6 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-26 09:55:56 +06:30
Nweni
c65c466399 edit 2017-06-26 06:28:09 +06:30
Yan
a91816bb4e qty edit in oqs 2017-06-25 22:41:26 +06:30
Aung Myo
d9c53e73f8 update customer 2017-06-24 11:12:30 +06:30
Yan
e01ecc6e0f merge origin master 2017-06-23 17:53:53 +06:30
Yan
a996ccc7ee Merge branch 'discount' of bitbucket.org:code2lab/sxrestaurant 2017-06-23 17:51:46 +06:30
Yan
27ff8b89e7 merge with crm 2017-06-23 17:51:09 +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
f5f0f9e077 update crm customer and bind customer and queue 2017-06-23 17:03:52 +06:30
Yan
55c8ab80da discount updated 2017-06-23 11:40:11 +06:30
Phyo
68403617a5 Change Font and show status in origami 2017-06-23 11:14:48 +06:30
Phyo
69ec0386b9 Merge branch 'master' into settings_backend 2017-06-23 10:17:13 +06:30
Nweni
7dcc8547d6 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-23 09:50:52 +06:30
Nweni
19528b189f Update 2017-06-23 09:50:37 +06:30
Aung Myo
01e5b7ba6c update authorize 2017-06-23 09:41:48 +06:30
Phyo
dfdbc1bfcc Merge branch 'master' into settings_backend 2017-06-23 09:14:32 +06:30
Yan
139c3c997a Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-22 18:05:38 +06:30
Yan
618aed50dc merge with settings_backend 2017-06-22 18:05:23 +06:30
Yan
8ee37c5b52 Merge branch 'crm' of bitbucket.org:code2lab/sxrestaurant 2017-06-22 18:03:55 +06:30