Yan b6bba9ecd4 merge conflict

2017-06-12 10:55:04 +06:30

..

assets

merge with crm

2017-06-12 10:25:07 +06:30

channels

origin pull master

2017-06-03 13:44:10 +06:30

controllers

merge conflict

2017-06-12 10:55:04 +06:30

forms

move login_from from model folder to form folder

2017-06-04 16:28:29 +06:30

helpers

merge with master

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

jobs

updated default who changed oqs in queue job

2017-06-08 19:26:47 +06:30

mailers

init project commit

2017-03-24 19:58:23 +06:30

models

merge with crm

2017-06-12 10:25:07 +06:30

pdf

to do req_bill_format and status changed after pay

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

reports

more controller for cashier/waiter view

2017-05-10 01:10:21 +06:30

views

merge conflict

2017-06-12 10:55:04 +06:30