From 331121f367b0d9b7f094423c66b85622c4be9770 Mon Sep 17 00:00:00 2001 From: "watcha.h" Date: Fri, 20 Feb 2015 17:59:49 +0700 Subject: [PATCH] matching payment --- .../actions/clinic_matching_payment.xml | 12 +- .../layouts/clinic_account_menu.xml | 2 +- .../layouts/clinic_dialyzer_list.xml | 2 +- ...t.xml => clinic_matching_payment_form.xml} | 25 +- .../layouts/clinic_matching_payment_list.xml | 6 + netforce_clinic/models/hd_case_popup_dlz.py | 1 + netforce_clinic/models/matching_payment.py | 289 ++++++++++-------- .../models/matching_payment_line.py | 16 +- 8 files changed, 202 insertions(+), 151 deletions(-) rename netforce_clinic/layouts/{clinic_matching_payment.xml => clinic_matching_payment_form.xml} (52%) create mode 100644 netforce_clinic/layouts/clinic_matching_payment_list.xml diff --git a/netforce_clinic/actions/clinic_matching_payment.xml b/netforce_clinic/actions/clinic_matching_payment.xml index 9bd9a9e..fb86158 100644 --- a/netforce_clinic/actions/clinic_matching_payment.xml +++ b/netforce_clinic/actions/clinic_matching_payment.xml @@ -1,10 +1,12 @@ Payment Matching - - form_view - clinic_matching_payment + multi_view clinic.matching.payment - - account_menu + [ + ["All",[]], + ["Draft",[["state","=","draft"]]], + ["Approved",[["state","=","approved"]]] + ] + 10 diff --git a/netforce_clinic/layouts/clinic_account_menu.xml b/netforce_clinic/layouts/clinic_account_menu.xml index 1c54828..5bba9fc 100644 --- a/netforce_clinic/layouts/clinic_account_menu.xml +++ b/netforce_clinic/layouts/clinic_account_menu.xml @@ -5,7 +5,7 @@ - +
diff --git a/netforce_clinic/layouts/clinic_dialyzer_list.xml b/netforce_clinic/layouts/clinic_dialyzer_list.xml index 6e87465..a4e31e0 100644 --- a/netforce_clinic/layouts/clinic_dialyzer_list.xml +++ b/netforce_clinic/layouts/clinic_dialyzer_list.xml @@ -1,4 +1,4 @@ - + diff --git a/netforce_clinic/layouts/clinic_matching_payment.xml b/netforce_clinic/layouts/clinic_matching_payment_form.xml similarity index 52% rename from netforce_clinic/layouts/clinic_matching_payment.xml rename to netforce_clinic/layouts/clinic_matching_payment_form.xml index 643b9bb..c1a26ec 100644 --- a/netforce_clinic/layouts/clinic_matching_payment.xml +++ b/netforce_clinic/layouts/clinic_matching_payment_form.xml @@ -1,31 +1,42 @@ -
+ + - + + - - - - + + + + + + + + + + + +