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 PR #1143 into 14.0

Browse Source 
Signed-off-by pedrobaeza
This commit is contained in:
OCA-git-bot
2023-11-30 13:03:40 +00:00
parent ff2a975721 4a71800ec8
commit 4f53c353cc
5 changed files with 49 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
account_banking_mandate/data/mandate_reference_sequence.xml
View File

@@ -5,5 +5,6 @@
<field name="code">account.banking.mandate</field>
<field name="prefix">BM</field>
<field name="padding" eval="7" />
<field name="company_id" eval="False" />
</record>
</odoo>

20
account_banking_mandate/models/account_banking_mandate.py
View File

@@ -61,7 +61,7 @@ class AccountBankingMandate(models.Model):
default=lambda self: self.env.company,
)
unique_mandate_reference = fields.Char(
string="Unique Mandate Reference", tracking=10, copy=False
string="Unique Mandate Reference", tracking=10, copy=False, default="/"
)
signature_date = fields.Date(
string="Date of Signature of the Mandate",
@@ -175,14 +175,16 @@ class AccountBankingMandate(models.Model):
% mandate.unique_mandate_reference
)
@api.model
def create(self, vals=None):
unique_mandate_reference = vals.get("unique_mandate_reference")
if not unique_mandate_reference or unique_mandate_reference == "New":
vals["unique_mandate_reference"] = (
self.env["ir.sequence"].next_by_code("account.banking.mandate") or "New"
)
return super().create(vals)
@api.model_create_multi
def create(self, vals_list):
for vals in vals_list:
unique_mandate_reference = vals.get("unique_mandate_reference", "/")
if unique_mandate_reference == "/":
vals["unique_mandate_reference"] = (
self.env["ir.sequence"].next_by_code("account.banking.mandate")
or "New"
)
return super().create(vals_list)
@api.onchange("partner_bank_id")
def mandate_partner_bank_change(self):

27
account_banking_mandate/models/account_move.py
View File

@@ -20,25 +20,26 @@ class AccountMove(models.Model):
related="payment_mode_id.payment_method_id.mandate_required", readonly=True
)
@api.model
def create(self, vals):
@api.model_create_multi
def create(self, vals_list):
"""Fill the mandate_id from the partner if none is provided on
creation, using same method as upstream."""
onchanges = {
"_onchange_partner_id": ["mandate_id"],
"_onchange_payment_mode_id": ["mandate_id"],
}
for onchange_method, changed_fields in list(onchanges.items()):
if any(f not in vals for f in changed_fields):
move = self.new(vals)
move = move.with_company(move.company_id.id)
getattr(move, onchange_method)()
for field in changed_fields:
if field not in vals and move[field]:
vals[field] = move._fields[field].convert_to_write(
move[field], move
)
return super().create(vals)
for vals in vals_list:
for onchange_method, changed_fields in list(onchanges.items()):
if any(f not in vals for f in changed_fields):
move = self.new(vals)
move = move.with_company(move.company_id.id)
getattr(move, onchange_method)()
for field in changed_fields:
if field not in vals and move[field]:
vals[field] = move._fields[field].convert_to_write(
move[field], move
)
return super().create(vals_list)
def set_mandate(self):
if self.payment_mode_id.payment_method_id.mandate_required:

45
account_banking_mandate/tests/test_mandate.py
View File

@@ -175,9 +175,8 @@ class TestMandate(TransactionCase):
def test_mandate_reference_03(self):
"""
Test case: create a mandate with "New" as reference
Expected result: the reference of the created mandate is not empty and
is not "New"
Test case: create a mandate with "TEST" as reference
Expected result: the reference of the created mandate is "TEST"
"""
bank_account = self.env.ref("account_payment_mode.res_partner_12_iban")
mandate = self.env["account.banking.mandate"].create(
@@ -185,15 +184,32 @@ class TestMandate(TransactionCase):
"partner_bank_id": bank_account.id,
"signature_date": "2015-01-01",
"company_id": self.company.id,
"unique_mandate_reference": "New",
"unique_mandate_reference": "TEST",
}
)
self.assertTrue(mandate.unique_mandate_reference)
self.assertNotEqual(mandate.unique_mandate_reference, "New")
self.assertEqual(mandate.unique_mandate_reference, "TEST")
def test_mandate_reference_04(self):
"""
Test case: create a mandate with "/" as reference
Expected result: the reference of the created mandate is not "/"
"""
bank_account = self.env.ref("account_payment_mode.res_partner_12_iban")
mandate = self.env["account.banking.mandate"].create(
{
"partner_bank_id": bank_account.id,
"signature_date": "2015-01-01",
"company_id": self.company.id,
"unique_mandate_reference": "/",
}
)
self.assertTrue(mandate.unique_mandate_reference)
self.assertNotEqual(mandate.unique_mandate_reference, "/")
def test_mandate_reference_05(self):
"""
Test case: create a mandate with False as reference
Test case: create a mandate without reference
Expected result: the reference of the created mandate is not empty
"""
bank_account = self.env.ref("account_payment_mode.res_partner_12_iban")
@@ -202,23 +218,6 @@ class TestMandate(TransactionCase):
"partner_bank_id": bank_account.id,
"signature_date": "2015-01-01",
"company_id": self.company.id,
"unique_mandate_reference": False,
}
)
self.assertTrue(mandate.unique_mandate_reference)
def test_mandate_reference_06(self):
"""
Test case: create a mandate with a empty string as reference
Expected result: the reference of the created mandate is not empty
"""
bank_account = self.env.ref("account_payment_mode.res_partner_12_iban")
mandate = self.env["account.banking.mandate"].create(
{
"partner_bank_id": bank_account.id,
"signature_date": "2015-01-01",
"company_id": self.company.id,
"unique_mandate_reference": "",
}
)
self.assertTrue(mandate.unique_mandate_reference)

2
account_banking_mandate/views/account_banking_mandate_view.xml
View File

@@ -50,7 +50,7 @@
<field
name="unique_mandate_reference"
class="oe_inline"
readonly="1"
attrs="{'readonly': [('id', '!=', False)]}"
/>
</h1>
</div>