Merge lp:~acsone-openerp/banking-addons/sepa_without_bic into lp:banking-addons

[Stéphane Bidoul (Acsone)]

[IMP] avoid generating invalid sepa credit transfer files when bank accounts have no BIC.

In the SEPA XSD, the BIC elements are optional, but if they are present they must not be empty.

[Pedro Manuel Baeza (pedro.baeza)]

LGTM

review: Approve (code review, no test)

[Laurent Mignon (Acsone) (lmi)]

LGTM

review: Approve (code review, no test)

[Stefan Rijnhart (Opener) (stefan-opener)]

Thanks! The person merging this change should backport this change to 6.1 as well, using a cherrypicking merge:

bzr merge lp:~acsone-openerp/banking-addons/sepa_without_bic -r 185..186

review: Approve

[Pedro Manuel Baeza (pedro.baeza)]

Should I merge the MP then? In community-review draft, it is said that "The person who approve a Merge proposal shouldn’t merge it himself, a third person must do it", but I'm not sure if this is correct and practical.

Regards.

[Stefan Rijnhart (Opener) (stefan-opener)]

Hi Pedro,

please go ahead! The quote from the draft is obviously a mistake. The correct guideline is: No one should merge their own proposals, as it says in the proposal here now: https://code.launchpad.net/~openerp-community/openobject-doc/7.0-community-review/+merge/186295

[Pedro Manuel Baeza (pedro.baeza)]

Merged and backported!!

[Stefan Rijnhart (Opener) (stefan-opener)]

Thank you Pedro for the merges!

=== modified file 'account_banking_sepa_credit_transfer/wizard/export_sepa.py'
--- account_banking_sepa_credit_transfer/wizard/export_sepa.py	2013-08-02 22:39:11 +0000
+++ account_banking_sepa_credit_transfer/wizard/export_sepa.py	2013-09-19 11:54:37 +0000
@@ -211,8 +211,9 @@
         debtor_account_iban.text = my_company_iban
         debtor_agent = etree.SubElement(payment_info, 'DbtrAgt')
         debtor_agent_institution = etree.SubElement(debtor_agent, 'FinInstnId')
-        debtor_agent_bic = etree.SubElement(debtor_agent_institution, bic_xml_tag)
-        debtor_agent_bic.text = my_company_bic
+        if my_company_bic:
+            debtor_agent_bic = etree.SubElement(debtor_agent_institution, bic_xml_tag)
+            debtor_agent_bic.text = my_company_bic
         charge_bearer = etree.SubElement(payment_info, 'ChrgBr')
         charge_bearer.text = sepa_export.charge_bearer
 
@@ -238,10 +239,11 @@
                 amount_control_sum += line.amount_currency
                 creditor_agent = etree.SubElement(credit_transfer_transaction_info, 'CdtrAgt')
                 creditor_agent_institution = etree.SubElement(creditor_agent, 'FinInstnId')
-                creditor_agent_bic = etree.SubElement(creditor_agent_institution, bic_xml_tag)
                 if not line.bank_id:
                     raise orm.except_orm(_('Error :'), _("Missing Bank Account on invoice '%s' (payment order line reference '%s').") %(line.ml_inv_ref.number, line.name))
-                creditor_agent_bic.text = line.bank_id.bank.bic
+                if line.bank_id.bank.bic:
+                    creditor_agent_bic = etree.SubElement(creditor_agent_institution, bic_xml_tag)
+                    creditor_agent_bic.text = line.bank_id.bank.bic
                 creditor = etree.SubElement(credit_transfer_transaction_info, 'Cdtr')
                 creditor_name = etree.SubElement(creditor, 'Nm')
                 creditor_name.text = self._limit_size(cr, uid, line.partner_id.name, name_maxsize, context=context)