Commit Graph

638 Commits

Author SHA1 Message Date
Aung Myo
b5b1c6f10a update membership 2017-07-04 18:01:08 +06:30
Yan
6a09ef3018 merge with crm and room fixed 2017-07-03 17:47:34 +06:30
Aung Myo
8aa12406db update scrll and member transaction 2017-07-03 17:44:26 +06:30
Yan
ed0e627f34 fixed at bitp and oqs print 2017-07-03 17:40:12 +06:30
Aung Myo
e3477fd268 update 2017-07-03 13:22:02 +06:30
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
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
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
b78119f848 update print 2017-07-02 11:41:47 +06:30
Nweni
acca5b5a1d Update 2017-07-02 11:22:49 +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
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
5f3708e11d menu updated | edit qty updated 2017-07-01 17:15:12 +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
Aung Myo
be781ff022 update customer 2017-06-30 19:41:39 +06:30
superuser
f23bbd6936 merge with origin master 2017-06-30 19:33:04 +06:30
superuser
336b76e4b2 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-30 19:29:35 +06:30
superuser
60dee30046 api/bill_controller edited 2017-06-30 19:29:09 +06:30
Yan
f7341c7855 Merge branch 'crm' of bitbucket.org:code2lab/sxrestaurant 2017-06-30 19:05:49 +06:30
Yan
71636b36db add Re-compute all amoute for sale 2017-06-30 19:05:13 +06:30
Aung Myo
2548fdcac1 update receipt bill 2017-06-30 18:02:17 +06:30
Yan
02cc6e8cbd merge with crm 2017-06-30 16:04:57 +06:30
Yan
78be369a25 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-30 16:00:37 +06:30
Yan
b0bec2afc4 add alt name to order and sale items and update seeds 2017-06-30 16:00:03 +06:30
Aung Myo
a5bf5222f6 update conflic file 2017-06-30 14:19:05 +06:30
Aung Myo
43b9bdc168 update shiftsale 2017-06-30 14:15:04 +06:30
Nweni
18094f5a71 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-30 13:44:45 +06:30
Nweni
2713fae6b5 Update 2017-06-30 13:44:29 +06:30
Yan
34166a1387 merge with origin master 2017-06-30 13:39:52 +06:30
Yan
cae7157d8b Merge branch 'crm' of bitbucket.org:code2lab/sxrestaurant 2017-06-30 13:34:30 +06:30
Aung Myo
1d08954a76 update shift sale 2017-06-30 13:32:56 +06:30
Yan
9c1a324eff add other charges 2017-06-30 13:29:55 +06:30