Netforce-Customized
/
clinic
mirror of https://dev.netforce.co.th/netforce-customized/clinic.git
3
0
Fork 0
Code Issues 3 Packages Projects Releases Wiki Activity

report

conv_bal
watcha.h 2015-03-18 18:22:14 +07:00
parent 93f315a91f
commit 329e9ee20d
4 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
netforce_clinic/layouts/clinic_menu.xml
View File

@ -49,9 +49,9 @@
<item string="Cycle Item Summary" action="clinic_report_cycle_item"/> <item string="Cycle Item Summary" action="clinic_report_cycle_item"/>
<item string="HD Case Summary" action="clinic_report_hd_case_summary"/> <item string="HD Case Summary" action="clinic_report_hd_case_summary"/>
<!--<item string="HD Case Summary(PDF)" action="clinic_hd_case_print"/>--> <!--<item string="HD Case Summary(PDF)" action="clinic_hd_case_print"/>-->
<item string="Medical Summary" action="clinic_report_medical_summary"/> <!--<item string="Medical Summary" action="clinic_report_medical_summary"/>-->
<item string="Recent Patient" action="clinic_report_recent_patient"/> <!--<item string="Recent Patient" action="clinic_report_recent_patient"/>-->
<item string="Discontinue Patient" action="clinic_report_discontinue_patient"/> <!--<item string="Discontinue Patient" action="clinic_report_discontinue_patient"/>-->
</item> </item>
<item string="Settings" perm="clinic_settings"> <item string="Settings" perm="clinic_settings">
<item string="Titles" action="clinic_name_title" perm="clinic_name_title"/> <item string="Titles" action="clinic_name_title" perm="clinic_name_title"/>

11
netforce_clinic/models/hd_case.py
View File

@ -92,15 +92,18 @@ class HDCase(Model):
dlz_name=','.join([dlz for dlz in dlz_name]) dlz_name=','.join([dlz for dlz in dlz_name])
names=[] names=[]
fee=0 fee=0
sign=1 #sign=1
if obj.state=='waiting_payment': #if obj.state=='waiting_payment':
sign=-1 #sign=-1
for line in obj.lines: for line in obj.lines:
amt=line.amount or 0 amt=line.amount or 0
prod=line.product_id prod=line.product_id
categ=line.product_categ_id categ=line.product_categ_id
if categ and prod: if categ and prod:
#if categ and prod and line.reimbursable=='yes': #if categ and prod and line.reimbursable=='yes':
sign=1
if line.reimbursable=='yes':
sign=-1
if categ.code=='EPO': if categ.code=='EPO':
name=prod.name or "" name=prod.name or ""
name=name.split("-") #XXX name=name.split("-") #XXX
@ -1097,7 +1100,7 @@ class HDCase(Model):
for payment in obj.payments: for payment in obj.payments:
context['payment_id']=payment.id context['payment_id']=payment.id
data=self.get_report_payment_data(context=context) data=self.get_report_payment_data(context=context)
limit_item=15 limit_item=13
if data['state']=='draft': if data['state']=='draft':
limit_item=10 limit_item=10
for i in range(len(data['lines']),limit_item): for i in range(len(data['lines']),limit_item):

2
netforce_clinic/models/shop.py
View File

@ -592,7 +592,7 @@ class Shop(Model):
for obj in get_model('clinic.shop').browse(ids): for obj in get_model('clinic.shop').browse(ids):
context['refer_id']=obj.id context['refer_id']=obj.id
data=get_model('clinic.shop').get_page(context=context) data=get_model('clinic.shop').get_page(context=context)
limit_item=15 limit_item=13
if data['state']=='draft': if data['state']=='draft':
limit_item=10 limit_item=10
for i in range(len(data['lines']),limit_item): for i in range(len(data['lines']),limit_item):

BIN
netforce_clinic/reports/cust_payment.odt
View File

Binary file not shown.