Commit Graph

1845 Commits

Author SHA1 Message Date
Yan
4660530218 upgrade version 2017-10-31 18:41:19 +06:30
Yan
f01fab0951 fix seed 2017-10-31 18:23:03 +06:30
Aung Myo
01c4eeca81 Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui 2017-10-31 18:05:29 +06:30
Aung Myo
b89340b85e update payment menthod report 2017-10-31 18:03:36 +06:30
Yan
4ce8a0afbb check for payment methods 2017-10-31 15:57:50 +06:30
Yan
c8c32cd6b3 add logo 2017-10-31 13:45:14 +06:30
Yan
6a3e604af3 dev ip change 2017-10-31 13:42:09 +06:30
Yan
cd11841df1 Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui 2017-10-31 13:41:36 +06:30
Yan
89381eb72b add manage in ability for supervisor 2017-10-31 13:34:52 +06:30
Aung Myo
1239b308f9 update void alert 2017-10-31 13:34:01 +06:30
Aung Myo
cfa819f985 fixed conflic 2017-10-31 12:13:19 +06:30
Aung Myo
56940d7f00 update sale audit 2017-10-31 12:08:27 +06:30
Yan
08bccd6144 fix seed for new receipt no 2017-10-31 11:03:00 +06:30
Yan
e3b536d58c check and update for origami btn show 2017-10-31 10:50:13 +06:30
Yan
041f9b9fe2 need to edit origami 2017-10-31 10:38:19 +06:30
Yan
1189761e49 comment order 2017-10-31 10:08:26 +06:30
Yan
c1db3ba8be merge with aung myo 2017-10-30 18:52:48 +06:30
Yan
72414b53b5 Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui 2017-10-30 18:51:22 +06:30
Yan
35161aae91 remove turbolink in backend and update logout 2017-10-30 18:51:05 +06:30
Yan
da0558b5ef remove turbolinks in form for conflict 2017-10-30 17:26:38 +06:30
Yan
7beb4e7563 test for turbolink 2017-10-30 14:33:05 +06:30
phyusin
9426834541 add localization text for all report 2017-10-30 14:23:00 +06:30
Aung Myo
a687b45193 update adminbsbs 2017-10-30 12:14:11 +06:30
phyusin
4c6c503e15 add localization text for Transactions tab 2017-10-30 11:48:44 +06:30
Yan
558ec84819 Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui 2017-10-30 10:37:36 +06:30
Yan
8169da4d52 edit product form 2017-10-30 10:29:02 +06:30
phyusin
74e90c98d3 add localization text for inventory 2017-10-30 10:27:54 +06:30
Yan
8d12acb530 test for select 2017-10-30 10:09:22 +06:30
phyusin
0422855ddd Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2017-10-30 09:23:00 +06:30
Yan
ae5dfaf192 test for no work js,it cause by turbolink 2017-10-29 14:20:24 +06:30
Yan
5bdc8e25c8 Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui 2017-10-28 13:27:30 +06:30
Yan
772b65f2d8 merge with augn myo 2017-10-27 18:41:44 +06:30
Yan
6f6c037e9e merge with phyu sin 2017-10-27 18:40:58 +06:30
Yan
6feb524db8 test for checkbox fail 2017-10-27 18:39:44 +06:30
phyusin
814623b303 Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2017-10-27 18:16:01 +06:30
phyusin
5912b00d43 add localization text for other modules 2017-10-27 18:15:34 +06:30
Yan
0a7da11aa1 new bsb version to old 2017-10-27 17:44:06 +06:30
Aung Myo
a1c812574a update control with cancancan in sidebar 2017-10-27 17:37:34 +06:30
Yan
e76b61987c Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui 2017-10-27 17:17:37 +06:30
Yan
5c27dcff66 merge with origin 2017-10-27 17:06:07 +06:30
Yan
0f24cc0999 Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui 2017-10-27 17:02:17 +06:30
phyusin
d40b781c23 Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2017-10-27 17:01:51 +06:30
phyusin
ef05aec1db add localization for all form data 2017-10-27 17:00:56 +06:30
Yan
61c9fd0c81 test for js 2017-10-27 16:53:32 +06:30
Aung Myo
79a46ba7cf update induties 2017-10-27 16:50:26 +06:30
phyusin
d916c262d7 validation for commission, commissioner 2017-10-27 13:51:45 +06:30
Yan
445d63e286 Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui 2017-10-27 13:42:22 +06:30
phyusin
20c0c2ca98 Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2017-10-27 13:28:49 +06:30
phyusin
19b9b5c557 add validation for payment method,print_setting,tax_profile 2017-10-27 13:28:25 +06:30
Aung Myo
b4005efa1b fixed conflic 2017-10-27 13:25:13 +06:30