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

show product venofer in report medical summary

fix_acc
watcha.h 2015-08-21 11:39:38 +07:00
parent 5383a3cc6a
commit da2a445432
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
netforce_clinic/models/report_medical_detail.py
View File

@ -101,8 +101,12 @@ class ReportMedicalDetail(Model):
dom.append(['hd_case_id.branch_id','=',branch_id]) dom.append(['hd_case_id.branch_id','=',branch_id])
if department_id: if department_id:
dom.append(['hd_case_id.department_id','=',department_id]) dom.append(['hd_case_id.department_id','=',department_id])
if prod_categ_id: st=get_model("clinic.setting").browse(1)
dom.append(['product_categ_id.id','child_of',prod_categ_id]) ct_ids=[]
for categ in st.product_categ_view:
ct_ids.append(categ.id)
if ct_ids:
dom.append(['product_categ_id.id','in',ct_ids])
if product_id: if product_id:
dom.append(['product_id','=',product_id]) dom.append(['product_id','=',product_id])
if types and ids: if types and ids:

2
netforce_clinic/models/report_medical_summary.py
View File

@ -96,7 +96,7 @@ class ReportMedicalSummary(Model):
for prod in get_model("product").search_browse(dom): for prod in get_model("product").search_browse(dom):
prod_code=prod.code or "" prod_code=prod.code or ""
categ=prod.categ_id categ=prod.categ_id
if categ and categ.parent_id: if categ:
categ_ids.update({categ.id}) categ_ids.update({categ.id})
products[prod_code]={} products[prod_code]={}
for patient_type_id,type_name in patient_types.items(): for patient_type_id,type_name in patient_types.items():