Yan
|
d0a527d1ee
|
code review and fix
|
2017-09-05 13:53:06 +06:30 |
|
Yan
|
008da6ee47
|
Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into master-bug-fix
|
2017-09-04 14:58:30 +06:30 |
|
Zin Lin Phyo
|
6c94ba5457
|
in_juty ui update
|
2017-09-04 14:47:58 +06:30 |
|
Yan
|
82120e2ba1
|
updated commission for sale edit
|
2017-09-04 13:13:08 +06:30 |
|
Zin Lin Phyo
|
2330a1a33e
|
calculate commission in sale_edit, void, foc
|
2017-09-04 12:09:04 +06:30 |
|
Zin Lin Phyo
|
98dae6d712
|
show and update changes in commission and report
|
2017-09-04 10:24:24 +06:30 |
|
Yan
|
e9e7aec028
|
update item edit
|
2017-09-01 16:03:55 +06:30 |
|
Yan
|
3726e8a7c3
|
Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant
|
2017-08-31 18:09:35 +06:30 |
|
Zin Lin Phyo
|
0fbce1ca7c
|
fix conflit
|
2017-08-31 18:07:05 +06:30 |
|
Yan
|
e09559c508
|
merge with august spring but merge fail
|
2017-08-31 15:58:01 +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 |
|
Yan
|
f50ca87e59
|
Merge branch 'addorder' of bitbucket.org:code2lab/sxrestaurant
|
2017-08-30 19:16:20 +06:30 |
|
Yan
|
51d8c986f1
|
merge with august_spring
|
2017-08-30 19:16:07 +06:30 |
|
Aung Myo
|
84d483cad2
|
update addorder
|
2017-08-30 18:41:54 +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
|
de45fb29b8
|
Update
|
2017-08-30 14:21:05 +06:30 |
|
Nweni
|
cabc78c373
|
inventory
|
2017-08-30 14:19:24 +06:30 |
|
Yan
|
c7018ee774
|
Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant
|
2017-08-30 11:14:11 +06:30 |
|
Zin Lin Phyo
|
df4caa288d
|
jquery date-time picker
|
2017-08-30 10:46:46 +06:30 |
|
Zin Lin Phyo
|
4b97cd530e
|
commission report export excel
|
2017-08-29 23:05:03 +06:30 |
|
Yan
|
76fb16615d
|
merge with august sprint for commission
|
2017-08-29 18:44:31 +06:30 |
|
Zin Lin Phyo
|
f03d8654e7
|
commission report
|
2017-08-29 18:36:46 +06:30 |
|
Yan
|
7c5db11df5
|
merge with addorder
|
2017-08-29 18:08:05 +06:30 |
|
Aung Myo
|
2e48c1529e
|
update addorder
|
2017-08-29 17:58:34 +06:30 |
|
Yan
|
bbd9a50868
|
merge with august spring
|
2017-08-28 18:33:49 +06:30 |
|
Yan
|
6472a2deac
|
Merge branch 'addorder' of bitbucket.org:code2lab/sxrestaurant
|
2017-08-28 18:27:58 +06:30 |
|
Aung Myo
|
1372285c7f
|
update add order
|
2017-08-28 18:27:22 +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 |
|
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 |
|
Aung Myo
|
2522950019
|
update create order function
|
2017-08-25 18:55:34 +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 |
|
yamin
|
57d668d122
|
InJutyIndexform
|
2017-08-25 18:48:34 +06:30 |
|
Zin Lin Phyo
|
ef9fe32b5b
|
fix conflit
|
2017-08-25 13:46:50 +06:30 |
|
Zin Lin Phyo
|
b4eb27b8a9
|
commission in sale edit
|
2017-08-25 13:44:22 +06:30 |
|
yamin
|
29a5062b85
|
InJutiesUpdate
|
2017-08-25 13:06:25 +06:30 |
|
Yan
|
5aa8727f42
|
Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant
|
2017-08-25 11:20:24 +06:30 |
|