diff --git a/netforce_clinic/models/report_account_hd_case_summary.py b/netforce_clinic/models/report_account_hd_case_summary.py index 10a103c..83348cf 100644 --- a/netforce_clinic/models/report_account_hd_case_summary.py +++ b/netforce_clinic/models/report_account_hd_case_summary.py @@ -340,6 +340,8 @@ class ReportAccountHDCaseSummary(Model): 'name': categ, 'qty': qty, }) + data['categ_lines_txt']=', '.join(['%s: %s'%(l['name'], l['qty']) for l in data['categ_lines']]) + data['types_txt']=', '.join(['%s: %s'%(l['name'], l['qty']) for l in data['types'] +[{"name": "Total", "qty": total_qty}]]) return data def onchange_date(self,context={}): diff --git a/netforce_clinic/reports/report_account_hd_case_summary.xlsx b/netforce_clinic/reports/report_account_hd_case_summary.xlsx index be763ec..8b0c9b7 100644 Binary files a/netforce_clinic/reports/report_account_hd_case_summary.xlsx and b/netforce_clinic/reports/report_account_hd_case_summary.xlsx differ diff --git a/netforce_clinic/templates/report_account_hd_case_summary.hbs b/netforce_clinic/templates/report_account_hd_case_summary.hbs index c1071bf..e64af47 100644 --- a/netforce_clinic/templates/report_account_hd_case_summary.hbs +++ b/netforce_clinic/templates/report_account_hd_case_summary.hbs @@ -25,14 +25,14 @@ {{else}} {{/ifeq}} - {{#if ptype_id}} + {{#if ptype_id}} + Total: {{total_qty}} + {{else}} + {{#each types}} + {{name}}: {{qty}} + {{/each}} Total: {{total_qty}} - {{else}} - {{#each types}} - {{name}}: {{qty}} - {{/each}} - Total: {{total_qty}} - {{/if}} + {{/if}}