Commit Graph

414 Commits

Author SHA1 Message Date
Phyo
70668e4264 Credit note Rebate Prevent 2017-07-02 14:20:23 +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
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
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
abefd1f8f2 Update 2017-07-01 14:55:37 +06:30
Yan
6e8b3afc6c merge with crm 2017-07-01 11:13:34 +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
Yan
3681a9558b sale return 2017-06-30 19:35:00 +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
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
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
Yan
fd0ae922eb fixed for auto print 2017-06-30 14:11:29 +06:30
Yan
baa1ce5fbc fix date function for shift sale 2017-06-30 13:55:26 +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
Yan
fd857146e8 fix for shift sale query and prepare rounding adj 2017-06-29 15:20:40 +06:30
Yan
fbeab17b3c merge with origin master 2017-06-29 14:08:20 +06:30
Yan
b63155a315 boolean updated 2017-06-29 14:06:58 +06:30
Nweni
11c3be8f4a Update 2017-06-29 14:05:03 +06:30
Nweni
8d09e5a919 shift sale update 2017-06-29 13:48:14 +06:30
Yan
8ba2606f6e merge with crm 2017-06-29 13:40:30 +06:30