Yan
fbeab17b3c
merge with origin master
2017-06-29 14:08:20 +06:30
Nweni
8d09e5a919
shift sale update
2017-06-29 13:48:14 +06:30
Yan
8ba2606f6e
merge with crm
2017-06-29 13:40:30 +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
8045bb31e9
merge with discount
2017-06-29 11:41:29 +06:30
Yan
9991970203
add first bill
2017-06-29 11:34:13 +06:30
Yan
50091e4016
updated for api bill controller
2017-06-28 16:56:43 +06:30
Aung Myo
e9e184894d
update fixed conflict
2017-06-28 16:44:31 +06:30
Yan
5ff75fad7d
fix for undefied method type in item pdf
2017-06-28 15:40:54 +06:30
Nweni
f42c800ae1
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into payment
2017-06-28 15:34:14 +06:30
Nweni
6a3973beea
fixed conflict
2017-06-28 15:33:27 +06:30
Nweni
986655052a
shift
2017-06-28 15:29:44 +06:30
Yan
ea4ba325fa
text change percentage value
2017-06-28 14:15:35 +06:30
Aung Myo
ab7f08b1d6
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into crm
2017-06-28 12:47:18 +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
Aung Myo
5a52183846
update pull master
2017-06-27 16:48:05 +06:30
Aung Myo
ff2844124e
update utc
2017-06-27 15:10:42 +06:30
Zin Lin Phyo
1c65a38b70
fix conflit
2017-06-27 14:04:29 +06:30
Yan
def8ce34c2
Merge branch 'settings_backend' of bitbucket.org:code2lab/sxrestaurant
2017-06-27 12:07:35 +06:30
Phyo
7810fc693b
Pending Payment
2017-06-27 12:06:18 +06:30
Yan
4f78c63b63
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
2017-06-27 11:53:46 +06:30
Yan
e38886790c
not show price 0 fixed
2017-06-27 11:52:51 +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
e09dbb095c
not to show price 0 and 10
2017-06-27 10:15:22 +06:30
Yan
6f741e0a0c
Merge branch 'crm' of bitbucket.org:code2lab/sxrestaurant
2017-06-26 19:28:21 +06:30
Aung Myo
60fe3b9a67
update crmad ability
2017-06-26 19:22:16 +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
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
c81663003f
update in discount
2017-06-26 17:01:25 +06:30
Yan
0c2e299ced
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
2017-06-26 16:37:02 +06:30
Nweni
04e44c4859
fixed conflict
2017-06-26 16:35:24 +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
46ad87314a
Add color blue to orders
2017-06-26 14:39:25 +06:30
Yan
e1c981e8c2
merge with crm
2017-06-26 14:23:56 +06:30
Yan
00c19fdd67
sub total fixed in origami shows
2017-06-26 14:16:22 +06:30
Phyo
cb2124c6a6
refresh 10 sec
2017-06-26 12:57:36 +06:30
Phyo
a05fc0f646
Up to Amount bug fix
2017-06-26 12:55:44 +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
