Commit Graph

493 Commits

Author SHA1 Message Date
Yan
e9b1845ed2 saturday fixed 2017-07-01 20:02:14 +06:30
Aung Myo
740f585a31 update rounding adj 2017-07-01 18:19:41 +06:30
Nweni
5f3708e11d menu updated | edit qty updated 2017-07-01 17:15:12 +06:30
Nweni
99986b1fb9 open cashier clear 2017-07-01 15:30:06 +06:30
Nweni
cb753ed4e4 shift | cash In | cash out 2017-07-01 15:25:34 +06:30
Nweni
abefd1f8f2 Update 2017-07-01 14:55:37 +06:30
Nweni
c589f11758 shift sale 2017-07-01 09:46:14 +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
9c1a324eff add other charges 2017-06-30 13:29:55 +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
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
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