From c1bb614d1ed506befbf35c87b4622698ebc5fe1c Mon Sep 17 00:00:00 2001 From: "watcha.h" Date: Sat, 21 Feb 2015 20:38:21 +0700 Subject: [PATCH] invoice payment --- .../actions/clinic_invoice_payment.xml | 4 +- .../layouts/clinic_account_menu.xml | 2 +- .../layouts/clinic_invoice_payment_form.xml | 44 ++-- .../layouts/clinic_invoice_payment_list.xml | 2 +- .../layouts/clinic_matching_payment_form.xml | 57 +++--- .../layouts/clinic_matching_payment_list.xml | 1 + netforce_clinic/migrations/__init__.py | 1 + netforce_clinic/migrations/import_acc.py | 6 +- netforce_clinic/migrations/remove_conv_bal.py | 28 +++ netforce_clinic/models/__init__.py | 4 +- netforce_clinic/models/invoice_payment.py | 80 ++++++-- .../models/invoice_payment_line.py | 12 +- netforce_clinic/models/matching_payment.py | 193 +++--------------- .../templates/report_medical_summary.hbs | 4 +- 14 files changed, 198 insertions(+), 240 deletions(-) create mode 100644 netforce_clinic/migrations/remove_conv_bal.py diff --git a/netforce_clinic/actions/clinic_invoice_payment.xml b/netforce_clinic/actions/clinic_invoice_payment.xml index 2d5371a..394af3b 100644 --- a/netforce_clinic/actions/clinic_invoice_payment.xml +++ b/netforce_clinic/actions/clinic_invoice_payment.xml @@ -1,7 +1,7 @@ - Matching Payment Group + Invoice Payment multi_view - clinic.matching.payment.group + clinic.invoice.payment account_menu [ ["All",[]], diff --git a/netforce_clinic/layouts/clinic_account_menu.xml b/netforce_clinic/layouts/clinic_account_menu.xml index 1775e5d..c011929 100644 --- a/netforce_clinic/layouts/clinic_account_menu.xml +++ b/netforce_clinic/layouts/clinic_account_menu.xml @@ -3,7 +3,7 @@ - +
diff --git a/netforce_clinic/layouts/clinic_invoice_payment_form.xml b/netforce_clinic/layouts/clinic_invoice_payment_form.xml index c83dab9..7acf0fb 100644 --- a/netforce_clinic/layouts/clinic_invoice_payment_form.xml +++ b/netforce_clinic/layouts/clinic_invoice_payment_form.xml @@ -1,26 +1,34 @@ -
+ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - @@ -16,28 +17,36 @@ - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + +