Yan
9c1a324eff
add other charges
2017-06-30 13:29:55 +06:30
Nweni
e3c2f02c81
fixed conflict
2017-06-29 13:39:37 +06:30
Nweni
618a89472a
shift open/close
2017-06-29 13:35:09 +06:30
Yan
9991970203
add first bill
2017-06-29 11:34:13 +06:30
Yan
5ff75fad7d
fix for undefied method type in item pdf
2017-06-28 15:40:54 +06:30
Nweni
986655052a
shift
2017-06-28 15:29:44 +06:30
Min Zeya Phyo
5716294955
Merge branch 'master' of ssh://bitbucket.org/code2lab/sxrestaurant
...
* 'master' of ssh://bitbucket.org/code2lab/sxrestaurant:
billed
rake task
Pending Payment
Credit payment
update page height bill pdf
not show price 0 fixed
multiple invoice void
rake task fix
Shop View
Shop View
get update
not to show price 0 and 10
2017-06-28 12:45:05 +06:30
Yan
b975d6194f
add remove item and remove all in discount
2017-06-28 10:59:03 +06:30
Min Zeya Phyo
ee651763b7
shift close and payment journal
2017-06-28 10:34:42 +06:30
Yan
58a8cdec6e
still dev dis
2017-06-27 18:32:58 +06:30
Zin Lin Phyo
8d8f7b9093
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
2017-06-27 11:35:48 +06:30
Zin Lin Phyo
bcd44db9a2
multiple invoice void
2017-06-27 11:35:36 +06:30
Nweni
463e8e5875
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
2017-06-27 10:28:58 +06:30
Nweni
535a5825fb
get update
2017-06-27 10:28:47 +06:30
Yan
ef8f280d0e
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
2017-06-26 18:46:16 +06:30
Yan
034c9932a6
Merge branch 'crm' of bitbucket.org:code2lab/sxrestaurant
2017-06-26 18:45:55 +06:30
Zin Lin Phyo
9d76e1313a
overall void update
2017-06-26 18:13:43 +06:30
Zin Lin Phyo
5489da2066
route conflit fix
2017-06-26 18:02:08 +06:30
Zin Lin Phyo
feb1d66257
overall void
2017-06-26 18:00:48 +06:30
Aung Myo
02e3ebefda
update receipt
2017-06-26 17:56:31 +06:30
Nweni
089848ed4a
credit note payment
2017-06-26 17:49:55 +06:30
Yan
e878275c1b
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
2017-06-26 17:10:25 +06:30
Nweni
d4983fabf5
item void
2017-06-26 17:07:17 +06:30
Yan
adf06cf6f5
Merge branch 'crm' of bitbucket.org:code2lab/sxrestaurant
2017-06-26 17:02:25 +06:30
Aung Myo
6e77a71946
update customer seed shop and receipt bill
2017-06-26 16:50:04 +06:30
Yan
0c2e299ced
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
2017-06-26 16:37:02 +06:30
Nweni
20afabd86d
item void
2017-06-26 16:34:03 +06:30
Yan
813f2ecf2d
merge with settings_backend
2017-06-26 14:46:31 +06:30
Phyo
5017549f86
Merge branch 'master' into settings_backend
2017-06-26 11:13:06 +06:30
Phyo
6e49f91b89
Multiple Invoices Phase 1
2017-06-26 11:10:49 +06:30
Yan
ecc9ab53ec
Merge branch 'cancan' of bitbucket.org:code2lab/sxrestaurant
2017-06-26 09:59:16 +06:30
Nweni
c65c466399
edit
2017-06-26 06:28:09 +06:30
Aung Myo
d9c53e73f8
update customer
2017-06-24 11:12:30 +06:30
Yan
1f6a0eb1f6
fix with merge
2017-06-23 19:20:00 +06:30
Yan
e01ecc6e0f
merge origin master
2017-06-23 17:53:53 +06:30
Yan
a996ccc7ee
Merge branch 'discount' of bitbucket.org:code2lab/sxrestaurant
2017-06-23 17:51:46 +06:30
Yan
27ff8b89e7
merge with crm
2017-06-23 17:51:09 +06:30
Nweni
81c50f220a
edit invoice
2017-06-23 17:37:08 +06:30
Yan
3a0e26b2ea
accounts and discount updated
2017-06-23 17:05:08 +06:30
Aung Myo
f5f0f9e077
update crm customer and bind customer and queue
2017-06-23 17:03:52 +06:30
Aung Myo
01e5b7ba6c
update authorize
2017-06-23 09:41:48 +06:30
Yan
139c3c997a
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
2017-06-22 18:05:38 +06:30
Yan
7bf2499e83
add options in oqs
2017-06-22 17:32:13 +06:30
Nweni
0c0e44c808
move table
2017-06-22 16:31:41 +06:30
Aung Myo
25b6a893f2
first cancan
2017-06-22 15:33:55 +06:30
Yan
cb40f06854
fixed for customer
2017-06-22 15:01:13 +06:30
Yan
f44abd5192
Merge branch 'settings_backend' of bitbucket.org:code2lab/sxrestaurant
2017-06-22 14:58:17 +06:30
Nweni
09252ba055
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
2017-06-22 14:27:12 +06:30
Nweni
0ea2b778d1
multiple sale and order
2017-06-22 14:26:23 +06:30
Phyo
f8cab803f8
Redeem amount bug fic
2017-06-22 13:31:54 +06:30
