Commit Graph

511 Commits

Author SHA1 Message Date
Zin Lin Phyo
74b15465f7 item foc in sale edit 2017-08-15 15:13:44 +06:30
Nweni
2da60ce6e3 Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring 2017-08-15 11:15:41 +06:30
Nweni
e5a685f36e room charges 2017-08-15 11:14:38 +06:30
Zin Lin Phyo
a01eaacbcb fix conflit 2017-08-14 16:46:26 +06:30
Zin Lin Phyo
7dae1c2c27 dashboard link 2017-08-14 16:43:35 +06:30
yamin
26e5472abc xMerge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring 2017-08-14 14:29:24 +06:30
yamin
fa68bcff69 removeDBcolsanddbparams 2017-08-14 14:26:16 +06:30
Nweni
1f892fdd3d fixed conflict 2017-08-14 11:32:18 +06:30
Nweni
6f39a024ca dining charge 2017-08-14 11:30:58 +06:30
yamin
c30d8f15d8 Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring 2017-08-14 10:19:22 +06:30
yamin
646492fbd6 updateability 2017-08-14 10:18:59 +06:30
Phyo
740038757d Dining Charges CRUD 2017-08-11 17:53:48 +06:30
Nweni
b0ad2049c5 dining_charges 2017-08-11 13:34:30 +06:30
Aung Myo
285ad93501 update filter in sale and order and creditnote 2017-08-08 09:43:58 +06:30
Aung Myo
a4d2fc53b0 update 2017-08-04 15:25:19 +06:30
Aung Myo
6a6b7eae29 update total tax when other charges 2017-08-02 16:58:34 +06:30
Aung Myo
b0886b685c update clone 2017-08-02 12:14:03 +06:30
Yan
fa901806d4 bugs fix for crm 2017-08-01 11:50:41 +06:30
Yan
78d5150b35 merge with staging 2017-07-31 19:37:51 +06:30
Aung Myo
b3c77fc28c update lookup 2017-07-31 17:33:06 +06:30
Yan
a57831a3fc fix for member 2017-07-31 15:49:36 +06:30
Yan
bc5a7d01f7 update sale payment for rebate deleting puts 2017-07-31 14:35:02 +06:30
Yan
60089a3879 Merge branch 'staging' of bitbucket.org:code2lab/sxrestaurant 2017-07-31 13:15:23 +06:30
Aung Myo
24d6a530e7 update 2017-07-31 13:14:36 +06:30
Aung Myo
6ac35bb874 update receipt no twice and sale order double and report changes 2017-07-31 09:39:34 +06:30
Aung Myo
78d383f5ec update customer validation messages 2017-07-28 18:08:11 +06:30
Aung Myo
98c04f21d8 update report and view 2017-07-28 17:07:16 +06:30
Yan
bf3e30c70f control for member create and member discount 2017-07-27 18:53:41 +06:30
Yan
e693b60945 bind member for already register member 2017-07-26 16:00:15 +06:30
Yan
54d1fa68e6 Merge branch 'staging' of bitbucket.org:code2lab/sxrestaurant 2017-07-25 18:22:56 +06:30
Yan
89c8b9a9cc fix for re-calc tax for gram sale 2017-07-25 18:08:04 +06:30
Aung Myo
6189404afb update sale 2017-07-25 17:51:14 +06:30
Aung Myo
cbe6803cf9 update cancelall void and receipt,item report for today 2017-07-25 16:55:36 +06:30
Aung Myo
a135e22024 update wrong commercial tax and service tax and role features 2017-07-25 10:49:36 +06:30
Yan
b9129381c8 Merge branch 'staging' of bitbucket.org:code2lab/sxrestaurant 2017-07-24 19:30:32 +06:30
Aung Myo
6e4228853a update comertial tax and service in sale model 2017-07-24 19:29:58 +06:30
Yan
b240bbe5fe Merge branch 'oqs' of bitbucket.org:code2lab/sxrestaurant 2017-07-24 19:28:59 +06:30
Aung Myo
9c4e5bbdc8 update comertial tax and service in sale model 2017-07-24 19:25:31 +06:30
Yan
bf9b977cd0 membership update 2017-07-24 19:24:43 +06:30
Aung Myo
a7cbea5dbb update login To show dashboard screen with available features based on user type 2017-07-24 17:42:34 +06:30
Yan
8db4a8cc05 Merge branch 'staging' of bitbucket.org:code2lab/sxrestaurant 2017-07-21 18:15:39 +06:30
Aung Myo
8852bc0449 update pay without existing invoice in salepayment.rb 2017-07-21 17:52:38 +06:30
Aung Myo
c5dbbea76d update long bill 2017-07-21 17:07:31 +06:30
Yan
2e8c866761 osaka menu update and void tax calc fix 2017-07-21 14:56:40 +06:30
Aung Myo
a0edef735d update report detail ,close_cashire_pdf and view reports 2017-07-21 09:57:22 +06:30
Yan
b37cef46bd Merge branch 'staging' of bitbucket.org:code2lab/sxrestaurant into osaka 2017-07-18 18:07:26 +06:30
Aung Myo
0ce6bc733b update membership rebate for food and beverage 2017-07-18 18:05:27 +06:30
Yan
c068d702b3 still nfc 2017-07-18 11:52:49 +06:30
Yan
51c14f379b still nfc 2017-07-17 15:07:27 +06:30
Aung Myo
bd0b8681c9 update reports 2017-07-17 12:11:21 +06:30