Commit Graph

121 Commits

Author SHA1 Message Date
Yan
20bba0f659 merge with august_spring 2017-08-15 17:04:28 +06:30
Zin Lin Phyo
74b15465f7 item foc in sale edit 2017-08-15 15:13:44 +06:30
Nweni
e5a685f36e room charges 2017-08-15 11:14:38 +06:30
Aung Myo
67b6da92ab Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into staging 2017-08-14 15:04:28 +06:30
Aung Myo
a691eb8d64 update 2017-08-14 15:01:44 +06:30
Yan
ed793bd48c remove puts in sale 2017-08-11 12:15:47 +06:30
Yan
0e93eb3765 fix for customer tax ui and calc tax after bind customer 2017-08-11 12:13:30 +06:30
Yan
1dbd6eb60a inclusive tax calc by rake 2017-08-10 14:59:16 +06:30
Yan
edf213d6d6 fix for tax inclusive 2017-08-10 14:49:00 +06:30
Yan
2794103e52 update customer tax calc 2017-08-09 17:54:22 +06:30
Yan
e9847272ca Merge branch 'staging' of bitbucket.org:code2lab/sxrestaurant 2017-08-09 15:32:46 +06:30
Yan
0fc2fb1d98 calc tax by user taxes 2017-08-09 15:32:33 +06:30
Aung Myo
3171425aab Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into staging 2017-08-09 11:55:31 +06:30
Aung Myo
729daeba7b update filter order 2017-08-09 11:54:19 +06:30
Yan
5eae930d81 Merge branch 'crm' of bitbucket.org:code2lab/sxrestaurant 2017-08-09 11:10:53 +06:30
Yan
43ad4d9bc6 apply inclusive tax by divided by 21 2017-08-09 11:10:18 +06:30
Aung Myo
644b94764e update closing receipt 2017-08-08 18:03:02 +06:30
Aung Myo
285ad93501 update filter in sale and order and creditnote 2017-08-08 09:43:58 +06:30
Aung Myo
6a6b7eae29 update total tax when other charges 2017-08-02 16:58:34 +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
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
Aung Myo
6e4228853a update comertial tax and service in sale model 2017-07-24 19:29:58 +06:30
Aung Myo
9c4e5bbdc8 update comertial tax and service in sale model 2017-07-24 19:25: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
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
Aung Myo
f51687e8fd update 2017-07-11 16:50:41 +06:30
Yan
ebf72f7d42 Merge branch 'discount' of bitbucket.org:code2lab/sxrestaurant 2017-07-11 11:07:01 +06:30
Aung Myo
72aa769490 added member discount 2017-07-11 11:06:13 +06:30
Yan
a713bf3b0e fix 2017-07-10 18:24:57 +06:30
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