Commit Graph

397 Commits

Author SHA1 Message Date
Nweni
abefd1f8f2 Update 2017-07-01 14:55:37 +06:30
Nweni
23f8430032 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-07-01 09:46:44 +06:30
Nweni
c589f11758 shift sale 2017-07-01 09:46:14 +06:30
Yan
3681a9558b sale return 2017-06-30 19:35:00 +06:30
Yan
a851f6de70 update taxobj in sale 2017-06-30 19:27:46 +06:30
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
02cc6e8cbd merge with crm 2017-06-30 16:04:57 +06:30
Yan
b0bec2afc4 add alt name to order and sale items and update seeds 2017-06-30 16:00:03 +06:30
Aung Myo
45c69ab536 update sale ability and shipt slae 2017-06-30 15:53:25 +06:30
Aung Myo
a5bf5222f6 update conflic file 2017-06-30 14:19:05 +06:30
Aung Myo
43b9bdc168 update shiftsale 2017-06-30 14:15:04 +06:30
Yan
fd0ae922eb fixed for auto print 2017-06-30 14:11:29 +06:30
Yan
baa1ce5fbc fix date function for shift sale 2017-06-30 13:55:26 +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
5e3935f176 update shift 2017-06-30 13:10:28 +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
Yan
dd95b29d7d control order to logout 2017-06-29 19:09:01 +06:30
Nweni
77220ae65b Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-29 18:59:27 +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
Yan
fd857146e8 fix for shift sale query and prepare rounding adj 2017-06-29 15:20:40 +06:30
Yan
fbeab17b3c merge with origin master 2017-06-29 14:08:20 +06:30
Yan
b63155a315 boolean updated 2017-06-29 14:06:58 +06:30
Nweni
11c3be8f4a Update 2017-06-29 14:05:03 +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
Aung Myo
557ad06600 update order queue printer 2017-06-29 10:52:12 +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
986655052a shift 2017-06-28 15:29:44 +06:30
Yan
879a4b366c print as print copies in printer setting 2017-06-28 14:29:11 +06:30
Nweni
55278c83bc fixed conflict 2017-06-28 12:58:27 +06:30
Nweni
f01e1b1ce3 edit login 2017-06-28 12:57:39 +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
Aung Myo
c16d322cea update pdf and font 2017-06-28 11:50:05 +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