Commit Graph

1192 Commits

Author SHA1 Message Date
Yan
fb8c67f058 fix for customer tax 2017-08-10 13:38:39 +06:30
Yan
dd6cffec68 merge with august spring from phyo 2017-08-09 18:10:06 +06:30
Yan
2794103e52 update customer tax calc 2017-08-09 17:54:22 +06:30
Phyo
14384745ad Payment Methods - Isactive verification 2017-08-09 15:37:28 +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
yamin
1b14589927 addCreatedAtInEmployee 2017-08-09 15:25:16 +06:30
yamin
a03e38179f UpdateHrLine 2017-08-09 15:23:55 +06:30
Aung Myo
13359cecba update void for bitp 2017-08-09 13:57:52 +06:30
yamin
813abe1733 Regrouping Nav bar 2017-08-09 12:30:11 +06:30
yamin
7ce5ec93e4 Change title for Cashin/Cashout 2017-08-09 12:29:27 +06:30
yamin
da690e00b8 add s in Points 2017-08-09 12:28:46 +06:30
yamin
38a0f78731 add Product to account 2017-08-09 12:28:17 +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
Yan
d9d3f8afa9 Merge branch 'crm' of bitbucket.org:code2lab/sxrestaurant 2017-08-09 10:51:51 +06:30
Yan
cc6e422c8b add customer type and tax profile in customer 2017-08-09 10:51:13 +06:30
Phyo
fe8e246898 Remove BreadCrumb on CRM 2017-08-08 18:12:50 +06:30
Yan
28dd0d66ec Merge branch 'staging' of bitbucket.org:code2lab/sxrestaurant 2017-08-08 18:03:34 +06:30
Aung Myo
644b94764e update closing receipt 2017-08-08 18:03:02 +06:30
Yan
1685713ff5 add customer tax 2017-08-08 18:02:05 +06:30
Phyo
a83b2c3acd CRM - Queue fix scroll 2017-08-08 17:55:03 +06:30
Phyo
1e38903d6d CRM - Queue 2017-08-08 17:51:03 +06:30
Yan
f46d786859 update crm 2017-08-08 14:29:48 +06:30
Yan
5ed4a7f51a rails updated 2017-08-08 11:48:50 +06:30
Aung Myo
285ad93501 update filter in sale and order and creditnote 2017-08-08 09:43:58 +06:30
Aung Myo
35d1ec59cb update payment show 2017-08-04 18:29:45 +06:30
Aung Myo
02020e25c9 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into staging 2017-08-04 15:25:49 +06:30
Aung Myo
a4d2fc53b0 update 2017-08-04 15:25:19 +06:30
Aung Myo
e71ca0dee8 update room 2017-08-03 13:31:52 +06:30
Yan
a0b21118d5 Merge branch 'staging' of bitbucket.org:code2lab/sxrestaurant 2017-08-03 12:10:51 +06:30
Aung Myo
518314c772 update room in origami 2017-08-03 12:05:54 +06:30
Aung Myo
39a314bc9a update rome check all fun 2017-08-03 11:22:23 +06:30
Yan
e0422328b6 dump 2017-08-02 18:38:03 +06:30
Yan
16678b438b dump 2017-08-02 18:37:18 +06:30
Yan
ae5299bbe1 dump 2017-08-02 17:32:23 +06:30
Aung Myo
3bbf60b3ef update total tax when other charges 2017-08-02 17:31:43 +06:30
Aung Myo
6a6b7eae29 update total tax when other charges 2017-08-02 16:58:34 +06:30
Yan
266f60d2cb dump 2017-08-02 15:15:05 +06:30
Yan
c096e82148 update shop in seed for osaka 2017-08-02 14:33:03 +06:30
Yan
da5dfa1853 void sale report update 2017-08-02 12:19:18 +06:30
Yan
a02af9256f Merge branch 'staging' of bitbucket.org:code2lab/sxrestaurant 2017-08-02 12:14:52 +06:30
Aung Myo
b0886b685c update clone 2017-08-02 12:14:03 +06:30
Yan
23faf65af6 add shift id after req bill 2017-08-01 18:41:53 +06:30
Yan
57108598b8 Merge branch 'staging' of bitbucket.org:code2lab/sxrestaurant 2017-08-01 16:34:49 +06:30
Aung Myo
8794352ed5 update rake file 2017-08-01 16:33:41 +06:30
Yan
20f344ce89 filter with today in oqs 2017-08-01 16:33:36 +06:30
Aung Myo
4704632546 update rake menu file 2017-08-01 15:18:44 +06:30