From 4f38511f3b1d29b9a29d860c7edc74b0b61b68a5 Mon Sep 17 00:00:00 2001 From: "watcha.h@almacom.co.th" Date: Mon, 4 May 2015 17:49:53 +0700 Subject: [PATCH] xxx --- netforce_clinic/models/report_cycle_item.py | 9 +++++++++ .../reports/report_cycle_item.xlsx | Bin 5439 -> 5590 bytes 2 files changed, 9 insertions(+) diff --git a/netforce_clinic/models/report_cycle_item.py b/netforce_clinic/models/report_cycle_item.py index 2ca5ba9..3a62586 100644 --- a/netforce_clinic/models/report_cycle_item.py +++ b/netforce_clinic/models/report_cycle_item.py @@ -228,10 +228,19 @@ class ReportCycleItem(Model): 'qty': qty, }) total_pt+=qty + vscl_lines2=[{}] + index=1 + for vscl_line in vscl_lines: + vscl_lines2[0].update({ + 'v%s'%index: vscl_line['description'], + 'v%s_1'%index: vscl_line['qty'], + }) + index+=1 data={ 'company_name': company_name or "", 'lines': nlines, 'vscl_lines': vscl_lines, + 'vscl_lines2': vscl_lines2, 'ptype_lines': ptype_lines, 'month': month_str, 'date_from': date_from, diff --git a/netforce_clinic/reports/report_cycle_item.xlsx b/netforce_clinic/reports/report_cycle_item.xlsx index 58b5d3f937aec40fb80b0fa6a7ec382227f92dfa..3abafdcb554928abb95c26dfe8a8303bc20b6246 100644 GIT binary patch delta 2336 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