Skip to content

Commit d9fa868

Browse files
Adeguato modulo alla nuova versione di account_banking_sepa_credit_transfer
1 parent 9ae7c2b commit d9fa868

1 file changed

Lines changed: 3 additions & 36 deletions

File tree

l10n_it_sepa_bonifici/wizard/export_sepa_cbi.py

Lines changed: 3 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -184,12 +184,8 @@ def create_sepa(self):
184184
CtrlSum_node.getparent().remove(CtrlSum_node)
185185
self.generate_party_block(
186186
payment_info_2_0, 'Dbtr', 'B',
187-
'self.payment_order_ids[0].mode.bank_id.partner_id.'
188-
'name',
189-
'self.payment_order_ids[0].mode.bank_id.acc_number',
190-
'self.payment_order_ids[0].mode.bank_id.bank.bic or '
191-
'self.payment_order_ids[0].mode.bank_id.bank_bic',
192-
{'self': self}, gen_args)
187+
self.payment_order_ids[0].mode.bank_id,
188+
gen_args)
193189
charge_bearer_2_24 = etree.SubElement(payment_info_2_0, 'ChrgBr')
194190
charge_bearer_2_24.text = self.charge_bearer
195191
transactions_count_2_4 = 0
@@ -240,36 +236,7 @@ def create_sepa(self):
240236
% (line.ml_inv_ref.number, line.name))
241237
self.generate_party_block(
242238
credit_transfer_transaction_info_2_27, 'Cdtr', 'C',
243-
'line.partner_id.name', 'line.bank_id.acc_number',
244-
'line.bank_id.bank.bic', {'line': line}, gen_args)
245-
# Add info for Cross Border payment
246-
partner_creditor = line.partner_id
247-
creditor_node = credit_transfer_transaction_info_2_27\
248-
.xpath('//Cdtr')[transactions_count_1_6 - 1]
249-
creditor_address_node = etree.SubElement(creditor_node,
250-
'PstlAdr')
251-
creditor_address_country_node = etree.SubElement(
252-
creditor_address_node, 'Ctry')
253-
iso_country = False
254-
if line.bank_id.state == 'iban':
255-
iso_country = line.bank_id.iban[:2]
256-
elif partner_creditor.country_id:
257-
iso_country = partner_creditor.country_id.code
258-
if not iso_country:
259-
raise UserError(
260-
_("Missing Country for Partner '%s' (payment "
261-
"order line reference '%s')") %
262-
(line.partner_id.name, line.name))
263-
creditor_address_country_node.text = iso_country
264-
creditor_address_line_node = etree.SubElement(
265-
creditor_address_node, 'AdrLine')
266-
if partner_creditor:
267-
address = '%s %s %s' % (
268-
partner_creditor.street or '',
269-
partner_creditor.city or '',
270-
partner_creditor.country_id and
271-
partner_creditor.country_id.name or '',)
272-
creditor_address_line_node.text = address[:70]
239+
line.bank_id, gen_args)
273240

274241
self.generate_remittance_info_block(
275242
credit_transfer_transaction_info_2_27, line, gen_args)

0 commit comments

Comments
 (0)