From b06d52b610b65de88d192e39c72d15e4c0d02764 Mon Sep 17 00:00:00 2001 From: Sergio Incaser Date: Fri, 1 Apr 2016 15:16:29 +0200 Subject: [PATCH] sepa_direct_debit_mandate: Split basic and sepa mandate --- .../__openerp__.py | 3 + .../data/report_paperformat.xml | 22 ++++ .../demo/sepa_direct_debit_demo.xml | 2 + .../models/account_banking_mandate.py | 16 +++ .../reports/sepa_direct_debit_mandate.xml | 21 +++ .../views/account_banking_mandate_view.xml | 8 +- .../report_sepa_direct_debit_mandate.xml | 120 ++++++++++++++++++ 7 files changed, 188 insertions(+), 4 deletions(-) create mode 100644 account_banking_sepa_direct_debit/data/report_paperformat.xml create mode 100644 account_banking_sepa_direct_debit/reports/sepa_direct_debit_mandate.xml create mode 100644 account_banking_sepa_direct_debit/views/report_sepa_direct_debit_mandate.xml diff --git a/account_banking_sepa_direct_debit/__openerp__.py b/account_banking_sepa_direct_debit/__openerp__.py index f4054364c..ce9eb6ee4 100644 --- a/account_banking_sepa_direct_debit/__openerp__.py +++ b/account_banking_sepa_direct_debit/__openerp__.py @@ -27,6 +27,9 @@ 'wizard/export_sdd_view.xml', 'data/mandate_expire_cron.xml', 'data/payment_type_sdd.xml', + 'data/report_paperformat.xml', + 'reports/sepa_direct_debit_mandate.xml', + 'views/report_sepa_direct_debit_mandate.xml', 'security/original_mandate_required_security.xml', ], 'demo': ['demo/sepa_direct_debit_demo.xml'], diff --git a/account_banking_sepa_direct_debit/data/report_paperformat.xml b/account_banking_sepa_direct_debit/data/report_paperformat.xml new file mode 100644 index 000000000..631dc93f7 --- /dev/null +++ b/account_banking_sepa_direct_debit/data/report_paperformat.xml @@ -0,0 +1,22 @@ + + + + + + European A4 low margin for SEPA + + A4 + 0 + 0 + Portrait + 10 + 10 + 5 + 5 + + 0 + 80 + + + + diff --git a/account_banking_sepa_direct_debit/demo/sepa_direct_debit_demo.xml b/account_banking_sepa_direct_debit/demo/sepa_direct_debit_demo.xml index 07b347f6c..bcbeb7fb8 100644 --- a/account_banking_sepa_direct_debit/demo/sepa_direct_debit_demo.xml +++ b/account_banking_sepa_direct_debit/demo/sepa_direct_debit_demo.xml @@ -19,6 +19,7 @@ + sepa recurrent first 2014-02-01 @@ -27,6 +28,7 @@ + sepa recurrent first diff --git a/account_banking_sepa_direct_debit/models/account_banking_mandate.py b/account_banking_sepa_direct_debit/models/account_banking_mandate.py index a2e9668f8..4219cee81 100644 --- a/account_banking_sepa_direct_debit/models/account_banking_mandate.py +++ b/account_banking_sepa_direct_debit/models/account_banking_mandate.py @@ -31,6 +31,10 @@ class AccountBankingMandate(models.Model): } } + format = fields.Selection( + selection_add=[('sepa', _('Sepa Mandate'))], + default='sepa', + ) type = fields.Selection([('recurrent', 'Recurrent'), ('oneoff', 'One-Off')], string='Type of Mandate', required=True, @@ -91,6 +95,18 @@ class AccountBankingMandate(models.Model): "recurrent mandate '%s' which is not marked as 'Migrated to " "SEPA'.") % self.unique_mandate_reference) + @api.model + def _get_mandate_format(self): + res = super(AccountBankingMandate, self)._get_mandate_format() + res.append(('sepa', _('Sepa Mandate'))) + return res + + + @api.model + def _default_mandate_format(self): + res = super(AccountBankingMandate, self).default_mandate_format() + return 'sepa' + @api.one @api.onchange('partner_bank_id') def mandate_partner_bank_change(self): diff --git a/account_banking_sepa_direct_debit/reports/sepa_direct_debit_mandate.xml b/account_banking_sepa_direct_debit/reports/sepa_direct_debit_mandate.xml new file mode 100644 index 000000000..1d6a9daa2 --- /dev/null +++ b/account_banking_sepa_direct_debit/reports/sepa_direct_debit_mandate.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + diff --git a/account_banking_sepa_direct_debit/views/account_banking_mandate_view.xml b/account_banking_sepa_direct_debit/views/account_banking_mandate_view.xml index 366edfaf8..0728c8616 100644 --- a/account_banking_sepa_direct_debit/views/account_banking_mandate_view.xml +++ b/account_banking_sepa_direct_debit/views/account_banking_mandate_view.xml @@ -17,9 +17,10 @@ - - - + + + @@ -124,6 +125,5 @@ Sequence Type set to Final - diff --git a/account_banking_sepa_direct_debit/views/report_sepa_direct_debit_mandate.xml b/account_banking_sepa_direct_debit/views/report_sepa_direct_debit_mandate.xml new file mode 100644 index 000000000..7d5b312c3 --- /dev/null +++ b/account_banking_sepa_direct_debit/views/report_sepa_direct_debit_mandate.xml @@ -0,0 +1,120 @@ + + + + + + + + + +