From 27b95b6d772ff610dc361cc24d2d14f98671a8d9 Mon Sep 17 00:00:00 2001 From: "watcha.h" Date: Wed, 4 Feb 2015 15:51:14 +0700 Subject: [PATCH] shop payment --- netforce_clinic/actions/clinic_shop.xml | 7 + .../actions/clinic_shop_view_payment.xml | 5 + .../layouts/clinic_account_setting.xml | 4 + netforce_clinic/layouts/clinic_shop_form.xml | 23 +- netforce_clinic/layouts/clinic_shop_list.xml | 6 +- .../layouts/fin_clinic_settings.xml | 10 +- netforce_clinic/models/__init__.py | 1 + .../models/account_payment_line.py | 13 + netforce_clinic/models/hd_case.py | 3 +- netforce_clinic/models/setting.py | 14 +- netforce_clinic/models/shop.py | 270 +++++++++++++++++- netforce_clinic/todo.txt | 7 +- 12 files changed, 329 insertions(+), 34 deletions(-) create mode 100644 netforce_clinic/actions/clinic_shop_view_payment.xml create mode 100644 netforce_clinic/models/account_payment_line.py diff --git a/netforce_clinic/actions/clinic_shop.xml b/netforce_clinic/actions/clinic_shop.xml index 31628c0..78cc064 100644 --- a/netforce_clinic/actions/clinic_shop.xml +++ b/netforce_clinic/actions/clinic_shop.xml @@ -3,4 +3,11 @@ multi_view clinic.shop clinic_menu + [ + ["All",[]], + ["Draft",[["state","=","draft"]]], + ["Paid",[["state","=","paid"]]], + ["Cancelled",[["state","=","cancelled"]]] + ] + diff --git a/netforce_clinic/actions/clinic_shop_view_payment.xml b/netforce_clinic/actions/clinic_shop_view_payment.xml new file mode 100644 index 0000000..a793f24 --- /dev/null +++ b/netforce_clinic/actions/clinic_shop_view_payment.xml @@ -0,0 +1,5 @@ + + method + clinic.shop + view_payment + diff --git a/netforce_clinic/layouts/clinic_account_setting.xml b/netforce_clinic/layouts/clinic_account_setting.xml index 41c0877..e5a651d 100644 --- a/netforce_clinic/layouts/clinic_account_setting.xml +++ b/netforce_clinic/layouts/clinic_account_setting.xml @@ -38,5 +38,9 @@ + + + + diff --git a/netforce_clinic/layouts/clinic_shop_form.xml b/netforce_clinic/layouts/clinic_shop_form.xml index a61ea71..8af1802 100644 --- a/netforce_clinic/layouts/clinic_shop_form.xml +++ b/netforce_clinic/layouts/clinic_shop_form.xml @@ -1,20 +1,21 @@ -
+ - - + + - + + @@ -35,19 +36,19 @@ - - - + + + -