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

[IMP] account_banking_sepa_credit_transfer: black, isort, prettier

Browse Source
This commit is contained in:
Valentin Vinagre Urteaga
2020-04-22 13:47:27 +02:00
committed by Carlos Roca
parent 9fea64eca8
commit b506c7730f
13 changed files with 429 additions and 349 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
account_banking_sepa_credit_transfer/__init__.py
View File

@@ -1,3 +1,2 @@
from . import models from . import models
from .post_install import update_bank_journals from .post_install import update_bank_journals

32
account_banking_sepa_credit_transfer/__manifest__.py
View File

@@ -4,23 +4,17 @@
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
{ {
'name': 'Account Banking SEPA Credit Transfer', "name": "Account Banking SEPA Credit Transfer",
'summary': 'Create SEPA XML files for Credit Transfers', "summary": "Create SEPA XML files for Credit Transfers",
'version': '12.0.1.0.0', "version": "12.0.1.0.0",
'license': 'AGPL-3', "license": "AGPL-3",
'author': "Akretion, " "author": "Akretion, " "Tecnativa, " "Odoo Community Association (OCA)",
"Tecnativa, " "website": "https://github.com/OCA/bank-payment",
"Odoo Community Association (OCA)", "category": "Banking addons",
'website': 'https://github.com/OCA/bank-payment', "conflicts": ["account_sepa"],
'category': 'Banking addons', "depends": ["account_banking_pain_base"],
'conflicts': ['account_sepa'], "data": ["data/account_payment_method.xml",],
'depends': ['account_banking_pain_base'], "demo": ["demo/sepa_credit_transfer_demo.xml"],
'data': [ "post_init_hook": "update_bank_journals",
'data/account_payment_method.xml', "installable": True,
],
'demo': [
'demo/sepa_credit_transfer_demo.xml'
],
'post_init_hook': 'update_bank_journals',
'installable': True,
} }

20
account_banking_sepa_credit_transfer/data/account_payment_method.xml
View File

@@ -1,14 +1,10 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8" ?>
<odoo noupdate="1"> <odoo noupdate="1">
<record id="sepa_credit_transfer" model="account.payment.method">
<field name="name">SEPA Credit Transfer to suppliers</field>
<record id="sepa_credit_transfer" model="account.payment.method"> <field name="code">sepa_credit_transfer</field>
<field name="name">SEPA Credit Transfer to suppliers</field> <field name="payment_type">outbound</field>
<field name="code">sepa_credit_transfer</field> <field name="bank_account_required" eval="True" />
<field name="payment_type">outbound</field> <field name="pain_version">pain.001.001.03</field>
<field name="bank_account_required" eval="True"/> </record>
<field name="pain_version">pain.001.001.03</field>
</record>
</odoo> </odoo>

2
account_banking_sepa_credit_transfer/data/pain.001.001.04.xsd
View File

@@ -965,4 +965,4 @@
<xs:enumeration value="HLF2"/> <xs:enumeration value="HLF2"/>
</xs:restriction> </xs:restriction>
</xs:simpleType> </xs:simpleType>
</xs:schema> </xs:schema>

41
account_banking_sepa_credit_transfer/demo/sepa_credit_transfer_demo.xml
View File

@@ -1,24 +1,21 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8" ?>
<odoo noupdate="1"> <odoo noupdate="1">
<record id="payment_mode_outbound_sepa_ct1" model="account.payment.mode">
<field name="name">SEPA Credit Transfer to suppliers</field>
<record id="payment_mode_outbound_sepa_ct1" model="account.payment.mode"> <field name="company_id" ref="base.main_company" />
<field name="name">SEPA Credit Transfer to suppliers</field> <field name="bank_account_link">variable</field>
<field name="company_id" ref="base.main_company"/> <field name="payment_method_id" ref="sepa_credit_transfer" />
<field name="bank_account_link">variable</field> <field
<field name="payment_method_id" ref="sepa_credit_transfer"/> name="default_journal_ids"
<field name="default_journal_ids" search="[('type', 'in', ('purchase', 'purchase_refund'))]"/> search="[('type', 'in', ('purchase', 'purchase_refund'))]"
</record> />
</record>
<!-- Camptocamp --> <!-- Camptocamp -->
<record id="base.res_partner_12" model="res.partner"> <record id="base.res_partner_12" model="res.partner">
<field name="supplier_payment_mode_id" ref="payment_mode_outbound_sepa_ct1"/> <field name="supplier_payment_mode_id" ref="payment_mode_outbound_sepa_ct1" />
</record> </record>
<!-- Asustek -->
<!-- Asustek --> <record id="base.res_partner_1" model="res.partner">
<record id="base.res_partner_1" model="res.partner"> <field name="supplier_payment_mode_id" ref="payment_mode_outbound_sepa_ct1" />
<field name="supplier_payment_mode_id" ref="payment_mode_outbound_sepa_ct1"/> </record>
</record>
</odoo> </odoo>

1
account_banking_sepa_credit_transfer/models/__init__.py
View File

@@ -1,4 +1,3 @@
from . import account_payment_method from . import account_payment_method
from . import account_payment_order from . import account_payment_order
from . import account_payment_line from . import account_payment_line

7
account_banking_sepa_credit_transfer/models/account_payment_line.py
View File

@@ -1,15 +1,14 @@
# Copyright 2017 Akretion - Alexis de Lattre <alexis.delattre@akretion.com> # Copyright 2017 Akretion - Alexis de Lattre <alexis.delattre@akretion.com>
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
from odoo import models, fields from odoo import fields, models
class AccountPaymentLine(models.Model): class AccountPaymentLine(models.Model):
_inherit = 'account.payment.line' _inherit = "account.payment.line"
# local_instrument 'INST' used for instant credit transfers # local_instrument 'INST' used for instant credit transfers
# which will begin on November 21st 2017, cf # which will begin on November 21st 2017, cf
# https://www.europeanpaymentscouncil.eu/document-library/ # https://www.europeanpaymentscouncil.eu/document-library/
# rulebooks/2017-sepa-instant-credit-transfer-rulebook # rulebooks/2017-sepa-instant-credit-transfer-rulebook
local_instrument = fields.Selection( local_instrument = fields.Selection(selection_add=[("INST", "Instant Transfer")])
selection_add=[('INST', 'Instant Transfer')])

34
account_banking_sepa_credit_transfer/models/account_payment_method.py
View File

@@ -1,28 +1,34 @@
# Copyright 2016 Akretion (Alexis de Lattre <alexis.delattre@akretion.com>) # Copyright 2016 Akretion (Alexis de Lattre <alexis.delattre@akretion.com>)
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
from odoo import models, fields, api from odoo import api, fields, models
class AccountPaymentMethod(models.Model): class AccountPaymentMethod(models.Model):
_inherit = 'account.payment.method' _inherit = "account.payment.method"
pain_version = fields.Selection(selection_add=[ pain_version = fields.Selection(
('pain.001.001.02', 'pain.001.001.02'), selection_add=[
('pain.001.001.03', 'pain.001.001.03 ' ("pain.001.001.02", "pain.001.001.02"),
'(recommended for credit transfer)'), ("pain.001.001.03", "pain.001.001.03 " "(recommended for credit transfer)"),
('pain.001.001.04', 'pain.001.001.04'), ("pain.001.001.04", "pain.001.001.04"),
('pain.001.001.05', 'pain.001.001.05'), ("pain.001.001.05", "pain.001.001.05"),
('pain.001.003.03', 'pain.001.003.03 (credit transfer in Germany)'), ("pain.001.003.03", "pain.001.003.03 (credit transfer in Germany)"),
]) ]
)
@api.multi @api.multi
def get_xsd_file_path(self): def get_xsd_file_path(self):
self.ensure_one() self.ensure_one()
if self.pain_version in [ if self.pain_version in [
'pain.001.001.02', 'pain.001.001.03', 'pain.001.001.04', "pain.001.001.02",
'pain.001.001.05', 'pain.001.003.03']: "pain.001.001.03",
path = 'account_banking_sepa_credit_transfer/data/%s.xsd'\ "pain.001.001.04",
% self.pain_version "pain.001.001.05",
"pain.001.003.03",
]:
path = (
"account_banking_sepa_credit_transfer/data/%s.xsd" % self.pain_version
)
return path return path
return super(AccountPaymentMethod, self).get_xsd_file_path() return super(AccountPaymentMethod, self).get_xsd_file_path()

196
account_banking_sepa_credit_transfer/models/account_payment_order.py
View File

@@ -2,19 +2,20 @@
# Copyright 2014-2018 Tecnativa - Pedro M. Baeza # Copyright 2014-2018 Tecnativa - Pedro M. Baeza
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
from lxml import etree
from odoo import _, api, fields, models from odoo import _, api, fields, models
from odoo.exceptions import UserError from odoo.exceptions import UserError
from lxml import etree
class AccountPaymentOrder(models.Model): class AccountPaymentOrder(models.Model):
_inherit = 'account.payment.order' _inherit = "account.payment.order"
@api.multi @api.multi
def generate_payment_file(self): def generate_payment_file(self):
"""Creates the SEPA Credit Transfer file. That's the important code!""" """Creates the SEPA Credit Transfer file. That's the important code!"""
self.ensure_one() self.ensure_one()
if self.payment_method_id.code != 'sepa_credit_transfer': if self.payment_method_id.code != "sepa_credit_transfer":
return super(AccountPaymentOrder, self).generate_payment_file() return super(AccountPaymentOrder, self).generate_payment_file()
pain_flavor = self.payment_method_id.pain_version pain_flavor = self.payment_method_id.pain_version
@@ -22,14 +23,13 @@ class AccountPaymentOrder(models.Model):
# to support country-specific extensions such as # to support country-specific extensions such as
# pain.001.001.03.ch.02 (cf l10n_ch_sepa) # pain.001.001.03.ch.02 (cf l10n_ch_sepa)
if not pain_flavor: if not pain_flavor:
raise UserError( raise UserError(_("PAIN version '%s' is not supported.") % pain_flavor)
_("PAIN version '%s' is not supported.") % pain_flavor) if pain_flavor.startswith("pain.001.001.02"):
if pain_flavor.startswith('pain.001.001.02'): bic_xml_tag = "BIC"
bic_xml_tag = 'BIC'
name_maxsize = 70 name_maxsize = 70
root_xml_tag = 'pain.001.001.02' root_xml_tag = "pain.001.001.02"
elif pain_flavor.startswith('pain.001.001.03'): elif pain_flavor.startswith("pain.001.001.03"):
bic_xml_tag = 'BIC' bic_xml_tag = "BIC"
# size 70 -> 140 for <Nm> with pain.001.001.03 # size 70 -> 140 for <Nm> with pain.001.001.03
# BUT the European Payment Council, in the document # BUT the European Payment Council, in the document
# "SEPA Credit Transfer Scheme Customer-to-bank # "SEPA Credit Transfer Scheme Customer-to-bank
@@ -39,42 +39,44 @@ class AccountPaymentOrder(models.Model):
# so we follow the "European Payment Council" # so we follow the "European Payment Council"
# and we put 70 and not 140 # and we put 70 and not 140
name_maxsize = 70 name_maxsize = 70
root_xml_tag = 'CstmrCdtTrfInitn' root_xml_tag = "CstmrCdtTrfInitn"
elif pain_flavor.startswith('pain.001.001.04'): elif pain_flavor.startswith("pain.001.001.04"):
bic_xml_tag = 'BICFI' bic_xml_tag = "BICFI"
name_maxsize = 140 name_maxsize = 140
root_xml_tag = 'CstmrCdtTrfInitn' root_xml_tag = "CstmrCdtTrfInitn"
elif pain_flavor.startswith('pain.001.001.05'): elif pain_flavor.startswith("pain.001.001.05"):
bic_xml_tag = 'BICFI' bic_xml_tag = "BICFI"
name_maxsize = 140 name_maxsize = 140
root_xml_tag = 'CstmrCdtTrfInitn' root_xml_tag = "CstmrCdtTrfInitn"
# added pain.001.003.03 for German Banks # added pain.001.003.03 for German Banks
# it is not in the offical ISO 20022 documentations, but nearly all # it is not in the offical ISO 20022 documentations, but nearly all
# german banks are working with this instead 001.001.03 # german banks are working with this instead 001.001.03
elif pain_flavor == 'pain.001.003.03': elif pain_flavor == "pain.001.003.03":
bic_xml_tag = 'BIC' bic_xml_tag = "BIC"
name_maxsize = 70 name_maxsize = 70
root_xml_tag = 'CstmrCdtTrfInitn' root_xml_tag = "CstmrCdtTrfInitn"
else: else:
raise UserError( raise UserError(_("PAIN version '%s' is not supported.") % pain_flavor)
_("PAIN version '%s' is not supported.") % pain_flavor)
xsd_file = self.payment_method_id.get_xsd_file_path() xsd_file = self.payment_method_id.get_xsd_file_path()
gen_args = { gen_args = {
'bic_xml_tag': bic_xml_tag, "bic_xml_tag": bic_xml_tag,
'name_maxsize': name_maxsize, "name_maxsize": name_maxsize,
'convert_to_ascii': self.payment_method_id.convert_to_ascii, "convert_to_ascii": self.payment_method_id.convert_to_ascii,
'payment_method': 'TRF', "payment_method": "TRF",
'file_prefix': 'sct_', "file_prefix": "sct_",
'pain_flavor': pain_flavor, "pain_flavor": pain_flavor,
'pain_xsd_file': xsd_file, "pain_xsd_file": xsd_file,
} }
nsmap = self.generate_pain_nsmap() nsmap = self.generate_pain_nsmap()
attrib = self.generate_pain_attrib() attrib = self.generate_pain_attrib()
xml_root = etree.Element('Document', nsmap=nsmap, attrib=attrib) xml_root = etree.Element("Document", nsmap=nsmap, attrib=attrib)
pain_root = etree.SubElement(xml_root, root_xml_tag) pain_root = etree.SubElement(xml_root, root_xml_tag)
# A. Group header # A. Group header
group_header, nb_of_transactions_a, control_sum_a = \ (
self.generate_group_header_block(pain_root, gen_args) group_header,
nb_of_transactions_a,
control_sum_a,
) = self.generate_group_header_block(pain_root, gen_args)
transactions_count_a = 0 transactions_count_a = 0
amount_control_sum_a = 0.0 amount_control_sum_a = 0.0
lines_per_group = {} lines_per_group = {}
@@ -93,30 +95,40 @@ class AccountPaymentOrder(models.Model):
lines_per_group[key].append(line) lines_per_group[key].append(line)
else: else:
lines_per_group[key] = [line] lines_per_group[key] = [line]
for (requested_date, priority, local_instrument, categ_purpose),\ for (requested_date, priority, local_instrument, categ_purpose), lines in list(
lines in list(lines_per_group.items()): lines_per_group.items()
):
# B. Payment info # B. Payment info
requested_date = fields.Date.to_string(requested_date) requested_date = fields.Date.to_string(requested_date)
payment_info, nb_of_transactions_b, control_sum_b = \ (
self.generate_start_payment_info_block( payment_info,
pain_root, nb_of_transactions_b,
"self.name + '-' " control_sum_b,
"+ requested_date.replace('-', '') + '-' + priority + " ) = self.generate_start_payment_info_block(
"'-' + local_instrument + '-' + category_purpose", pain_root,
priority, local_instrument, categ_purpose, "self.name + '-' "
False, requested_date, { "+ requested_date.replace('-', '') + '-' + priority + "
'self': self, "'-' + local_instrument + '-' + category_purpose",
'priority': priority, priority,
'requested_date': requested_date, local_instrument,
'local_instrument': local_instrument or 'NOinstr', categ_purpose,
'category_purpose': categ_purpose or 'NOcateg', False,
}, gen_args) requested_date,
{
"self": self,
"priority": priority,
"requested_date": requested_date,
"local_instrument": local_instrument or "NOinstr",
"category_purpose": categ_purpose or "NOcateg",
},
gen_args,
)
self.generate_party_block( self.generate_party_block(
payment_info, 'Dbtr', 'B', payment_info, "Dbtr", "B", self.company_partner_bank_id, gen_args
self.company_partner_bank_id, gen_args) )
charge_bearer = etree.SubElement(payment_info, 'ChrgBr') charge_bearer = etree.SubElement(payment_info, "ChrgBr")
if self.sepa: if self.sepa:
charge_bearer_text = 'SLEV' charge_bearer_text = "SLEV"
else: else:
charge_bearer_text = self.charge_bearer charge_bearer_text = self.charge_bearer
charge_bearer.text = charge_bearer_text charge_bearer.text = charge_bearer_text
@@ -127,50 +139,74 @@ class AccountPaymentOrder(models.Model):
transactions_count_b += 1 transactions_count_b += 1
# C. Credit Transfer Transaction Info # C. Credit Transfer Transaction Info
credit_transfer_transaction_info = etree.SubElement( credit_transfer_transaction_info = etree.SubElement(
payment_info, 'CdtTrfTxInf') payment_info, "CdtTrfTxInf"
)
payment_identification = etree.SubElement( payment_identification = etree.SubElement(
credit_transfer_transaction_info, 'PmtId') credit_transfer_transaction_info, "PmtId"
)
instruction_identification = etree.SubElement( instruction_identification = etree.SubElement(
payment_identification, 'InstrId') payment_identification, "InstrId"
)
instruction_identification.text = self._prepare_field( instruction_identification.text = self._prepare_field(
'Instruction Identification', 'line.name', "Instruction Identification",
{'line': line}, 35, gen_args=gen_args) "line.name",
{"line": line},
35,
gen_args=gen_args,
)
end2end_identification = etree.SubElement( end2end_identification = etree.SubElement(
payment_identification, 'EndToEndId') payment_identification, "EndToEndId"
)
end2end_identification.text = self._prepare_field( end2end_identification.text = self._prepare_field(
'End to End Identification', 'line.name', "End to End Identification",
{'line': line}, 35, gen_args=gen_args) "line.name",
{"line": line},
35,
gen_args=gen_args,
)
currency_name = self._prepare_field( currency_name = self._prepare_field(
'Currency Code', 'line.currency_id.name', "Currency Code",
{'line': line}, 3, gen_args=gen_args) "line.currency_id.name",
amount = etree.SubElement( {"line": line},
credit_transfer_transaction_info, 'Amt') 3,
gen_args=gen_args,
)
amount = etree.SubElement(credit_transfer_transaction_info, "Amt")
instructed_amount = etree.SubElement( instructed_amount = etree.SubElement(
amount, 'InstdAmt', Ccy=currency_name) amount, "InstdAmt", Ccy=currency_name
instructed_amount.text = '%.2f' % line.amount_currency )
instructed_amount.text = "%.2f" % line.amount_currency
amount_control_sum_a += line.amount_currency amount_control_sum_a += line.amount_currency
amount_control_sum_b += line.amount_currency amount_control_sum_b += line.amount_currency
if not line.partner_bank_id: if not line.partner_bank_id:
raise UserError( raise UserError(
_("Bank account is missing on the bank payment line " _(
"of partner '%s' (reference '%s').") "Bank account is missing on the bank payment line "
% (line.partner_id.name, line.name)) "of partner '%s' (reference '%s')."
)
% (line.partner_id.name, line.name)
)
self.generate_party_block( self.generate_party_block(
credit_transfer_transaction_info, 'Cdtr', credit_transfer_transaction_info,
'C', line.partner_bank_id, gen_args, line) "Cdtr",
"C",
line.partner_bank_id,
gen_args,
line,
)
if line.purpose: if line.purpose:
purpose = etree.SubElement( purpose = etree.SubElement(credit_transfer_transaction_info, "Purp")
credit_transfer_transaction_info, 'Purp') etree.SubElement(purpose, "Cd").text = line.purpose
etree.SubElement(purpose, 'Cd').text = line.purpose
self.generate_remittance_info_block( self.generate_remittance_info_block(
credit_transfer_transaction_info, line, gen_args) credit_transfer_transaction_info, line, gen_args
if not pain_flavor.startswith('pain.001.001.02'): )
if not pain_flavor.startswith("pain.001.001.02"):
nb_of_transactions_b.text = str(transactions_count_b) nb_of_transactions_b.text = str(transactions_count_b)
control_sum_b.text = '%.2f' % amount_control_sum_b control_sum_b.text = "%.2f" % amount_control_sum_b
if not pain_flavor.startswith('pain.001.001.02'): if not pain_flavor.startswith("pain.001.001.02"):
nb_of_transactions_a.text = str(transactions_count_a) nb_of_transactions_a.text = str(transactions_count_a)
control_sum_a.text = '%.2f' % amount_control_sum_a control_sum_a.text = "%.2f" % amount_control_sum_a
else: else:
nb_of_transactions_a.text = str(transactions_count_a) nb_of_transactions_a.text = str(transactions_count_a)
control_sum_a.text = '%.2f' % amount_control_sum_a control_sum_a.text = "%.2f" % amount_control_sum_a
return self.finalize_sepa_file_creation(xml_root, gen_args) return self.finalize_sepa_file_creation(xml_root, gen_args)

15
account_banking_sepa_credit_transfer/post_install.py
View File

@@ -1,18 +1,17 @@
# Copyright 2016 Akretion (Alexis de Lattre <alexis.delattre@akretion.com>) # Copyright 2016 Akretion (Alexis de Lattre <alexis.delattre@akretion.com>)
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
from odoo import api, SUPERUSER_ID from odoo import SUPERUSER_ID, api
def update_bank_journals(cr, registry): def update_bank_journals(cr, registry):
with api.Environment.manage(): with api.Environment.manage():
env = api.Environment(cr, SUPERUSER_ID, {}) env = api.Environment(cr, SUPERUSER_ID, {})
ajo = env['account.journal'] ajo = env["account.journal"]
journals = ajo.search([('type', '=', 'bank')]) journals = ajo.search([("type", "=", "bank")])
sct = env.ref( sct = env.ref("account_banking_sepa_credit_transfer.sepa_credit_transfer")
'account_banking_sepa_credit_transfer.sepa_credit_transfer')
if sct: if sct:
journals.write({ journals.write(
'outbound_payment_method_ids': [(4, sct.id)], {"outbound_payment_method_ids": [(4, sct.id)],}
}) )
return return

2
account_banking_sepa_credit_transfer/static/description/icon.svg
View File

@@ -89,4 +89,4 @@
y="109.17231" y="109.17231"
id="tspan2995" id="tspan2995"
style="font-weight:bold;-inkscape-font-specification:Sans Bold">TRANSFER</tspan></text> style="font-weight:bold;-inkscape-font-specification:Sans Bold">TRANSFER</tspan></text>
</svg> </svg>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 23 KiB

After

Width:  |  Height:  |  Size: 23 KiB

1
account_banking_sepa_credit_transfer/tests/__init__.py
View File

@@ -1,2 +1 @@
from . import test_sct from . import test_sct

426
account_banking_sepa_credit_transfer/tests/test_sct.py
View File

@@ -3,84 +3,96 @@
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
import base64 import base64
from odoo.exceptions import UserError
from odoo.tools import float_compare
from odoo.tests import common
import time import time
from lxml import etree from lxml import etree
from odoo.exceptions import UserError
from odoo.tests import common
from odoo.tools import float_compare
class TestSCT(common.HttpCase): class TestSCT(common.HttpCase):
def setUp(self): def setUp(self):
super(TestSCT, self).setUp() super(TestSCT, self).setUp()
self.account_model = self.env['account.account'] self.account_model = self.env["account.account"]
self.move_model = self.env['account.move'] self.move_model = self.env["account.move"]
self.journal_model = self.env['account.journal'] self.journal_model = self.env["account.journal"]
self.payment_order_model = self.env['account.payment.order'] self.payment_order_model = self.env["account.payment.order"]
self.payment_line_model = self.env['account.payment.line'] self.payment_line_model = self.env["account.payment.line"]
self.bank_line_model = self.env['bank.payment.line'] self.bank_line_model = self.env["bank.payment.line"]
self.partner_bank_model = self.env['res.partner.bank'] self.partner_bank_model = self.env["res.partner.bank"]
self.attachment_model = self.env['ir.attachment'] self.attachment_model = self.env["ir.attachment"]
self.invoice_model = self.env['account.invoice'] self.invoice_model = self.env["account.invoice"]
self.invoice_line_model = self.env['account.invoice.line'] self.invoice_line_model = self.env["account.invoice.line"]
self.partner_agrolait = self.env.ref('base.res_partner_2') self.partner_agrolait = self.env.ref("base.res_partner_2")
self.partner_asus = self.env.ref('base.res_partner_1') self.partner_asus = self.env.ref("base.res_partner_1")
self.partner_c2c = self.env.ref('base.res_partner_12') self.partner_c2c = self.env.ref("base.res_partner_12")
self.eur_currency = self.env.ref('base.EUR') self.eur_currency = self.env.ref("base.EUR")
self.usd_currency = self.env.ref('base.USD') self.usd_currency = self.env.ref("base.USD")
self.main_company = self.env['res.company'].create({ self.main_company = self.env["res.company"].create(
'name': 'Test EUR company', {"name": "Test EUR company", "currency_id": self.eur_currency.id,}
'currency_id': self.eur_currency.id, )
})
self.partner_agrolait.company_id = self.main_company.id self.partner_agrolait.company_id = self.main_company.id
self.partner_asus.company_id = self.main_company.id self.partner_asus.company_id = self.main_company.id
self.partner_c2c.company_id = self.main_company.id self.partner_c2c.company_id = self.main_company.id
self.env.user.write({ self.env.user.write(
'company_ids': [(6, 0, self.main_company.ids)], {
'company_id': self.main_company.id, "company_ids": [(6, 0, self.main_company.ids)],
}) "company_id": self.main_company.id,
}
)
self.env.ref( self.env.ref(
'l10n_generic_coa.configurable_chart_template' "l10n_generic_coa.configurable_chart_template"
).try_loading_for_current_company() ).try_loading_for_current_company()
self.account_expense = self.account_model.search([ self.account_expense = self.account_model.search(
('user_type_id', '=', [
self.env.ref('account.data_account_type_expenses').id), (
('company_id', '=', self.main_company.id), "user_type_id",
], limit=1) "=",
self.account_payable = self.account_model.search([ self.env.ref("account.data_account_type_expenses").id,
('user_type_id', '=', ),
self.env.ref('account.data_account_type_payable').id), ("company_id", "=", self.main_company.id),
('company_id', '=', self.main_company.id), ],
], limit=1) limit=1,
self.partner_bank = self.env.ref( )
'account_payment_mode.main_company_iban' self.account_payable = self.account_model.search(
).copy({ [
'company_id': self.main_company.id, (
'partner_id': self.main_company.partner_id.id, "user_type_id",
'bank_id': ( "=",
self.env.ref('account_payment_mode.bank_la_banque_postale').id self.env.ref("account.data_account_type_payable").id,
), ),
}) ("company_id", "=", self.main_company.id),
],
limit=1,
)
self.partner_bank = self.env.ref("account_payment_mode.main_company_iban").copy(
{
"company_id": self.main_company.id,
"partner_id": self.main_company.partner_id.id,
"bank_id": (
self.env.ref("account_payment_mode.bank_la_banque_postale").id
),
}
)
# create journal # create journal
self.bank_journal = self.journal_model.create({ self.bank_journal = self.journal_model.create(
'name': 'Company Bank journal', {
'type': 'bank', "name": "Company Bank journal",
'code': 'BNKFB', "type": "bank",
'bank_account_id': self.partner_bank.id, "code": "BNKFB",
'bank_id': self.partner_bank.bank_id.id, "bank_account_id": self.partner_bank.id,
}) "bank_id": self.partner_bank.bank_id.id,
}
)
# update payment mode # update payment mode
self.payment_mode = self.env.ref( self.payment_mode = self.env.ref(
'account_banking_sepa_credit_transfer.' "account_banking_sepa_credit_transfer." "payment_mode_outbound_sepa_ct1"
'payment_mode_outbound_sepa_ct1' ).copy({"company_id": self.main_company.id,})
).copy({ self.payment_mode.write(
'company_id': self.main_company.id, {"bank_account_link": "fixed", "fixed_journal_id": self.bank_journal.id,}
}) )
self.payment_mode.write({
'bank_account_link': 'fixed',
'fixed_journal_id': self.bank_journal.id,
})
# Trigger the recompute of account type on res.partner.bank # Trigger the recompute of account type on res.partner.bank
self.partner_bank_model.search([])._compute_acc_type() self.partner_bank_model.search([])._compute_acc_type()
@@ -90,208 +102,252 @@ class TestSCT(common.HttpCase):
self.check_eur_currency_sct() self.check_eur_currency_sct()
def test_pain_001_03(self): def test_pain_001_03(self):
self.payment_mode.payment_method_id.pain_version = 'pain.001.001.03' self.payment_mode.payment_method_id.pain_version = "pain.001.001.03"
self.check_eur_currency_sct() self.check_eur_currency_sct()
def test_pain_001_04(self): def test_pain_001_04(self):
self.payment_mode.payment_method_id.pain_version = 'pain.001.001.04' self.payment_mode.payment_method_id.pain_version = "pain.001.001.04"
self.check_eur_currency_sct() self.check_eur_currency_sct()
def test_pain_001_05(self): def test_pain_001_05(self):
self.payment_mode.payment_method_id.pain_version = 'pain.001.001.05' self.payment_mode.payment_method_id.pain_version = "pain.001.001.05"
self.check_eur_currency_sct() self.check_eur_currency_sct()
def test_pain_003_03(self): def test_pain_003_03(self):
self.payment_mode.payment_method_id.pain_version = 'pain.001.003.03' self.payment_mode.payment_method_id.pain_version = "pain.001.003.03"
self.check_eur_currency_sct() self.check_eur_currency_sct()
def check_eur_currency_sct(self): def check_eur_currency_sct(self):
invoice1 = self.create_invoice( invoice1 = self.create_invoice(
self.partner_agrolait.id, self.partner_agrolait.id,
'account_payment_mode.res_partner_2_iban', self.eur_currency.id, "account_payment_mode.res_partner_2_iban",
42.0, 'F1341') self.eur_currency.id,
42.0,
"F1341",
)
invoice2 = self.create_invoice( invoice2 = self.create_invoice(
self.partner_agrolait.id, self.partner_agrolait.id,
'account_payment_mode.res_partner_2_iban', self.eur_currency.id, "account_payment_mode.res_partner_2_iban",
12.0, 'F1342') self.eur_currency.id,
12.0,
"F1342",
)
invoice3 = self.create_invoice( invoice3 = self.create_invoice(
self.partner_agrolait.id, self.partner_agrolait.id,
'account_payment_mode.res_partner_2_iban', self.eur_currency.id, "account_payment_mode.res_partner_2_iban",
5.0, 'A1301', 'in_refund') self.eur_currency.id,
5.0,
"A1301",
"in_refund",
)
invoice4 = self.create_invoice( invoice4 = self.create_invoice(
self.partner_c2c.id, self.partner_c2c.id,
'account_payment_mode.res_partner_12_iban', self.eur_currency.id, "account_payment_mode.res_partner_12_iban",
11.0, 'I1642') self.eur_currency.id,
11.0,
"I1642",
)
invoice5 = self.create_invoice( invoice5 = self.create_invoice(
self.partner_c2c.id, self.partner_c2c.id,
'account_payment_mode.res_partner_12_iban', self.eur_currency.id, "account_payment_mode.res_partner_12_iban",
41.0, 'I1643') self.eur_currency.id,
41.0,
"I1643",
)
for inv in [invoice1, invoice2, invoice3, invoice4, invoice5]: for inv in [invoice1, invoice2, invoice3, invoice4, invoice5]:
action = inv.create_account_payment_line() action = inv.create_account_payment_line()
self.assertEqual(action['res_model'], 'account.payment.order') self.assertEqual(action["res_model"], "account.payment.order")
self.payment_order = self.payment_order_model.browse(action['res_id']) self.payment_order = self.payment_order_model.browse(action["res_id"])
self.assertEqual( self.assertEqual(self.payment_order.payment_type, "outbound")
self.payment_order.payment_type, 'outbound') self.assertEqual(self.payment_order.payment_mode_id, self.payment_mode)
self.assertEqual( self.assertEqual(self.payment_order.journal_id, self.bank_journal)
self.payment_order.payment_mode_id, self.payment_mode) pay_lines = self.payment_line_model.search(
self.assertEqual( [
self.payment_order.journal_id, self.bank_journal) ("partner_id", "=", self.partner_agrolait.id),
pay_lines = self.payment_line_model.search([ ("order_id", "=", self.payment_order.id),
('partner_id', '=', self.partner_agrolait.id), ]
('order_id', '=', self.payment_order.id)]) )
self.assertEqual(len(pay_lines), 3) self.assertEqual(len(pay_lines), 3)
agrolait_pay_line1 = pay_lines[0] agrolait_pay_line1 = pay_lines[0]
accpre = self.env['decimal.precision'].precision_get('Account') accpre = self.env["decimal.precision"].precision_get("Account")
self.assertEqual(agrolait_pay_line1.currency_id, self.eur_currency) self.assertEqual(agrolait_pay_line1.currency_id, self.eur_currency)
self.assertEqual(agrolait_pay_line1.partner_bank_id, invoice1.partner_bank_id)
self.assertEqual( self.assertEqual(
agrolait_pay_line1.partner_bank_id, invoice1.partner_bank_id) float_compare(
self.assertEqual(float_compare( agrolait_pay_line1.amount_currency, 42, precision_digits=accpre
agrolait_pay_line1.amount_currency, 42, precision_digits=accpre), ),
0) 0,
self.assertEqual(agrolait_pay_line1.communication_type, 'normal') )
self.assertEqual(agrolait_pay_line1.communication, 'F1341') self.assertEqual(agrolait_pay_line1.communication_type, "normal")
self.assertEqual(agrolait_pay_line1.communication, "F1341")
self.payment_order.draft2open() self.payment_order.draft2open()
self.assertEqual(self.payment_order.state, 'open') self.assertEqual(self.payment_order.state, "open")
self.assertEqual(self.payment_order.sepa, True) self.assertEqual(self.payment_order.sepa, True)
bank_lines = self.bank_line_model.search([ bank_lines = self.bank_line_model.search(
('partner_id', '=', self.partner_agrolait.id)]) [("partner_id", "=", self.partner_agrolait.id)]
)
self.assertEqual(len(bank_lines), 1) self.assertEqual(len(bank_lines), 1)
agrolait_bank_line = bank_lines[0] agrolait_bank_line = bank_lines[0]
self.assertEqual(agrolait_bank_line.currency_id, self.eur_currency) self.assertEqual(agrolait_bank_line.currency_id, self.eur_currency)
self.assertEqual(float_compare(
agrolait_bank_line.amount_currency, 49.0, precision_digits=accpre),
0)
self.assertEqual(agrolait_bank_line.communication_type, 'normal')
self.assertEqual( self.assertEqual(
agrolait_bank_line.communication, 'F1341-F1342-A1301') float_compare(
self.assertEqual( agrolait_bank_line.amount_currency, 49.0, precision_digits=accpre
agrolait_bank_line.partner_bank_id, invoice1.partner_bank_id) ),
0,
)
self.assertEqual(agrolait_bank_line.communication_type, "normal")
self.assertEqual(agrolait_bank_line.communication, "F1341-F1342-A1301")
self.assertEqual(agrolait_bank_line.partner_bank_id, invoice1.partner_bank_id)
action = self.payment_order.open2generated() action = self.payment_order.open2generated()
self.assertEqual(self.payment_order.state, 'generated') self.assertEqual(self.payment_order.state, "generated")
self.assertEqual(action['res_model'], 'ir.attachment') self.assertEqual(action["res_model"], "ir.attachment")
attachment = self.attachment_model.browse(action['res_id']) attachment = self.attachment_model.browse(action["res_id"])
self.assertEqual(attachment.datas_fname[-4:], '.xml') self.assertEqual(attachment.datas_fname[-4:], ".xml")
xml_file = base64.b64decode(attachment.datas) xml_file = base64.b64decode(attachment.datas)
xml_root = etree.fromstring(xml_file) xml_root = etree.fromstring(xml_file)
namespaces = xml_root.nsmap namespaces = xml_root.nsmap
namespaces['p'] = xml_root.nsmap[None] namespaces["p"] = xml_root.nsmap[None]
namespaces.pop(None) namespaces.pop(None)
pay_method_xpath = xml_root.xpath( pay_method_xpath = xml_root.xpath("//p:PmtInf/p:PmtMtd", namespaces=namespaces)
'//p:PmtInf/p:PmtMtd', namespaces=namespaces) self.assertEqual(pay_method_xpath[0].text, "TRF")
self.assertEqual(pay_method_xpath[0].text, 'TRF')
sepa_xpath = xml_root.xpath( sepa_xpath = xml_root.xpath(
'//p:PmtInf/p:PmtTpInf/p:SvcLvl/p:Cd', namespaces=namespaces) "//p:PmtInf/p:PmtTpInf/p:SvcLvl/p:Cd", namespaces=namespaces
self.assertEqual(sepa_xpath[0].text, 'SEPA') )
self.assertEqual(sepa_xpath[0].text, "SEPA")
debtor_acc_xpath = xml_root.xpath( debtor_acc_xpath = xml_root.xpath(
'//p:PmtInf/p:DbtrAcct/p:Id/p:IBAN', namespaces=namespaces) "//p:PmtInf/p:DbtrAcct/p:Id/p:IBAN", namespaces=namespaces
)
self.assertEqual( self.assertEqual(
debtor_acc_xpath[0].text, debtor_acc_xpath[0].text,
self.payment_order.company_partner_bank_id.sanitized_acc_number) self.payment_order.company_partner_bank_id.sanitized_acc_number,
)
self.payment_order.generated2uploaded() self.payment_order.generated2uploaded()
self.assertEqual(self.payment_order.state, 'uploaded') self.assertEqual(self.payment_order.state, "uploaded")
for inv in [invoice1, invoice2, invoice3, invoice4, invoice5]: for inv in [invoice1, invoice2, invoice3, invoice4, invoice5]:
self.assertEqual(inv.state, 'paid') self.assertEqual(inv.state, "paid")
return return
def test_usd_currency_sct(self): def test_usd_currency_sct(self):
invoice1 = self.create_invoice( invoice1 = self.create_invoice(
self.partner_asus.id, self.partner_asus.id,
'account_payment_mode.res_partner_2_iban', self.usd_currency.id, "account_payment_mode.res_partner_2_iban",
2042.0, 'Inv9032') self.usd_currency.id,
2042.0,
"Inv9032",
)
invoice2 = self.create_invoice( invoice2 = self.create_invoice(
self.partner_asus.id, self.partner_asus.id,
'account_payment_mode.res_partner_2_iban', self.usd_currency.id, "account_payment_mode.res_partner_2_iban",
1012.0, 'Inv9033') self.usd_currency.id,
1012.0,
"Inv9033",
)
for inv in [invoice1, invoice2]: for inv in [invoice1, invoice2]:
action = inv.create_account_payment_line() action = inv.create_account_payment_line()
self.assertEqual(action['res_model'], 'account.payment.order') self.assertEqual(action["res_model"], "account.payment.order")
self.payment_order = self.payment_order_model.browse(action['res_id']) self.payment_order = self.payment_order_model.browse(action["res_id"])
self.assertEqual( self.assertEqual(self.payment_order.payment_type, "outbound")
self.payment_order.payment_type, 'outbound') self.assertEqual(self.payment_order.payment_mode_id, self.payment_mode)
self.assertEqual( self.assertEqual(self.payment_order.journal_id, self.bank_journal)
self.payment_order.payment_mode_id, self.payment_mode) pay_lines = self.payment_line_model.search(
self.assertEqual( [
self.payment_order.journal_id, self.bank_journal) ("partner_id", "=", self.partner_asus.id),
pay_lines = self.payment_line_model.search([ ("order_id", "=", self.payment_order.id),
('partner_id', '=', self.partner_asus.id), ]
('order_id', '=', self.payment_order.id)]) )
self.assertEqual(len(pay_lines), 2) self.assertEqual(len(pay_lines), 2)
asus_pay_line1 = pay_lines[0] asus_pay_line1 = pay_lines[0]
accpre = self.env['decimal.precision'].precision_get('Account') accpre = self.env["decimal.precision"].precision_get("Account")
self.assertEqual(asus_pay_line1.currency_id, self.usd_currency) self.assertEqual(asus_pay_line1.currency_id, self.usd_currency)
self.assertEqual(asus_pay_line1.partner_bank_id, invoice1.partner_bank_id)
self.assertEqual( self.assertEqual(
asus_pay_line1.partner_bank_id, invoice1.partner_bank_id) float_compare(
self.assertEqual(float_compare( asus_pay_line1.amount_currency, 2042, precision_digits=accpre
asus_pay_line1.amount_currency, 2042, precision_digits=accpre), ),
0) 0,
self.assertEqual(asus_pay_line1.communication_type, 'normal') )
self.assertEqual(asus_pay_line1.communication, 'Inv9032') self.assertEqual(asus_pay_line1.communication_type, "normal")
self.assertEqual(asus_pay_line1.communication, "Inv9032")
self.payment_order.draft2open() self.payment_order.draft2open()
self.assertEqual(self.payment_order.state, 'open') self.assertEqual(self.payment_order.state, "open")
self.assertEqual(self.payment_order.sepa, False) self.assertEqual(self.payment_order.sepa, False)
bank_lines = self.bank_line_model.search([ bank_lines = self.bank_line_model.search(
('partner_id', '=', self.partner_asus.id)]) [("partner_id", "=", self.partner_asus.id)]
)
self.assertEqual(len(bank_lines), 1) self.assertEqual(len(bank_lines), 1)
asus_bank_line = bank_lines[0] asus_bank_line = bank_lines[0]
self.assertEqual(asus_bank_line.currency_id, self.usd_currency) self.assertEqual(asus_bank_line.currency_id, self.usd_currency)
self.assertEqual(float_compare(
asus_bank_line.amount_currency, 3054.0, precision_digits=accpre),
0)
self.assertEqual(asus_bank_line.communication_type, 'normal')
self.assertEqual( self.assertEqual(
asus_bank_line.communication, 'Inv9032-Inv9033') float_compare(
self.assertEqual( asus_bank_line.amount_currency, 3054.0, precision_digits=accpre
asus_bank_line.partner_bank_id, invoice1.partner_bank_id) ),
0,
)
self.assertEqual(asus_bank_line.communication_type, "normal")
self.assertEqual(asus_bank_line.communication, "Inv9032-Inv9033")
self.assertEqual(asus_bank_line.partner_bank_id, invoice1.partner_bank_id)
action = self.payment_order.open2generated() action = self.payment_order.open2generated()
self.assertEqual(self.payment_order.state, 'generated') self.assertEqual(self.payment_order.state, "generated")
self.assertEqual(action['res_model'], 'ir.attachment') self.assertEqual(action["res_model"], "ir.attachment")
attachment = self.attachment_model.browse(action['res_id']) attachment = self.attachment_model.browse(action["res_id"])
self.assertEqual(attachment.datas_fname[-4:], '.xml') self.assertEqual(attachment.datas_fname[-4:], ".xml")
xml_file = base64.b64decode(attachment.datas) xml_file = base64.b64decode(attachment.datas)
xml_root = etree.fromstring(xml_file) xml_root = etree.fromstring(xml_file)
namespaces = xml_root.nsmap namespaces = xml_root.nsmap
namespaces['p'] = xml_root.nsmap[None] namespaces["p"] = xml_root.nsmap[None]
namespaces.pop(None) namespaces.pop(None)
pay_method_xpath = xml_root.xpath( pay_method_xpath = xml_root.xpath("//p:PmtInf/p:PmtMtd", namespaces=namespaces)
'//p:PmtInf/p:PmtMtd', namespaces=namespaces) self.assertEqual(pay_method_xpath[0].text, "TRF")
self.assertEqual(pay_method_xpath[0].text, 'TRF')
sepa_xpath = xml_root.xpath( sepa_xpath = xml_root.xpath(
'//p:PmtInf/p:PmtTpInf/p:SvcLvl/p:Cd', namespaces=namespaces) "//p:PmtInf/p:PmtTpInf/p:SvcLvl/p:Cd", namespaces=namespaces
)
self.assertEqual(len(sepa_xpath), 0) self.assertEqual(len(sepa_xpath), 0)
debtor_acc_xpath = xml_root.xpath( debtor_acc_xpath = xml_root.xpath(
'//p:PmtInf/p:DbtrAcct/p:Id/p:IBAN', namespaces=namespaces) "//p:PmtInf/p:DbtrAcct/p:Id/p:IBAN", namespaces=namespaces
)
self.assertEqual( self.assertEqual(
debtor_acc_xpath[0].text, debtor_acc_xpath[0].text,
self.payment_order.company_partner_bank_id.sanitized_acc_number) self.payment_order.company_partner_bank_id.sanitized_acc_number,
)
self.payment_order.generated2uploaded() self.payment_order.generated2uploaded()
self.assertEqual(self.payment_order.state, 'uploaded') self.assertEqual(self.payment_order.state, "uploaded")
for inv in [invoice1, invoice2]: for inv in [invoice1, invoice2]:
self.assertEqual(inv.state, 'paid') self.assertEqual(inv.state, "paid")
return return
def create_invoice( def create_invoice(
self, partner_id, partner_bank_xmlid, currency_id, self,
price_unit, reference, type='in_invoice'): partner_id,
invoice = self.invoice_model.create({ partner_bank_xmlid,
'partner_id': partner_id, currency_id,
'reference_type': 'none', price_unit,
'reference': reference, reference,
'currency_id': currency_id, type="in_invoice",
'name': 'test', ):
'account_id': self.account_payable.id, invoice = self.invoice_model.create(
'type': type, {
'date_invoice': time.strftime('%Y-%m-%d'), "partner_id": partner_id,
'payment_mode_id': self.payment_mode.id, "reference_type": "none",
'partner_bank_id': self.env.ref(partner_bank_xmlid).id, "reference": reference,
}) "currency_id": currency_id,
self.invoice_line_model.create({ "name": "test",
'invoice_id': invoice.id, "account_id": self.account_payable.id,
'price_unit': price_unit, "type": type,
'quantity': 1, "date_invoice": time.strftime("%Y-%m-%d"),
'name': 'Great service', "payment_mode_id": self.payment_mode.id,
'account_id': self.account_expense.id, "partner_bank_id": self.env.ref(partner_bank_xmlid).id,
}) }
)
self.invoice_line_model.create(
{
"invoice_id": invoice.id,
"price_unit": price_unit,
"quantity": 1,
"name": "Great service",
"account_id": self.account_expense.id,
}
)
invoice.action_invoice_open() invoice.action_invoice_open()
return invoice return invoice