Commit Graph

2126 Commits

Author SHA1 Message Date
Zin Lin Phyo
feb1d66257 overall void 2017-06-26 18:00:48 +06:30
Aung Myo
02e3ebefda update receipt 2017-06-26 17:56:31 +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
adf06cf6f5 Merge branch 'crm' of bitbucket.org:code2lab/sxrestaurant 2017-06-26 17:02:25 +06:30
Aung Myo
6e77a71946 update customer seed shop and receipt bill 2017-06-26 16:50:04 +06:30
Yan
4e5ca54eee Merge branch 'oqs' of bitbucket.org:code2lab/sxrestaurant 2017-06-26 16:38:15 +06:30
Yan
0c2e299ced Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-26 16:37:02 +06:30
Nweni
20afabd86d item void 2017-06-26 16:34:03 +06:30
Yan
f60b3d554a add table and order no in oqs 2017-06-26 16:23:00 +06:30
superuser
1d96eb1d48 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-26 15:38:31 +06:30
Yan
813f2ecf2d merge with settings_backend 2017-06-26 14:46:31 +06:30
Yan
e1c981e8c2 merge with crm 2017-06-26 14:23:56 +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
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
69f24101f9 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-26 06:28:23 +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
superuser
7263a65da9 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-23 21:45:34 +06:30
Yan
30df25d78a Merge branch 'master' into oqs 2017-06-23 19:22:07 +06:30
Yan
1f6a0eb1f6 fix with merge 2017-06-23 19:20:00 +06:30
Yan
9ed6b510c4 updating oqs 2017-06-23 19:01:33 +06:30
superuser
4dbc9b6134 :q
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
2017-06-23 18:00:18 +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
Aung Myo
01e5b7ba6c update authorize 2017-06-23 09:41:48 +06:30
superuser
ea74d52a6f Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-22 18:26:36 +06:30
Yan
139c3c997a Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-22 18:05:38 +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
Yan
b30d81508c add options in oqs 2017-06-22 16:12:21 +06:30
Aung Myo
25b6a893f2 first cancan 2017-06-22 15:33:55 +06:30
Yan
cb40f06854 fixed for customer 2017-06-22 15:01:13 +06:30
Yan
f44abd5192 Merge branch 'settings_backend' of bitbucket.org:code2lab/sxrestaurant 2017-06-22 14:58:17 +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
3d838bc989 update report and customer 2017-06-22 13:35:20 +06:30
Phyo
f8cab803f8 Redeem amount bug fic 2017-06-22 13:31:54 +06:30
Aung Myo
187caa5253 update customre 2017-06-22 11:58:16 +06:30
superuser
e0af272690 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-22 11:39:56 +06:30
superuser
27b0ba72d7 changed in server master 2017-06-22 11:38:42 +06:30