Yan
|
efb60e6f79
|
add calc tax order in sale
|
2017-09-11 14:05:19 +06:30 |
|
Yan
|
10bd525d02
|
Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into master-bug-fix
|
2017-09-08 13:50:55 +06:30 |
|
Phyo
|
69c52bf28b
|
Dininng Charges Free time Count Change
|
2017-09-08 13:45:52 +06:30 |
|
Phyo
|
e7f1964a78
|
Promotion over two promotion products
|
2017-09-08 11:38:34 +06:30 |
|
Yan
|
3d7295c081
|
Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant
|
2017-09-07 15:37:12 +06:30 |
|
Zin Lin Phyo
|
43cc308d89
|
stock check report
|
2017-09-07 10:30:20 +06:30 |
|
Yan
|
a50becb365
|
merge with august_spring
|
2017-09-06 18:32:45 +06:30 |
|
Zin Lin Phyo
|
2e53b72574
|
Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring
* 'august_spring' of bitbucket.org:code2lab/sxrestaurant:
Timepicker Bug Fix
Show data in Edit
Promotion Destory Bug Fix
|
2017-09-06 18:28:09 +06:30 |
|
Zin Lin Phyo
|
5e1e0cd5b9
|
stock_check report template
|
2017-09-06 18:27:58 +06:30 |
|
Phyo
|
4ca3b708c4
|
Show data in Edit
|
2017-09-06 17:01:33 +06:30 |
|
Zin Lin Phyo
|
784e740da3
|
rename in_juty to in_duty
|
2017-09-06 11:18:02 +06:30 |
|
Yan
|
995ee8298e
|
Merge branch 'oqs' of bitbucket.org:code2lab/sxrestaurant
|
2017-09-05 14:14:10 +06:30 |
|
Yan
|
3dc7fea339
|
date format fix for promotion
|
2017-09-05 14:12:53 +06:30 |
|
Aung Myo
|
eeb2a91ce9
|
update oqs action cable for order cahnnel and oqs channel
|
2017-09-05 09:41:05 +06:30 |
|
Yan
|
a4884c9bea
|
item instance code add to sale_item
|
2017-09-04 15:10:26 +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
|
c2d86cb17c
|
Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring
* 'august_spring' of bitbucket.org:code2lab/sxrestaurant:
Promotion multiple order
|
2017-09-04 10:24:54 +06:30 |
|
Zin Lin Phyo
|
98dae6d712
|
show and update changes in commission and report
|
2017-09-04 10:24:24 +06:30 |
|
Phyo
|
2eaf891748
|
Promotion multiple order
|
2017-09-04 10:22:54 +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 |
|
Yan
|
2399f1d494
|
update form attr name to attr id to instances
|
2017-08-31 11:41:38 +06:30 |
|
Yan
|
51d8c986f1
|
merge with august_spring
|
2017-08-30 19:16:07 +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 |
|
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 |
|
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 |
|
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
|
a9b606730c
|
fix for oqs print copy and update sym sql
|
2017-08-29 14:44:07 +06:30 |
|
Yan
|
e87209093b
|
date format for promotion and add sync sql
|
2017-08-29 13:58:13 +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 |
|
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
|
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 |
|