Commit Graph

940 Commits

Author SHA1 Message Date
Yan
ad2dfa2ee0 crm updated 2017-07-26 18:39:46 +06:30
Yan
f7588bd8d9 update member for already register member 2017-07-26 16:42:51 +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
54faa6e84f update receipt bill for line 2017-07-25 17:21:52 +06:30
Aung Myo
cbe6803cf9 update cancelall void and receipt,item report for today 2017-07-25 16:55:36 +06:30
Yan
09193a532a fix sale edit cntr 2017-07-25 16:30:52 +06:30
Aung Myo
6baf039e6d update back buttom 2017-07-25 13:58:38 +06:30
Yan
22f3ee8f54 Merge branch 'staging' of bitbucket.org:code2lab/sxrestaurant 2017-07-25 13:41:04 +06:30
Aung Myo
5365b863f7 update header oqs in dashboard 2017-07-25 13:37:31 +06:30
Yan
994e80b89e fix order print format 2017-07-25 12:56:11 +06:30
Aung Myo
3f0ecb5ac6 update home view card column 2017-07-25 12:21:05 +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
Yan
b8fc67745d fix discount and receipt bill 2017-07-21 18:15:10 +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
Yan
13e274eefb Merge branch 'staging' of bitbucket.org:code2lab/sxrestaurant 2017-07-21 10:53:16 +06:30
Yan
409fd05da4 no show void item in discount 2017-07-21 10:52:46 +06:30
Aung Myo
a0edef735d update report detail ,close_cashire_pdf and view reports 2017-07-21 09:57:22 +06:30
Yan
30e1854969 fix discount with selected 2017-07-20 17:42:02 +06:30
Yan
e45bc7964c fix for oqs completed 2017-07-20 15:58:31 +06:30
Aung Myo
3792133aad update shift update from void in sale 2017-07-20 10:29:20 +06:30
Yan
b37cef46bd Merge branch 'staging' of bitbucket.org:code2lab/sxrestaurant into osaka 2017-07-18 18:07:26 +06:30
Yan
1fa8520a5e change discount_type to campaign_type 2017-07-18 18:06:59 +06:30
Aung Myo
0ce6bc733b update membership rebate for food and beverage 2017-07-18 18:05:27 +06:30
Yan
a5546920b6 nfc done 2017-07-18 16:06:36 +06:30
Yan
c068d702b3 still nfc 2017-07-18 11:52:49 +06:30
Yan
33537cef60 17 update for bitp 2017-07-17 16:55:18 +06:30
Yan
df06b81b28 Merge branch 'staging' 2017-07-17 15:13:31 +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
Aung Myo
25ef380b4f finished report for all 2017-07-17 11:22:24 +06:30
Yan
b2ccc12e17 add paypar acc for nfc 2017-07-16 18:16:52 +06:30
Aung Myo
0b7b5cae30 update osaka demo bugs 2017-07-14 17:23:40 +06:30
Yan
7a036b8c0a fix for bill 2017-07-13 11:34:57 +06:30
Yan
6f57bb8a79 adding shift sale summary 2017-07-13 11:12:02 +06:30
Aung Myo
ef7cc1f6f0 Merge branch 'osaka' of bitbucket.org:code2lab/sxrestaurant into osaka 2017-07-12 19:48:51 +06:30
Aung Myo
e34d267fc8 update control member for osaka 2017-07-12 19:43:56 +06:30
Yan
9da05a72aa merge with master 2017-07-12 17:58:07 +06:30
Yan
6546b8020a Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into osaka 2017-07-12 17:37:26 +06:30