Nweni 77220ae65b Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant

2017-06-29 18:59:27 +06:30

..

assets

fixed conflict

2017-06-29 13:39:37 +06:30

channels

…

controllers

Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant

2017-06-29 18:59:27 +06:30

forms

shift close and payment journal

2017-06-28 10:34:42 +06:30

helpers

Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into crm

2017-06-28 12:47:18 +06:30

jobs

update order for oqs

2017-06-16 18:55:14 +06:30

mailers

…

models

Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant

2017-06-29 18:59:27 +06:30

pdf

merge with crm

2017-06-29 13:40:30 +06:30

reports

update

2017-06-14 18:56:11 +06:30

views

Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant

2017-06-29 18:59:27 +06:30