Aung Myo 90e583b212 Merge branch 'crm'

2017-06-12 15:47:29 +06:30

..

assets

update origami js and index

2017-06-12 15:39:38 +06:30

channels

…

controllers

fixed conflictfile

2017-06-12 15:01:19 +06:30

forms

…

helpers

merge with master

2017-06-12 10:01:36 +06:30

jobs

…

mailers

…

models

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

2017-06-12 15:03:02 +06:30

pdf

to do req_bill_format and status changed after pay

2017-06-12 00:45:26 +06:30

reports

…

views

Merge branch 'crm'

2017-06-12 15:47:29 +06:30