From 75e28cbe9fc16d7ea1a5a7a63143ea27e0b9892a Mon Sep 17 00:00:00 2001 From: "watcha.h@almacom.co.th" Date: Mon, 22 Dec 2014 00:24:08 +0700 Subject: [PATCH] invoice matching --- .../actions/clinic_hd_case_expense.xml | 2 +- .../layouts/clinic_contact_form.xml | 1 + .../layouts/clinic_hd_case_expense_form.xml | 4 +- .../layouts/clinic_hd_case_expense_list.xml | 2 +- .../clinic_report_payment_matching.xml | 10 +- netforce_clinic/models/hd_case_expense.py | 10 +- netforce_clinic/models/partner.py | 7 +- .../models/report_payment_matching.py | 236 +++++++++++++++++- netforce_clinic/models/setting.py | 11 +- .../templates/report_payment_matching.hbs | 37 ++- 10 files changed, 287 insertions(+), 33 deletions(-) diff --git a/netforce_clinic/actions/clinic_hd_case_expense.xml b/netforce_clinic/actions/clinic_hd_case_expense.xml index bb3a0a3..0018487 100644 --- a/netforce_clinic/actions/clinic_hd_case_expense.xml +++ b/netforce_clinic/actions/clinic_hd_case_expense.xml @@ -2,7 +2,7 @@ Expenses multi_view clinic.hd.case.expense - [["All",[]],["Draft",[["state","=","draft"]]],["Waiting Matching",[["state","=","waiting_matching"]]],["Match",[["state","=","match"]]],["Unmatch",[["state","=","unmatch"]]],["Approved",[["state","=","approved"]]]] + [["All",[]],["Draft",[["state","=","draft"]]],["Waiting Matching",[["state","=","waiting_matching"]]],["Match",[["state","=","match"]]],["Unmatch",[["state","=","unmatch"]]],["Completed",[["state","=","completed"]]]] account_menu 50 diff --git a/netforce_clinic/layouts/clinic_contact_form.xml b/netforce_clinic/layouts/clinic_contact_form.xml index c0abf57..4036cd6 100644 --- a/netforce_clinic/layouts/clinic_contact_form.xml +++ b/netforce_clinic/layouts/clinic_contact_form.xml @@ -5,5 +5,6 @@ + diff --git a/netforce_clinic/layouts/clinic_hd_case_expense_form.xml b/netforce_clinic/layouts/clinic_hd_case_expense_form.xml index 56da269..d07046d 100644 --- a/netforce_clinic/layouts/clinic_hd_case_expense_form.xml +++ b/netforce_clinic/layouts/clinic_hd_case_expense_form.xml @@ -1,4 +1,4 @@ -
+