Commit Graph

4129 Commits

Author SHA1 Message Date
Aung Myo
ddae25b241 Merge branch 'adminbsb_material_ui' 2018-07-17 13:14:03 +06:30
Aung Myo
26f4715aed update dining charge for before block 2018-07-17 13:13:04 +06:30
phyusin
ca1bd437cd remove comment for inventory 2018-07-17 11:18:59 +06:30
phyusin
345802a074 change sale query 2018-07-17 10:50:36 +06:30
phyusin
7ef9825168 sale query checked 2018-07-17 10:29:49 +06:30
phyusin
d78bb58450 ccheck credit amt '0' in query 2018-07-17 10:24:36 +06:30
phyusin
f6cb06099e change query 2018-07-16 17:25:47 +06:30
phyusin
3859bdebcf change query for credit sales 2018-07-16 16:32:02 +06:30
phyusin
5b4ca6bf20 remove conflict 2018-07-16 10:59:20 +06:30
phyusin
50f5094efc remove conflict 2018-07-16 10:58:12 +06:30
Aung Myo
24afc555b1 Merge branch 'adminbsb_material_ui' 2018-07-16 10:42:00 +06:30
Aung Myo
2a97ae0563 update day for checkin 2018-07-16 10:41:20 +06:30
phyusin
60e3d9cc5b remove conflict 2018-07-16 10:27:06 +06:30
phyusin
416e7c19f3 check seedd generator for commission issue 2018-07-16 10:17:02 +06:30
phyusin
b181d70a9e change query for credit sales 2018-07-16 10:00:48 +06:30
phyusin
6fd04b4632 Merge branch 'ui_ux_changes' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-07-16 09:54:09 +06:30
phyusin
6b416a2ea3 Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant 2018-07-13 18:01:29 +06:30
phyusin
4783e35942 add dashboard settings and customer create 2018-07-13 18:00:49 +06:30
Aung Myo
961fb77dc2 Merge branch 'adminbsb_material_ui' 2018-07-13 16:32:07 +06:30
Aung Myo
63d0c18db9 update dining charge down and up 2018-07-13 16:29:40 +06:30
San Wai Lwin
b25dfa420c Delect in OQS_station_by_zone 2018-07-13 15:26:33 +06:30
phyusin
0096c1479d remove conflict 2018-07-13 14:49:56 +06:30
phyusin
72a5289072 remove con္ူငခအဓ 2018-07-13 14:45:32 +06:30
phyusin
533a3999fb change credit payment query 2018-07-13 14:44:29 +06:30
San Wai Lwin
043a1efb2a Delete in table 2018-07-13 14:04:38 +06:30
Aung Myo
6ae0959602 update existin order 2018-07-13 11:34:24 +06:30
Aung Myo
d254ff744d update pending ordre 2018-07-12 18:36:35 +06:30
phyusin
dd4db6d2e7 remove conflict data 2018-07-12 15:54:30 +06:30
phyusin
03abeabb4e close cashier pdf and receipt bill pdf changes for credit payment 2018-07-12 15:50:58 +06:30
San Wai Lwin
042aec0121 Pull from master 2018-07-12 15:09:37 +06:30
San Wai Lwin
052d5e8c9c Edit dashboard ligin 2018-07-12 15:07:52 +06:30
Aung Myo
eef4af4cc6 update sale audit 2018-07-12 13:55:27 +06:30
Aung Myo
7945da99ed update sale audit all process in origami 2018-07-12 13:10:11 +06:30
phyusin
ebd3918cfa Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-07-11 18:32:19 +06:30
phyusin
c4ab456176 credit payment for quick service 2018-07-11 18:32:09 +06:30
San Wai Lwin
2696a1965e Remove role word from login 2018-07-11 17:49:24 +06:30
Aung Myo
b1a4f19b1c update receipt detail report for customer 2018-07-11 11:32:25 +06:30
phyusin
c67655d1f3 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-07-11 10:08:58 +06:30
Aung Myo
cd42b1136e update conflic 2018-07-11 10:07:50 +06:30
phyusin
47b59cca59 remove conflict data 2018-07-10 18:13:41 +06:30
phyusin
bf0f76ebc7 credit payment function 2018-07-10 18:12:25 +06:30
Aung Myo
441f37ba8a update repriint 2018-07-10 16:13:09 +06:30
Aung Myo
1fc4483817 Merge branch 'adminbsb_material_ui' 2018-07-10 16:11:40 +06:30
Aung Myo
9924aaef8a update vodi and pay foc waste and spoil for other paymtnt amount in receipt pdf 2018-07-10 16:10:04 +06:30
Aung Myo
158760abdb update vodi and pay foc waste and spoil for other paymtnt amount in receipt pdf 2018-07-10 16:05:37 +06:30
Aung Myo
8307dea14b Merge branch 'ui_ux_changes' 2018-07-10 15:24:31 +06:30
Aung Myo
5c8fd3666d update other charge add to recipt bill and close pdf 2018-07-10 15:16:49 +06:30
Aung Myo
82ede72f34 update sidebar 2018-07-10 10:00:44 +06:30
Aung Myo
5bb4734655 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2018-07-09 17:28:21 +06:30
Aung Myo
bfce0dc044 added receipt no detail report 2018-07-09 17:27:51 +06:30