From e0a27017d850d46fdaf441b0c7e26ec972c0b6b2 Mon Sep 17 00:00:00 2001 From: "watcha.h@almacom.co.th" Date: Thu, 26 Mar 2015 14:11:04 +0700 Subject: [PATCH] improve --- .../actions/clinic_invoice_print.xml | 6 + ...ust_print.xml => clinic_receipt_print.xml} | 2 +- netforce_clinic/actions/clinic_shop.xml | 1 + netforce_clinic/layouts/clinic_shop_form.xml | 24 ++- netforce_clinic/layouts/clinic_shop_list.xml | 1 - netforce_clinic/models/hd_case.py | 19 +- .../models/report_account_hd_case_summary.py | 8 +- netforce_clinic/models/shop.py | 199 +++++++++++++++--- netforce_clinic/reports/cust_invoice.odt | Bin 0 -> 44426 bytes .../report_account_hd_case_summary.xlsx | Bin 5827 -> 5846 bytes .../report_account_hd_case_summary.hbs | 8 +- netforce_clinic/todo.txt | 4 +- 12 files changed, 227 insertions(+), 45 deletions(-) create mode 100644 netforce_clinic/actions/clinic_invoice_print.xml rename netforce_clinic/actions/{clinic_cust_print.xml => clinic_receipt_print.xml} (75%) create mode 100644 netforce_clinic/reports/cust_invoice.odt diff --git a/netforce_clinic/actions/clinic_invoice_print.xml b/netforce_clinic/actions/clinic_invoice_print.xml new file mode 100644 index 0000000..f328bd0 --- /dev/null +++ b/netforce_clinic/actions/clinic_invoice_print.xml @@ -0,0 +1,6 @@ + + report_odt2 + clinic.shop + get_invoice_data + cust_invoice + diff --git a/netforce_clinic/actions/clinic_cust_print.xml b/netforce_clinic/actions/clinic_receipt_print.xml similarity index 75% rename from netforce_clinic/actions/clinic_cust_print.xml rename to netforce_clinic/actions/clinic_receipt_print.xml index 75a7d50..c849aea 100644 --- a/netforce_clinic/actions/clinic_cust_print.xml +++ b/netforce_clinic/actions/clinic_receipt_print.xml @@ -1,6 +1,6 @@ report_odt2 clinic.shop - get_data + get_receipt_data cust_payment diff --git a/netforce_clinic/actions/clinic_shop.xml b/netforce_clinic/actions/clinic_shop.xml index 78cc064..44567cd 100644 --- a/netforce_clinic/actions/clinic_shop.xml +++ b/netforce_clinic/actions/clinic_shop.xml @@ -6,6 +6,7 @@ [ ["All",[]], ["Draft",[["state","=","draft"]]], + ["Waiting Payment",[["state","=","waiting_payment"]]], ["Paid",[["state","=","paid"]]], ["Cancelled",[["state","=","cancelled"]]] ] diff --git a/netforce_clinic/layouts/clinic_shop_form.xml b/netforce_clinic/layouts/clinic_shop_form.xml index b86336e..eeb86ce 100644 --- a/netforce_clinic/layouts/clinic_shop_form.xml +++ b/netforce_clinic/layouts/clinic_shop_form.xml @@ -2,10 +2,12 @@ @@ -17,10 +19,10 @@ - - - - + + + + @@ -43,19 +45,19 @@ - - + + + -