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

misc, lab is not correct

conv_bal
watcha.h 2015-04-23 17:45:02 +07:00
parent 62c044f070
commit c68c521922
2 changed files with 10 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
netforce_clinic/models/hd_case.py
View File

@ -122,6 +122,7 @@ class HDCase(Model):
else: else:
mdc+=amt mdc+=amt
mdc_names.append(name or "") mdc_names.append(name or "")
continue #XXX
if categ.code=='EPO': if categ.code=='EPO':
name=prod.name or "" name=prod.name or ""
name=name.split("-") name=name.split("-")

28
netforce_clinic/models/report_account_hd_case_summary.py
View File

@ -199,28 +199,18 @@ class ReportAccountHDCaseSummary(Model):
number=vals['number'] number=vals['number']
if number not in records.keys(): if number not in records.keys():
records[number]=vals records[number]=vals
else: #FIXME please check
for code, item in items.items(): #else:
if vals.get(code): #for code, item in items.items():
if not records[number].get(code): #if vals.get(code):
records[number][code]=0 #if not records[number].get(code):
records[number][code]+=vals[code] #records[number][code]=0
records[number]['lab']+=vals['lab'] #records[number][code]+=vals[code]
records[number]['misc']+=vals['misc'] #records[number]['lab']+=vals['lab']
#records[number]['misc']+=vals['misc']
lines=[] lines=[]
for hdnumber, vals in records.items(): for hdnumber, vals in records.items():
lines.append(vals) lines.append(vals)
#get data from rd shop
#if reimbursable=='no':
#ctx={
#'date_from': date_from,
#'date_to': date_to,
#'branch_id': branch_id,
#'department_id': department_id,
#}
#shop_lines=get_model('clinic.shop').get_shop_data(context=ctx)['records']
#lines+=shop_lines
company_name=company.name or "" company_name=company.name or ""
if department_id: if department_id:
company_name+=' (%s)'%get_model('clinic.department').browse(department_id).name or "" company_name+=' (%s)'%get_model('clinic.department').browse(department_id).name or ""