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

fix permission

report_acc_hdcase_summary
watcha.h 2016-12-01 01:52:00 +07:00
parent 17d342155a
commit 67f5bfa29d
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
netforce_clinic/models/report_medical_detail.py
View File

@ -103,7 +103,9 @@ class ReportMedicalDetail(Model):
shop_dom.append(['shop_id.branch_id','=',branch_id]) shop_dom.append(['shop_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])
dom.append(['hd_case_id.patient_id.department_id','=',department_id])
shop_dom.append(['shop_id.department_id','=',department_id]) shop_dom.append(['shop_id.department_id','=',department_id])
shop_dom.append(['shop_id.patient_id.department_id','=',department_id])
st=get_model("clinic.setting").browse(1) st=get_model("clinic.setting").browse(1)
ct_ids=[] ct_ids=[]
for categ in st.product_categ_view: for categ in st.product_categ_view:
@ -122,6 +124,7 @@ class ReportMedicalDetail(Model):
dom.append(["hd_case_id.state","not in",["waiting_payment","paid"]]) dom.append(["hd_case_id.state","not in",["waiting_payment","paid"]])
lines=[] lines=[]
total_qty=0 total_qty=0
print('DOM ', dom)
for line in get_model('clinic.hd.case.line').search_browse(dom): for line in get_model('clinic.hd.case.line').search_browse(dom):
hdcase=line.hd_case_id hdcase=line.hd_case_id
patient=hdcase.patient_id patient=hdcase.patient_id

11
netforce_clinic/models/report_medical_summary.py
View File

@ -87,6 +87,7 @@ class ReportMedicalSummary(Model):
['date','>=',time_start], ['date','>=',time_start],
['date','<=',time_stop], ['date','<=',time_stop],
['department_id','=',department_id], ['department_id','=',department_id],
['patient_id.department_id','=',department_id],
['branch_id','=',branch_id], ['branch_id','=',branch_id],
] ]
dom.append(['type','=','stock']) dom.append(['type','=','stock'])
@ -122,6 +123,7 @@ class ReportMedicalSummary(Model):
dom.append(['branch_id','=',branch_id]) dom.append(['branch_id','=',branch_id])
if department_id: if department_id:
dom.append(['department_id','=',department_id]) dom.append(['department_id','=',department_id])
dom.append(['patient_id.department_id','=',department_id])
if report_type=='completed': if report_type=='completed':
dom.append(["state","in",["waiting_payment","paid"]]) dom.append(["state","in",["waiting_payment","paid"]])
else: else:
@ -136,10 +138,11 @@ class ReportMedicalSummary(Model):
continue continue
if categ and categ.id not in list(categ_ids): if categ and categ.id not in list(categ_ids):
continue continue
if themself_id and patient_type_id!=themself_id and line.reimbursable=='no': #This will be combine to cash payment. To know CHECK WITH P Moo
products[prod_code][themself_id]['qty']+=line.qty #if themself_id and patient_type_id!=themself_id and line.reimbursable=='no':
else: #products[prod_code][themself_id]['qty']+=line.qty
products[prod_code][patient_type_id]['qty']+=line.qty #else:
products[prod_code][patient_type_id]['qty']+=line.qty
# add qty from rd shop # add qty from rd shop
for shop in get_model("clinic.shop").search_browse(shop_dom): for shop in get_model("clinic.shop").search_browse(shop_dom):