Commit Graph

201 Commits

Author SHA1 Message Date
Yan
f7341c7855 Merge branch 'crm' of bitbucket.org:code2lab/sxrestaurant 2017-06-30 19:05:49 +06:30
Yan
71636b36db add Re-compute all amoute for sale 2017-06-30 19:05:13 +06:30
Aung Myo
2548fdcac1 update receipt bill 2017-06-30 18:02:17 +06:30
Yan
78be369a25 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-30 16:00:37 +06:30
Yan
b0bec2afc4 add alt name to order and sale items and update seeds 2017-06-30 16:00:03 +06:30
Nweni
18094f5a71 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-30 13:44:45 +06:30
Nweni
2713fae6b5 Update 2017-06-30 13:44:29 +06:30
Yan
34166a1387 merge with origin master 2017-06-30 13:39:52 +06:30
Yan
cae7157d8b Merge branch 'crm' of bitbucket.org:code2lab/sxrestaurant 2017-06-30 13:34:30 +06:30
Aung Myo
1d08954a76 update shift sale 2017-06-30 13:32:56 +06:30
Yan
9c1a324eff add other charges 2017-06-30 13:29:55 +06:30
Nweni
063d561f3e closing balance 2017-06-30 10:07:51 +06:30
Nweni
959102b338 Update 2017-06-30 09:49:51 +06:30
Nweni
8046bc7745 shift 2017-06-29 18:59:17 +06:30
Aung Myo
3b9c16d8d5 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into crm 2017-06-29 15:42:45 +06:30
Aung Myo
9305e0c4b4 update authorize void and edit in cashier 2017-06-29 15:39:46 +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
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
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