Commit Graph

  • b78119f848 update print Aung Myo 2017-07-02 11:41:47 +06:30
  • b4eed19693 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant Nweni 2017-07-02 11:22:59 +06:30
  • acca5b5a1d Update Nweni 2017-07-02 11:22:49 +06:30
  • 678c37c6b0 Rebate Bug Fix Phyo 2017-07-02 11:00:01 +06:30
  • 972a717361 update payper and redeem Aung Myo 2017-07-02 10:04:06 +06:30
  • df553dd489 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into crm Aung Myo 2017-07-02 09:38:01 +06:30
  • 78adf564e1 crong job and close cashier Aung Myo 2017-07-02 09:37:19 +06:30
  • 97c70fb72b merge with crm Yan 2017-07-01 20:11:52 +06:30
  • 6fe2de877c remove add order Yan 2017-07-01 20:08:57 +06:30
  • c26b80066b update shift close print Aung Myo 2017-07-01 20:05:26 +06:30
  • e9b1845ed2 saturday fixed Yan 2017-07-01 20:02:14 +06:30
  • 51a779cbee add zone with oqs and tax calculte method update Yan 2017-07-01 19:11:04 +06:30
  • 740f585a31 update rounding adj Aung Myo 2017-07-01 18:19:41 +06:30
  • b0ec03f591 Update Nweni 2017-07-01 18:12:48 +06:30
  • 5f3708e11d menu updated | edit qty updated Nweni 2017-07-01 17:15:12 +06:30
  • 99986b1fb9 open cashier clear Nweni 2017-07-01 15:30:06 +06:30
  • cb753ed4e4 shift | cash In | cash out Nweni 2017-07-01 15:25:34 +06:30
  • abefd1f8f2 Update Nweni 2017-07-01 14:55:37 +06:30
  • 6e8b3afc6c merge with crm Yan 2017-07-01 11:13:34 +06:30
  • 40a2347c1b update report Aung Myo 2017-07-01 11:10:08 +06:30
  • 23f8430032 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant Nweni 2017-07-01 09:46:44 +06:30
  • c589f11758 shift sale Nweni 2017-07-01 09:46:14 +06:30
  • 273a50b093 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant superuser 2017-06-30 20:08:28 +06:30
  • 219944abbd update migrate Yan 2017-06-30 20:07:49 +06:30
  • be781ff022 update customer Aung Myo 2017-06-30 19:41:39 +06:30
  • 3bb8e9b15f Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant superuser 2017-06-30 19:35:31 +06:30
  • 3681a9558b sale return Yan 2017-06-30 19:35:00 +06:30
  • f23bbd6936 merge with origin master superuser 2017-06-30 19:33:04 +06:30
  • 336b76e4b2 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant superuser 2017-06-30 19:29:35 +06:30
  • 60dee30046 api/bill_controller edited superuser 2017-06-30 19:29:09 +06:30
  • a851f6de70 update taxobj in sale Yan 2017-06-30 19:27:46 +06:30
  • f7341c7855 Merge branch 'crm' of bitbucket.org:code2lab/sxrestaurant Yan 2017-06-30 19:05:49 +06:30
  • 71636b36db add Re-compute all amoute for sale Yan 2017-06-30 19:05:13 +06:30
  • 2548fdcac1 update receipt bill Aung Myo 2017-06-30 18:02:17 +06:30
  • 02cc6e8cbd merge with crm Yan 2017-06-30 16:04:57 +06:30
  • 78be369a25 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant Yan 2017-06-30 16:00:37 +06:30
  • b0bec2afc4 add alt name to order and sale items and update seeds Yan 2017-06-30 16:00:03 +06:30
  • 45c69ab536 update sale ability and shipt slae Aung Myo 2017-06-30 15:53:25 +06:30
  • 44faf2f56e before pull superuser 2017-06-30 14:19:30 +06:30
  • a5bf5222f6 update conflic file Aung Myo 2017-06-30 14:19:05 +06:30
  • 155e1a5ba3 hide shiftsale in header Aung Myo 2017-06-30 14:16:05 +06:30
  • 43b9bdc168 update shiftsale Aung Myo 2017-06-30 14:15:04 +06:30
  • fd0ae922eb fixed for auto print Yan 2017-06-30 14:11:29 +06:30
  • baa1ce5fbc fix date function for shift sale Yan 2017-06-30 13:55:26 +06:30
  • 18094f5a71 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant Nweni 2017-06-30 13:44:45 +06:30
  • 2713fae6b5 Update Nweni 2017-06-30 13:44:29 +06:30
  • 34166a1387 merge with origin master Yan 2017-06-30 13:39:52 +06:30
  • cae7157d8b Merge branch 'crm' of bitbucket.org:code2lab/sxrestaurant Yan 2017-06-30 13:34:30 +06:30
  • 1d08954a76 update shift sale Aung Myo 2017-06-30 13:32:56 +06:30
  • 9c1a324eff add other charges Yan 2017-06-30 13:29:55 +06:30
  • 5e3935f176 update shift Nweni 2017-06-30 13:10:28 +06:30
  • 063d561f3e closing balance Nweni 2017-06-30 10:07:51 +06:30
  • 959102b338 Update Nweni 2017-06-30 09:49:51 +06:30
  • dd95b29d7d control order to logout Yan 2017-06-29 19:09:01 +06:30
  • 77220ae65b Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant Nweni 2017-06-29 18:59:27 +06:30
  • 8046bc7745 shift Nweni 2017-06-29 18:59:17 +06:30
  • 3b9c16d8d5 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into crm Aung Myo 2017-06-29 15:42:45 +06:30
  • 9305e0c4b4 update authorize void and edit in cashier Aung Myo 2017-06-29 15:39:46 +06:30
  • fd857146e8 fix for shift sale query and prepare rounding adj Yan 2017-06-29 15:20:40 +06:30
  • f60c145c00 update queue Aung Myo 2017-06-29 14:33:05 +06:30
  • 769509adec add shift module Yan 2017-06-29 14:09:56 +06:30
  • fbeab17b3c merge with origin master Yan 2017-06-29 14:08:20 +06:30
  • b63155a315 boolean updated Yan 2017-06-29 14:06:58 +06:30
  • 11c3be8f4a Update Nweni 2017-06-29 14:05:03 +06:30
  • cf851327b3 fixed conflict Nweni 2017-06-29 13:52:55 +06:30
  • 8d09e5a919 shift sale update Nweni 2017-06-29 13:48:14 +06:30
  • 8ba2606f6e merge with crm Yan 2017-06-29 13:40:30 +06:30
  • e3c2f02c81 fixed conflict Nweni 2017-06-29 13:39:37 +06:30
  • 618a89472a shift open/close Nweni 2017-06-29 13:35:09 +06:30
  • 8045bb31e9 merge with discount Yan 2017-06-29 11:41:29 +06:30
  • 9991970203 add first bill Yan 2017-06-29 11:34:13 +06:30
  • 524edfc3b0 update print oqs order item Aung Myo 2017-06-29 11:06:04 +06:30
  • 557ad06600 update order queue printer Aung Myo 2017-06-29 10:52:12 +06:30
  • 173d824c27 update card column in queue Aung Myo 2017-06-28 23:45:28 +06:30
  • 58e95e573e update numberformat in pdf Aung Myo 2017-06-28 23:13:20 +06:30
  • 342b654f81 update print setting migration and delete unnessary font Aung Myo 2017-06-28 17:12:09 +06:30
  • 50091e4016 updated for api bill controller Yan 2017-06-28 16:56:43 +06:30
  • e9e184894d update fixed conflict Aung Myo 2017-06-28 16:44:31 +06:30
  • 20f89a65f8 delete japaness font Aung Myo 2017-06-28 16:39:25 +06:30
  • 02f9245c7f update receipt and oqs font Aung Myo 2017-06-28 16:18:14 +06:30
  • d35aa23e34 still dev to respond code for order Yan 2017-06-28 16:17:56 +06:30
  • 5ff75fad7d fix for undefied method type in item pdf Yan 2017-06-28 15:40:54 +06:30
  • 45961880c8 fixed conflict Nweni 2017-06-28 15:35:05 +06:30
  • f42c800ae1 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into payment Nweni 2017-06-28 15:34:14 +06:30
  • 6a3973beea fixed conflict Nweni 2017-06-28 15:33:27 +06:30
  • 986655052a shift Nweni 2017-06-28 15:29:44 +06:30
  • 879a4b366c print as print copies in printer setting Yan 2017-06-28 14:29:11 +06:30
  • ea4ba325fa text change percentage value Yan 2017-06-28 14:15:35 +06:30
  • 55278c83bc fixed conflict Nweni 2017-06-28 12:58:27 +06:30
  • f01e1b1ce3 edit login Nweni 2017-06-28 12:57:39 +06:30
  • ab7f08b1d6 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into crm Aung Myo 2017-06-28 12:47:18 +06:30
  • 5716294955 Merge branch 'master' of ssh://bitbucket.org/code2lab/sxrestaurant Min Zeya Phyo 2017-06-28 12:45:05 +06:30
  • c16d322cea update pdf and font Aung Myo 2017-06-28 11:50:05 +06:30
  • b975d6194f add remove item and remove all in discount Yan 2017-06-28 10:59:03 +06:30
  • ee651763b7 shift close and payment journal Min Zeya Phyo 2017-06-28 10:34:42 +06:30
  • 58a8cdec6e still dev dis Yan 2017-06-27 18:32:58 +06:30
  • 53ff3989b5 update merge cancan Aung Myo 2017-06-27 16:55:56 +06:30
  • 4f2e06cfe2 Merge branch 'crm' of bitbucket.org:code2lab/sxrestaurant into crm Aung Myo 2017-06-27 16:48:51 +06:30
  • 5a52183846 update pull master Aung Myo 2017-06-27 16:48:05 +06:30
  • de398c09c3 update Aung Myo 2017-06-27 16:24:03 +06:30