audrius/bank-payment
1
0
Fork 1
mirror of https://github.com/OCA/bank-payment.git synced 2025-02-02 10:37:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #159 from akretion/7.0-backport-sepa-b2b

Browse Source 
7.0 Backport support for scheme (CORE or B2B)
This commit is contained in:
Stéphane Bidoul (ACSONE)
2015-04-17 11:23:21 +02:00
parent f413a3f43d e5d5dc4d59
commit 955239bb8d
5 changed files with 30 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
account_banking_mandate/i18n/fr.po
View File

@@ -19,7 +19,7 @@ msgstr ""
#. module: account_banking_mandate
#: view:res.partner.bank:0
msgid "Direct Debit Mandates"
msgstr "Mandats de débit direct"
msgstr "Mandats de prélèvement"
#. module: account_banking_mandate
#: model:mail.message.subtype,description:account_banking_mandate.mandate_cancel
@@ -93,7 +93,7 @@ msgstr "Mandat bancaire a expiré"
#. module: account_banking_mandate
#: field:account.invoice,mandate_id:0 field:payment.line,mandate_id:0
msgid "Direct Debit Mandate"
msgstr "Mandat de débit direct"
msgstr "Mandat de prélèvement"
#. module: account_banking_mandate
#: code:addons/account_banking_mandate/model/account_banking_mandate.py:121
@@ -102,7 +102,7 @@ msgid ""
"The mandate '%s' can't have a date of last debit before the date of "
"signature."
msgstr ""
"Le mandat '% s' ne peut pas avoir une date de la dernière débit avant la "
"Le mandat '% s' ne peut pas avoir une date de dernier prélèvement avant la "
"date de la signature."
#. module: account_banking_mandate
@@ -119,7 +119,7 @@ msgstr "Mandat annulé"
#: code:addons/account_banking_mandate/model/account_banking_mandate.py:189
#, python-format
msgid "Mandate should be in cancel state"
msgstr "Mandat doit être au statut ​​annuler"
msgstr "Le mandat devrait être à l'état annulé"
#. module: account_banking_mandate
#: constraint:account.banking.mandate:0 constraint:payment.line:0
@@ -263,7 +263,7 @@ msgstr "Date de signature du mandat"
#. module: account_banking_mandate
#: field:account.banking.mandate,last_debit_date:0
msgid "Date of the Last Debit"
msgstr "Date du dernier débit"
msgstr "Date du dernier prélèvement"
#. module: account_banking_mandate
#: view:account.banking.mandate:0

5
account_banking_sepa_direct_debit/account_banking_sdd.py
View File

@@ -166,10 +166,15 @@ class sdd_mandate(orm.Model):
help="When the field 'Migrated to SEPA' is not active, this "
"field will be used as the Original Mandate Identification in "
"the Direct Debit file."),
'scheme': fields.selection([
('CORE', 'Basic (CORE)'),
('B2B', 'Enterprise (B2B)')
], 'Scheme', required=True)
}
_defaults = {
'sepa_migrated': True,
'scheme': 'CORE',
}
def _check_sdd_mandate(self, cr, uid, ids):

12
account_banking_sepa_direct_debit/sdd_mandate_view.xml
View File

@@ -18,6 +18,7 @@
<xpath expr="//field[@name='partner_id']" position="after">
<field name="type" on_change="mandate_type_change(type)"/>
<field name="recurrent_sequence_type" attrs="{'invisible': [('type', '=', 'oneoff')], 'required': [('type', '=', 'recurrent')]}"/>
<field name="scheme"/>
</xpath>
<xpath expr="//field[@name='partner_bank_id']" position="attributes">
<attribute name="on_change">mandate_partner_bank_change(partner_bank_id, type, recurrent_sequence_type, last_debit_date, state)</attribute>
@@ -37,6 +38,7 @@
<field name="arch" type="xml">
<xpath expr="//field[@name='unique_mandate_reference']" position="after">
<field name="type" string="Type"/>
<field name="scheme"/>
</xpath>
</field>
</record>
@@ -44,10 +46,20 @@
<record id="sdd_mandate_search" model="ir.ui.view">
<field name="name">sdd.mandate.search</field>
<field name="model">account.banking.mandate</field>
<field name="inherit_id" ref="account_banking_mandate.view_mandate_search"/>
<field name="arch" type="xml">
<xpath expr="//filter[@name='expired']" position="after">
<filter name="oneoff" string="One-Off" domain="[('type', '=', 'oneoff')]" />
<filter name="recurrent" string="Recurrent" domain="[('type', '=', 'recurrent')]" />
<group string="Group By" name="groupby">
<filter name="type_groupby" string="Type"
context="{'group_by': 'type'}"/>
<filter name="scheme_groupby" string="Scheme"
context="{'group_by': 'scheme'}"/>
<filter name="recurrent_sequence_type_groupby"
string="Sequence Type"
context="{'group_by': 'recurrent_sequence_type'}"/>
</group>
</xpath>
</field>
</record>

7
account_banking_sepa_direct_debit/wizard/export_sdd.py
View File

@@ -195,6 +195,7 @@ class banking_export_sdd_wizard(orm.TransientModel):
"line with partner '%s' and Invoice ref '%s'.")
% (line.partner_id.name,
line.ml_inv_ref.number))
scheme = line.mandate_id.scheme
if line.mandate_id.state != 'valid':
raise orm.except_orm(
_('Error:'),
@@ -226,7 +227,7 @@ class banking_export_sdd_wizard(orm.TransientModel):
assert seq_type_label is not False
seq_type = seq_type_map[seq_type_label]
key = (requested_date, priority, seq_type)
key = (requested_date, priority, seq_type, scheme)
if key in lines_per_group:
lines_per_group[key].append(line)
else:
@@ -237,7 +238,7 @@ class banking_export_sdd_wizard(orm.TransientModel):
cr, uid, line.id,
{'date': requested_date}, context=context)
for (requested_date, priority, sequence_type), lines in \
for (requested_date, priority, sequence_type, scheme), lines in \
lines_per_group.items():
# B. Payment info
payment_info_2_0, nb_of_transactions_2_4, control_sum_2_5 = \
@@ -246,7 +247,7 @@ class banking_export_sdd_wizard(orm.TransientModel):
"sepa_export.payment_order_ids[0].reference + '-' + "
"sequence_type + '-' + requested_date.replace('-', '') "
"+ '-' + priority",
priority, 'CORE', sequence_type, requested_date, {
priority, scheme, sequence_type, requested_date, {
'sepa_export': sepa_export,
'sequence_type': sequence_type,
'priority': priority,

8
account_direct_debit/i18n/fr.po
View File

@@ -19,7 +19,7 @@ msgstr ""
#. module: account_direct_debit
#: model:account.payment.term,note:account_direct_debit.payment_term_direct_debit
msgid "Direct debit in 14 days"
msgstr "Débit direct en 14 jours"
msgstr "Prélèvement dans 14 jours"
#. module: account_direct_debit
#: model:ir.model,name:account_direct_debit.model_payment_order
@@ -86,12 +86,12 @@ msgstr "Débit refusé"
#: model:ir.actions.act_window,name:account_direct_debit.action_debit_order_tree
#: model:ir.ui.menu,name:account_direct_debit.menu_action_debit_order_form
msgid "Direct Debit Orders"
msgstr "Ordre de débit direct"
msgstr "Ordres de prélèvement"
#. module: account_direct_debit
#: model:account.payment.term,name:account_direct_debit.payment_term_direct_debit
msgid "Direct debit"
msgstr "Débit direct"
msgstr "Prélèvement"
#. module: account_direct_debit
#: code:addons/account_direct_debit/model/account_invoice.py:150
@@ -107,7 +107,7 @@ msgstr ""
#: code:addons/account_direct_debit/model/account_invoice.py:154
#, python-format
msgid "Invoice '%s': direct debit is denied."
msgstr "Facture '% s': débit diretc est refusé."
msgstr "Facture '% s': prélèvement refusé."
#. module: account_direct_debit
#: code:addons/account_direct_debit/model/payment_line.py:141