Commit Graph

1446 Commits

Author SHA1 Message Date
Zin Lin Phyo
98dae6d712 show and update changes in commission and report 2017-09-04 10:24:24 +06:30
Nweni
09ba513c1c fixed conflict 2017-09-01 09:42:10 +06:30
Nweni
ed17e5fd32 Update 2017-09-01 09:40:50 +06:30
Zin Lin Phyo
0fbce1ca7c fix conflit 2017-08-31 18:07:05 +06:30
Zin Lin Phyo
0584530224 for pull 2017-08-31 18:06:13 +06:30
Phyo
e35378bd36 Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring 2017-08-31 18:05:43 +06:30
yamin
21a9f77c59 Update 2017-08-31 17:05:07 +06:30
yamin
b311df9a0b promotionDay 2017-08-31 16:59:32 +06:30
Nweni
a1341d0b10 fixed conflict 2017-08-31 15:30:02 +06:30
Nweni
12c8be597d Inventory Stock Check Print 2017-08-31 15:29:36 +06:30
Zin Lin Phyo
d1003e2f6a move load_commissioner to origamin/product_commission 2017-08-31 14:15:09 +06:30
Phyo
dd19b52ebd Promotion Index View Change 2017-08-31 14:03:43 +06:30
Zin Lin Phyo
4b74f2c128 fix conflit 2017-08-31 10:23:19 +06:30
Zin Lin Phyo
2ee08e943d for pull 2017-08-31 10:22:21 +06:30
Phyo
012b771435 Set Auto Generate ID to exact 16 2017-08-31 10:07:44 +06:30
Nweni
65675a6683 Update 2017-08-31 09:22:40 +06:30
Nweni
d1172dae0d inventory 2017-08-31 09:21:24 +06:30
Phyo
883f5f575a Promotion by Instance 2017-08-30 18:57:35 +06:30
Phyo
2f0a7c11ad Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring 2017-08-30 18:22:42 +06:30
Phyo
bf9f0cdbe7 CRUD Update for Promotion 2017-08-30 18:22:22 +06:30
Zin Lin Phyo
5a0ca4b39d fix conflit 2017-08-30 15:58:06 +06:30
Zin Lin Phyo
675ebd56a7 assign in_juty in sale edit 2017-08-30 15:57:15 +06:30
Nweni
bd00f16040 Update 2017-08-30 14:37:50 +06:30
Nweni
de45fb29b8 Update 2017-08-30 14:21:05 +06:30
Nweni
cabc78c373 inventory 2017-08-30 14:19:24 +06:30
Zin Lin Phyo
bc84a384a5 Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring
* 'august_spring' of bitbucket.org:code2lab/sxrestaurant:
  Promo Phrase 1
2017-08-30 10:46:59 +06:30
Zin Lin Phyo
df4caa288d jquery date-time picker 2017-08-30 10:46:46 +06:30
Phyo
15e37f9ee2 Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring 2017-08-30 09:20:47 +06:30
Phyo
2208b8a526 Promo Phrase 1 2017-08-30 09:20:35 +06:30
Zin Lin Phyo
4b97cd530e commission report export excel 2017-08-29 23:05:03 +06:30
Zin Lin Phyo
5fcfbdc020 fix conflit 2017-08-29 18:42:08 +06:30
Zin Lin Phyo
f03d8654e7 commission report 2017-08-29 18:36:46 +06:30
yamin
e84c080552 DataetimepickerInJuty 2017-08-29 13:20:32 +06:30
Zin Lin Phyo
63d97cce26 fix conflit 2017-08-28 18:22:32 +06:30
Zin Lin Phyo
1cbea173df product commission transaction in commissioner 2017-08-28 18:17:22 +06:30
yamin
0369cd6646 Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring 2017-08-28 17:56:24 +06:30
yamin
81c928b375 InJutyUpdate 2017-08-28 17:55:47 +06:30
Phyo
ace8794ac3 Merge branch 'master' into august_spring 2017-08-28 14:25:48 +06:30
Phyo
087c120cc7 tax bug fix 2017-08-28 14:24:53 +06:30
Yan
8577754c0f add item instance code to order item 2017-08-28 14:19:40 +06:30
Zin Lin Phyo
36b4b15688 added commission report 2017-08-28 10:52:14 +06:30
Zin Lin Phyo
4fd4fdaeb7 Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring
* 'august_spring' of bitbucket.org:code2lab/sxrestaurant:
  Dining Charges Bug Fix
  InJutyIndexform
2017-08-28 09:47:06 +06:30
Zin Lin Phyo
3131823ae0 commission update -> change route under settings 2017-08-28 09:46:36 +06:30
Nweni
c9998c0b65 Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring 2017-08-28 09:37:58 +06:30
Nweni
83ec17a3df inventory development 2017-08-28 09:37:36 +06:30
Yan
812a32a89f Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant 2017-08-25 18:57:06 +06:30
Yan
8b79cdef7b add doc in readme.md 2017-08-25 18:56:46 +06:30
Phyo
a0fe336589 Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring 2017-08-25 18:54:16 +06:30
Phyo
44105a5f3b Dining Charges Bug Fix 2017-08-25 18:52:35 +06:30
yamin
61817ce178 Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring 2017-08-25 18:49:02 +06:30