Commit Graph

972 Commits

Author SHA1 Message Date
Aung Myo
92712787e1 update origami for room 2017-07-03 12:20:03 +06:30
Aung Myo
6c3c863fce Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into crm 2017-07-03 10:29:07 +06:30
Aung Myo
39ba5d5e86 update audit sales 2017-07-03 10:28:13 +06:30
Nweni
15cbac995f fixed conflict 2017-07-03 10:26:26 +06:30
Nweni
399825b98c Update 2017-07-03 10:24:35 +06:30
Yan
dac4c59007 add puma for de 2017-07-02 22:58:02 +06:30
Yan
acfab89430 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-07-02 20:50:18 +06:30
Yan
41d91f2c0d tax calc fixed 2017-07-02 20:36:40 +06:30
Nweni
21503ed1bf Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-07-02 16:24:01 +06:30
Nweni
3923b6fb24 Update 2017-07-02 16:23:19 +06:30
Phyo
dbf35be4ee Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-07-02 15:27:49 +06:30
Phyo
53aa1f8ec6 OQS bug fix 2017-07-02 15:26:52 +06:30
Nweni
9758628bde Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-07-02 14:38:40 +06:30
Nweni
9085362979 menu alt name 2017-07-02 14:38:18 +06:30
superuser
ca797b8d9c update conflict file 2017-07-02 14:37:21 +06:30
Nweni
f06e526ea3 menu alt name 2017-07-02 14:36:57 +06:30
Phyo
129d2eaf1a Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-07-02 14:21:01 +06:30
Phyo
70668e4264 Credit note Rebate Prevent 2017-07-02 14:20:23 +06:30
Aung Myo
e9ac1973fc Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-07-02 14:07:26 +06:30
Aung Myo
a0e16bd485 update crm and bill 2017-07-02 14:06:21 +06:30
Phyo
a86ac10e83 Zone OQS bug fix 2017-07-02 13:39:36 +06:30
Aung Myo
09370a2a78 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-07-02 12:08:09 +06:30
Aung Myo
7994fcc0c3 update 2017-07-02 12:06:28 +06:30
Nweni
58f2ff28e5 update void 2017-07-02 11:53:33 +06:30
Aung Myo
b78119f848 update print 2017-07-02 11:41:47 +06:30
Nweni
b4eed19693 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-07-02 11:22:59 +06:30
Nweni
acca5b5a1d Update 2017-07-02 11:22:49 +06:30
Phyo
678c37c6b0 Rebate Bug Fix 2017-07-02 11:00:01 +06:30
Aung Myo
972a717361 update payper and redeem 2017-07-02 10:04:06 +06:30
Aung Myo
df553dd489 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into crm 2017-07-02 09:38:01 +06:30
Aung Myo
78adf564e1 crong job and close cashier 2017-07-02 09:37:19 +06:30
Yan
97c70fb72b merge with crm 2017-07-01 20:11:52 +06:30
Yan
6fe2de877c remove add order 2017-07-01 20:08:57 +06:30
Aung Myo
c26b80066b update shift close print 2017-07-01 20:05:26 +06:30
Yan
e9b1845ed2 saturday fixed 2017-07-01 20:02:14 +06:30
Yan
51a779cbee add zone with oqs and tax calculte method update 2017-07-01 19:11:04 +06:30
Aung Myo
740f585a31 update rounding adj 2017-07-01 18:19:41 +06:30
Nweni
b0ec03f591 Update 2017-07-01 18:12:48 +06:30
Nweni
5f3708e11d menu updated | edit qty updated 2017-07-01 17:15:12 +06:30
Nweni
99986b1fb9 open cashier clear 2017-07-01 15:30:06 +06:30
Nweni
cb753ed4e4 shift | cash In | cash out 2017-07-01 15:25:34 +06:30
Nweni
abefd1f8f2 Update 2017-07-01 14:55:37 +06:30
Yan
6e8b3afc6c merge with crm 2017-07-01 11:13:34 +06:30
Aung Myo
40a2347c1b update report 2017-07-01 11:10:08 +06:30
Nweni
23f8430032 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-07-01 09:46:44 +06:30
Nweni
c589f11758 shift sale 2017-07-01 09:46:14 +06:30
superuser
273a50b093 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-30 20:08:28 +06:30
Yan
219944abbd update migrate 2017-06-30 20:07:49 +06:30
Aung Myo
be781ff022 update customer 2017-06-30 19:41:39 +06:30
superuser
3bb8e9b15f Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-30 19:35:31 +06:30