diff --git a/netforce_clinic/layouts/clinic_menu.xml b/netforce_clinic/layouts/clinic_menu.xml index 7d5d17d..17582ec 100644 --- a/netforce_clinic/layouts/clinic_menu.xml +++ b/netforce_clinic/layouts/clinic_menu.xml @@ -49,9 +49,9 @@ - - - + + + diff --git a/netforce_clinic/models/hd_case.py b/netforce_clinic/models/hd_case.py index 4e260de..7a531aa 100644 --- a/netforce_clinic/models/hd_case.py +++ b/netforce_clinic/models/hd_case.py @@ -92,15 +92,18 @@ class HDCase(Model): dlz_name=','.join([dlz for dlz in dlz_name]) names=[] fee=0 - sign=1 - if obj.state=='waiting_payment': - sign=-1 + #sign=1 + #if obj.state=='waiting_payment': + #sign=-1 for line in obj.lines: amt=line.amount or 0 prod=line.product_id categ=line.product_categ_id if categ and prod: #if categ and prod and line.reimbursable=='yes': + sign=1 + if line.reimbursable=='yes': + sign=-1 if categ.code=='EPO': name=prod.name or "" name=name.split("-") #XXX @@ -1097,7 +1100,7 @@ class HDCase(Model): for payment in obj.payments: context['payment_id']=payment.id data=self.get_report_payment_data(context=context) - limit_item=15 + limit_item=13 if data['state']=='draft': limit_item=10 for i in range(len(data['lines']),limit_item): diff --git a/netforce_clinic/models/shop.py b/netforce_clinic/models/shop.py index 5f5a237..784b2cd 100644 --- a/netforce_clinic/models/shop.py +++ b/netforce_clinic/models/shop.py @@ -592,7 +592,7 @@ class Shop(Model): for obj in get_model('clinic.shop').browse(ids): context['refer_id']=obj.id data=get_model('clinic.shop').get_page(context=context) - limit_item=15 + limit_item=13 if data['state']=='draft': limit_item=10 for i in range(len(data['lines']),limit_item): diff --git a/netforce_clinic/reports/cust_payment.odt b/netforce_clinic/reports/cust_payment.odt index 312642e..db87904 100644 Binary files a/netforce_clinic/reports/cust_payment.odt and b/netforce_clinic/reports/cust_payment.odt differ