diff --git a/netforce_clinic/models/print_labor_cost.py b/netforce_clinic/models/print_labor_cost.py index dc2d389..14534d0 100644 --- a/netforce_clinic/models/print_labor_cost.py +++ b/netforce_clinic/models/print_labor_cost.py @@ -283,7 +283,7 @@ class PrintLaborCost(Model): os.system("cp -rf %s ."%tmp_dir) os.system("cp merge.py labor_cost/") - os.system("python labor_cost/merge.py labor_cost") + os.system("python labor_cost/merge.py labor_cost %s"%(obj.name)) os.system("rm labor_cost/*.py") os.system("rm labor_cost/*.xlsx") diff --git a/netforce_clinic/reports/report_labor_cost.xlsx b/netforce_clinic/reports/report_labor_cost.xlsx index 7afae3d..a7db921 100644 Binary files a/netforce_clinic/reports/report_labor_cost.xlsx and b/netforce_clinic/reports/report_labor_cost.xlsx differ diff --git a/netforce_clinic/reports/report_labor_cost_detail.xlsx b/netforce_clinic/reports/report_labor_cost_detail.xlsx index ff777bf..7834bde 100644 Binary files a/netforce_clinic/reports/report_labor_cost_detail.xlsx and b/netforce_clinic/reports/report_labor_cost_detail.xlsx differ diff --git a/netforce_clinic/reports/report_labor_cost_sub_detail.xlsx b/netforce_clinic/reports/report_labor_cost_sub_detail.xlsx index 00ca316..23d3615 100644 Binary files a/netforce_clinic/reports/report_labor_cost_sub_detail.xlsx and b/netforce_clinic/reports/report_labor_cost_sub_detail.xlsx differ diff --git a/netforce_clinic/reports/report_labor_cost_summary.xlsx b/netforce_clinic/reports/report_labor_cost_summary.xlsx index 086c18b..a5797c0 100644 Binary files a/netforce_clinic/reports/report_labor_cost_summary.xlsx and b/netforce_clinic/reports/report_labor_cost_summary.xlsx differ