superuser
|
ca797b8d9c
|
update conflict file
|
2017-07-02 14:37:21 +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 |
|
Nweni
|
5e3935f176
|
update shift
|
2017-06-30 13:10:28 +06:30 |
|
Nweni
|
063d561f3e
|
closing balance
|
2017-06-30 10:07:51 +06:30 |
|
Nweni
|
959102b338
|
Update
|
2017-06-30 09:49:51 +06:30 |
|
Yan
|
dd95b29d7d
|
control order to logout
|
2017-06-29 19:09:01 +06:30 |
|
Nweni
|
77220ae65b
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
|
2017-06-29 18:59:27 +06:30 |
|
Nweni
|
8046bc7745
|
shift
|
2017-06-29 18:59:17 +06:30 |
|
Aung Myo
|
3b9c16d8d5
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into crm
|
2017-06-29 15:42:45 +06:30 |
|
Aung Myo
|
9305e0c4b4
|
update authorize void and edit in cashier
|
2017-06-29 15:39:46 +06:30 |
|
Aung Myo
|
f60c145c00
|
update queue
|
2017-06-29 14:33:05 +06:30 |
|
Yan
|
fbeab17b3c
|
merge with origin master
|
2017-06-29 14:08:20 +06:30 |
|
Nweni
|
cf851327b3
|
fixed conflict
|
2017-06-29 13:52:55 +06:30 |
|
Yan
|
8ba2606f6e
|
merge with crm
|
2017-06-29 13:40:30 +06:30 |
|
Nweni
|
e3c2f02c81
|
fixed conflict
|
2017-06-29 13:39:37 +06:30 |
|