Nweni fa34d1db8f fixed conflict

2017-06-04 10:23:38 +06:30

..

api

Append Order Detail view finished

2017-06-01 18:47:08 +06:30

crm

update booking complete and cancle in crm

2017-06-02 14:02:54 +06:30

home

…

install

…

layouts

add new model - shop - it will be use to define what is setup

2017-06-03 15:04:53 +06:30

oqs

oqs item count fixed

2017-06-03 13:25:23 +06:30

origami

update

2017-06-02 17:53:25 +06:30

print_settings

Print ui update

2017-06-02 18:49:44 +06:30

settings

fixed conflict

2017-06-04 10:23:38 +06:30

transactions/sales

…