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

For SCT, if BIC is not provided, we should not put the 'Creditor Agent' block at all, according to EPC guidelines (on this point, it is different from the Direct Debit !)

Browse Source
This commit is contained in:
Alexis de Lattre
2014-01-06 00:51:22 +01:00
parent 6ca609e664
commit 0f7bf84f7c
3 changed files with 24 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
account_banking_pain_base/banking_export_pain.py
View File

@@ -209,12 +209,7 @@ class banking_export_pain(orm.AbstractModel):
payment_info_ident, eval_ctx, 35,
gen_args=gen_args, context=context)
payment_method_2_2 = etree.SubElement(payment_info_2_0, 'PmtMtd')
if gen_args.get('pain_flavor').startswith('pain.008.'):
payment_method_2_2.text = 'DD'
request_date_tag = 'ReqdColltnDt'
else:
payment_method_2_2.text = 'TRF'
request_date_tag = 'ReqdExctnDt'
payment_method_2_2.text = gen_args['payment_method']
if gen_args.get('pain_flavor') != 'pain.001.001.02':
batch_booking_2_3 = etree.SubElement(payment_info_2_0, 'BtchBookg')
batch_booking_2_3.text = \
@@ -247,6 +242,10 @@ class banking_export_pain(orm.AbstractModel):
payment_type_info_2_6, 'SeqTp')
sequence_type_2_14.text = sequence_type
if gen_args['payment_method'] == 'DD':
request_date_tag = 'ReqdColltnDt'
else:
request_date_tag = 'ReqdExctnDt'
requested_date_2_17 = etree.SubElement(
payment_info_2_0, request_date_tag)
requested_date_2_17.text = requested_date
@@ -286,13 +285,13 @@ class banking_export_pain(orm.AbstractModel):
'''Generate the piece of the XML file corresponding to BIC
This code is mutualized between TRF and DD'''
assert order in ('B', 'C'), "Order can be 'B' or 'C'"
party_agent = etree.SubElement(parent_node, '%sAgt' % party_type)
party_agent_institution = etree.SubElement(
party_agent, 'FinInstnId')
try:
bic = self._prepare_field(
cr, uid, '%s BIC' % party_type_label, bic, eval_ctx,
gen_args=gen_args, context=context)
party_agent = etree.SubElement(parent_node, '%sAgt' % party_type)
party_agent_institution = etree.SubElement(
party_agent, 'FinInstnId')
party_agent_bic = etree.SubElement(
party_agent_institution, gen_args.get('bic_xml_tag'))
party_agent_bic.text = bic
@@ -305,11 +304,20 @@ class banking_export_pain(orm.AbstractModel):
"must have an associated BIC because it is a "
"cross-border SEPA operation.")
% (iban, party_name))
party_agent_other = etree.SubElement(
party_agent_institution, 'Othr')
party_agent_other_identification = etree.SubElement(
party_agent_other, 'Id')
party_agent_other_identification.text = 'NOTPROVIDED'
if order == 'B' or (
order == 'C' and gen_args['payment_method'] == 'DD'):
party_agent = etree.SubElement(
parent_node, '%sAgt' % party_type)
party_agent_institution = etree.SubElement(
party_agent, 'FinInstnId')
party_agent_other = etree.SubElement(
party_agent_institution, 'Othr')
party_agent_other_identification = etree.SubElement(
party_agent_other, 'Id')
party_agent_other_identification.text = 'NOTPROVIDED'
# for Credit Transfers, in the 'C' block, if BIC is not provided,
# we should not put the 'Creditor Agent' block at all,
# as per the guidelines of the EPC
return True
def generate_party_block(

1
account_banking_sepa_credit_transfer/wizard/export_sepa.py
View File

@@ -136,6 +136,7 @@ class banking_export_sepa_wizard(orm.TransientModel):
'bic_xml_tag': bic_xml_tag,
'name_maxsize': name_maxsize,
'convert_to_ascii': convert_to_ascii,
'payment_method': 'TRF',
'pain_flavor': pain_flavor,
'sepa_export': sepa_export,
'file_obj': self.pool['banking.export.sepa'],

1
account_banking_sepa_direct_debit/wizard/export_sdd.py
View File

@@ -147,6 +147,7 @@ class banking_export_sdd_wizard(orm.TransientModel):
'bic_xml_tag': bic_xml_tag,
'name_maxsize': name_maxsize,
'convert_to_ascii': convert_to_ascii,
'payment_method': 'DD',
'pain_flavor': pain_flavor,
'sepa_export': sepa_export,
'file_obj': self.pool['banking.export.sdd'],