Commit Graph

724 Commits

Author SHA1 Message Date
Aung Myo
02e3ebefda update receipt 2017-06-26 17:56:31 +06:30
Aung Myo
6e77a71946 update customer seed shop and receipt bill 2017-06-26 16:50:04 +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
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
62156e2e3e Employee Show 2017-06-23 11:13:29 +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
Phyo
dfdbc1bfcc Merge branch 'master' into settings_backend 2017-06-23 09:14:32 +06:30
Yan
a90bbbebec merge with origin master 2017-06-22 18:06:56 +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
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
Phyo
298a06fc1e Show Local Time 2017-06-22 16:45:58 +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
Phyo
4254004423 Redeem Nett Button works 2017-06-22 15:36:36 +06:30
Aung Myo
4b9291110d update origami customer 2017-06-22 15:30:16 +06:30
Aung Myo
cd5fdaac6a update origami scss 2017-06-22 15:28:40 +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
Phyo
d1a4373171 Merge branch 'master' into settings_backend 2017-06-22 12:05:28 +06:30
Aung Myo
187caa5253 update customre 2017-06-22 11:58:16 +06:30
Yan
b13b0afa6c discuont updated for show 2017-06-22 11:31:05 +06:30
Aung Myo
54526230aa update customerbind in origami 2017-06-22 10:25:40 +06:30
Yan
bded56a696 customer seed updated 2017-06-22 10:11:50 +06:30
Aung Myo
7785ac99ef Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into crm 2017-06-22 09:53:43 +06:30
Yan
de8f577786 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-22 09:53:04 +06:30
Yan
77943f3bba Merge branch 'settings_backend' of bitbucket.org:code2lab/sxrestaurant 2017-06-22 09:52:22 +06:30
Yan
3f15e7bc6f Merge branch 'crm' of bitbucket.org:code2lab/sxrestaurant 2017-06-22 09:51:22 +06:30
Aung Myo
de38a50522 Merge branch 'discount' of bitbucket.org:code2lab/sxrestaurant into crm 2017-06-22 09:34:45 +06:30
Phyo
149b2b3559 Merge branch 'master' into settings_backend 2017-06-22 09:28:11 +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