Aung Myo
|
ab7f08b1d6
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into crm
|
2017-06-28 12:47:18 +06:30 |
|
Min Zeya Phyo
|
ee651763b7
|
shift close and payment journal
|
2017-06-28 10:34:42 +06:30 |
|
Aung Myo
|
53ff3989b5
|
update merge cancan
|
2017-06-27 16:55:56 +06:30 |
|
Min Zeya Phyo
|
c1646b812e
|
route update
|
2017-06-27 01:15:40 +06:30 |
|
Aung Myo
|
4c13be257b
|
update authroize
|
2017-06-26 22:45:34 +06:30 |
|
Min Zeya Phyo
|
1ea9125f80
|
Merge branch 'master' of ssh://bitbucket.org/code2lab/sxrestaurant
# Conflicts:
# Gemfile.lock
# app/views/layouts/application.html.erb
|
2017-06-26 21:57:55 +06:30 |
|
Min Zeya Phyo
|
b607154037
|
New Login form
|
2017-06-26 21:56:13 +06:30 |
|
Yan
|
6f741e0a0c
|
Merge branch 'crm' of bitbucket.org:code2lab/sxrestaurant
|
2017-06-26 19:28:21 +06:30 |
|
Aung Myo
|
376af85c64
|
update credit
|
2017-06-26 19:02:36 +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 |
|
Nweni
|
089848ed4a
|
credit note payment
|
2017-06-26 17:49:55 +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 |
|
Yan
|
560ea343a6
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
|
2017-06-26 09:55:56 +06:30 |
|
Nweni
|
c65c466399
|
edit
|
2017-06-26 06:28:09 +06:30 |
|
Yan
|
a91816bb4e
|
qty edit in oqs
|
2017-06-25 22:41:26 +06:30 |
|
Yan
|
e01ecc6e0f
|
merge origin master
|
2017-06-23 17:53:53 +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 |
|
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 |
|
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 |
|
Aung Myo
|
54526230aa
|
update customerbind in origami
|
2017-06-22 10:25:40 +06:30 |
|
Yan
|
de8f577786
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
|
2017-06-22 09:53:04 +06:30 |
|
Aung Myo
|
d9d07a1cdc
|
update reprint
|
2017-06-21 18:19:44 +06:30 |
|
Nweni
|
64210f30ac
|
move table
|
2017-06-21 17:53:44 +06:30 |
|
Aung Myo
|
6c4c817453
|
fixed fonflict
|
2017-06-21 10:22:43 +06:30 |
|
Nweni
|
fa309fb89a
|
move whole table
|
2017-06-21 05:36:58 +06:30 |
|
Nweni
|
a9e1d8c3d1
|
origami
|
2017-06-20 18:59:34 +06:30 |
|
Nweni
|
a71ee3657a
|
origami changes
|
2017-06-20 07:36:38 +06:30 |
|
Aung Myo
|
675d83c80f
|
sale item report and rebate balance
|
2017-06-19 11:54:34 +06:30 |
|
Yan
|
cf5854c2bb
|
Merge branch 'crm' of bitbucket.org:code2lab/sxrestaurant
|
2017-06-19 11:06:39 +06:30 |
|
Aung Myo
|
6ffa73fa6f
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into crm
|
2017-06-18 20:18:12 +06:30 |
|
Aung Myo
|
7881ae4dfa
|
daily sale report
|
2017-06-18 16:38:46 +06:30 |
|
Yan
|
74c6f3cebc
|
Merge branch 'crm' of bitbucket.org:code2lab/sxrestaurant into staging
|
2017-06-18 12:10:30 +06:30 |
|
Aung Myo
|
b62d5349c6
|
assign queue and other bug
|
2017-06-18 00:03:09 +06:30 |
|
Yan
|
420e1b9cbc
|
all info details in oqs
|
2017-06-17 14:15:08 +06:30 |
|
Aung Myo
|
09a96372c8
|
update void and complete sale
|
2017-06-16 10:20:20 +06:30 |
|
Aung Myo
|
f0ea6f3c56
|
finish reprint
|
2017-06-15 19:07:33 +06:30 |
|
Aung Myo
|
b5743eb7a7
|
update customer bolder
|
2017-06-15 18:18:35 +06:30 |
|
Aung Myo
|
f0d3f30d88
|
update order queue , sale void
|
2017-06-15 16:24:00 +06:30 |
|
Yan
|
8cfa2bc5c5
|
payment bill added and origami bug fixed
|
2017-06-14 19:41:32 +06:30 |
|