Commit Graph

284 Commits

Author SHA1 Message Date
Aung Myo
b1b9b5a93f update report 2017-07-10 14:32:57 +06:30
Yan
9402cde2bc fix grand total in receipt no 2017-07-10 09:59:26 +06:30
Yan
94555bc325 updated for receipt rpt for shift 2017-07-08 18:20:42 +06:30
Yan
9158f0e93a Merge branch 'crm' of bitbucket.org:code2lab/sxrestaurant 2017-07-08 17:34:22 +06:30
Aung Myo
8985393535 update receipt repoert 2017-07-08 10:25:22 +06:30
Yan
2226d59140 re-fixed in production 2017-07-07 20:51:24 +06:30
Yan
3fe0f708bd add req and fix for shift 2017-07-07 17:19:14 +06:30
Yan
41d91f2c0d tax calc fixed 2017-07-02 20:36:40 +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
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
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
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
34166a1387 merge with origin master 2017-06-30 13:39:52 +06:30
Aung Myo
1d08954a76 update shift sale 2017-06-30 13:32:56 +06:30
Nweni
5e3935f176 update shift 2017-06-30 13:10:28 +06:30
Nweni
8046bc7745 shift 2017-06-29 18:59:17 +06:30
Yan
50091e4016 updated for api bill controller 2017-06-28 16:56:43 +06:30
Nweni
986655052a shift 2017-06-28 15:29:44 +06:30
Yan
950fff469f update for req bill by cashier 2017-06-27 15:28:48 +06:30
Yan
464e72012b waiter and cashier in api/bill_controller 2017-06-27 15:26:02 +06:30
Aung Myo
376af85c64 update credit 2017-06-26 19:02:36 +06:30
Yan
e878275c1b Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-26 17:10:25 +06:30
Nweni
d4983fabf5 item void 2017-06-26 17:07:17 +06:30
Yan
00c19fdd67 sub total fixed in origami shows 2017-06-26 14:16:22 +06:30
Yan
5d60d620b4 add for room tab and complete 2017-06-22 18:03:16 +06:30
Yan
3f15e7bc6f Merge branch 'crm' of bitbucket.org:code2lab/sxrestaurant 2017-06-22 09:51:22 +06:30
Yan
e3b3ff76b2 add account_id to od_item and sale_item table 2017-06-21 14:49:01 +06:30
Aung Myo
6c4c817453 fixed fonflict 2017-06-21 10:22:43 +06:30
Nweni
a9e1d8c3d1 origami 2017-06-20 18:59:34 +06:30
Aung Myo
faae996d5d Rebate balance in receipt 2017-06-20 11:31:02 +06:30
Aung Myo
675d83c80f sale item report and rebate balance 2017-06-19 11:54:34 +06:30
Yan
cf5854c2bb Merge branch 'crm' of bitbucket.org:code2lab/sxrestaurant 2017-06-19 11:06:39 +06:30
Aung Myo
6ffa73fa6f Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into crm 2017-06-18 20:18:12 +06:30
Yan
b65d127fd0 bill print format and tax fix 2017-06-18 20:07:28 +06:30
Aung Myo
7881ae4dfa daily sale report 2017-06-18 16:38:46 +06:30
Yan
5906dde741 uncomment for sale taxes 2017-06-18 13:18:53 +06:30
Yan
f33f11df64 rescue member call and update oqs and js route bug 2017-06-18 03:20:19 +06:30
Yan
03feae5b0f fix get_order_items_details method in order_item and add taxes in receipt 2017-06-15 17:57:58 +06:30