superuser
|
ca797b8d9c
|
update conflict file
|
2017-07-02 14:37:21 +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 |
|
Yan
|
3681a9558b
|
sale return
|
2017-06-30 19:35:00 +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
|
a851f6de70
|
update taxobj in sale
|
2017-06-30 19:27:46 +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
|
45c69ab536
|
update sale ability and shipt slae
|
2017-06-30 15:53:25 +06:30 |
|
superuser
|
44faf2f56e
|
before pull
|
2017-06-30 14:19:30 +06:30 |
|
Aung Myo
|
a5bf5222f6
|
update conflic file
|
2017-06-30 14:19:05 +06:30 |
|
Aung Myo
|
155e1a5ba3
|
hide shiftsale in header
|
2017-06-30 14:16:05 +06:30 |
|