Commit Graph

1379 Commits

Author SHA1 Message Date
Nweni
cabc78c373 inventory 2017-08-30 14:19:24 +06:30
Nweni
c9998c0b65 Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring 2017-08-28 09:37:58 +06:30
Nweni
83ec17a3df inventory development 2017-08-28 09:37:36 +06:30
Phyo
a0fe336589 Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring 2017-08-25 18:54:16 +06:30
Phyo
44105a5f3b Dining Charges Bug Fix 2017-08-25 18:52:35 +06:30
yamin
61817ce178 Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring 2017-08-25 18:49:02 +06:30
yamin
57d668d122 InJutyIndexform 2017-08-25 18:48:34 +06:30
Zin Lin Phyo
ef9fe32b5b fix conflit 2017-08-25 13:46:50 +06:30
Zin Lin Phyo
b4eb27b8a9 commission in sale edit 2017-08-25 13:44:22 +06:30
yamin
29a5062b85 InJutiesUpdate 2017-08-25 13:06:25 +06:30
Nweni
6aaea69f0a Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring 2017-08-25 09:41:44 +06:30
Nweni
b99c503afa inventory 2017-08-25 09:40:59 +06:30
Phyo
d1f0356851 Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring 2017-08-24 18:32:14 +06:30
Phyo
8b33a94d93 Promotion Tax bug fix 2017-08-24 18:31:53 +06:30
yamin
4791656a7d Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring 2017-08-24 18:26:28 +06:30
yamin
7004637027 In_juties 2017-08-24 18:24:57 +06:30
Nweni
1f7ba42e80 Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring 2017-08-24 18:04:57 +06:30
Nweni
81f430b5c6 inventory setup 2017-08-24 18:04:42 +06:30
Phyo
9327cb7169 Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring 2017-08-24 15:28:34 +06:30
Phyo
0670a6a05d Promotion Product Bug Fix 2017-08-24 14:37:11 +06:30
Zin Lin Phyo
283c59c5dc Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring
* 'august_spring' of bitbucket.org:code2lab/sxrestaurant:
  Promotion Time Fixed
2017-08-24 10:08:56 +06:30
Zin Lin Phyo
f2ddcb9e4b readded commission 2017-08-24 10:05:07 +06:30
Phyo
0118a178b2 Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring 2017-08-23 19:18:18 +06:30
Phyo
857fcd419f Promotion Time Fixed 2017-08-23 19:09:44 +06:30
yamin
258ab711e1 Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring 2017-08-23 18:15:36 +06:30
yamin
d88199150e CRUDIn_Juties 2017-08-23 18:14:31 +06:30
Nweni
688ce932cc promotion 2017-08-23 18:07:58 +06:30
Nweni
44459ce4b5 Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring 2017-08-23 17:37:47 +06:30
Nweni
de769f3faf promotion 2017-08-23 17:37:13 +06:30
Zin Lin Phyo
784da2cf09 Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring
* 'august_spring' of bitbucket.org:code2lab/sxrestaurant:
  UpdateCommissioner
2017-08-23 15:24:50 +06:30
Zin Lin Phyo
f205d9910e readded commissions_controller 2017-08-23 15:19:55 +06:30
yamin
111872c158 Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring 2017-08-23 15:04:34 +06:30
yamin
621dfb03fe UpdateCommissioner 2017-08-23 15:03:53 +06:30
Zin Lin Phyo
d56132f6f4 Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring
* 'august_spring' of bitbucket.org:code2lab/sxrestaurant:
  Dining Charges Fix for free time
2017-08-23 15:03:16 +06:30
Zin Lin Phyo
874a9b60be create InJuty 2017-08-23 15:02:27 +06:30
Phyo
790b7939fc Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring 2017-08-23 13:59:52 +06:30
Phyo
248b807633 Dining Charges Fix for free time 2017-08-23 13:59:27 +06:30
Zin Lin Phyo
d6b8e8bdee update commissioner 2017-08-23 11:36:36 +06:30
Zin Lin Phyo
3132bc7c34 commission update 2017-08-23 11:14:24 +06:30
Zin Lin Phyo
b53db9b08b Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring
* 'august_spring' of bitbucket.org:code2lab/sxrestaurant:
  nested form
2017-08-23 10:24:44 +06:30
Zin Lin Phyo
fd1bfb7c0e load commissioner 2017-08-23 10:24:26 +06:30
Nweni
67cf713b90 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into august_spring 2017-08-23 10:13:06 +06:30
Nweni
eedf6c39a1 promotion + merge with master 2017-08-23 10:12:41 +06:30
Nweni
28dab9d3e0 promotion 2017-08-23 09:48:15 +06:30
Yan
94cc126969 fix for pdf print setting 2017-08-22 18:02:16 +06:30
Yan
744065d3e9 merge with august_spring 2017-08-22 14:52:14 +06:30
Nweni
533cfdfe8d Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring 2017-08-22 14:12:04 +06:30
Yan
c3e511c8ed fix menu edit 2017-08-22 14:11:25 +06:30
Nweni
44f02be4cb nested form 2017-08-22 14:11:13 +06:30
Yan
a400bb5a0e remove extra menu image 2017-08-22 11:44:31 +06:30