merge report

2015-12-11 16:08:46 +07:00 · 2015-12-11 16:08:46 +07:00 · a79463cc6e
parent a10b7017a5
commit a79463cc6e
5 changed files with 1 additions and 1 deletions
--- 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")

--- a/netforce_clinic/reports/report_labor_cost.xlsx
+++ b/netforce_clinic/reports/report_labor_cost.xlsx
--- a/netforce_clinic/reports/report_labor_cost_detail.xlsx
+++ b/netforce_clinic/reports/report_labor_cost_detail.xlsx
--- a/netforce_clinic/reports/report_labor_cost_sub_detail.xlsx
+++ b/netforce_clinic/reports/report_labor_cost_sub_detail.xlsx
--- a/netforce_clinic/reports/report_labor_cost_summary.xlsx
+++ b/netforce_clinic/reports/report_labor_cost_summary.xlsx