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 #1391 into 17.0

Browse Source 
Signed-off-by AaronHForgeFlow
This commit is contained in:
OCA-git-bot
2025-01-15 12:36:13 +00:00
parent b194b2cdb6 b703d9d725
commit 1de5235355
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
account_payment_partner/tests/test_account_payment_partner.py
View File

@@ -572,15 +572,17 @@ class TestAccountPaymentPartner(TransactionCase):
move_form = Form(
self.move_model.with_context(
default_name="Invoice test", default_move_type="out_invoice"
)
).with_company(self.env.ref("base.main_company").id)
)
self.assertFalse(move_form.payment_mode_id)
self.env["ir.default"].create(
{"field_id": field.id, "json_value": payment_mode.id}
)
self.env["ir.default"].with_company(
self.env.ref("base.main_company").id
).create({"field_id": field.id, "json_value": payment_mode.id})
move_form = Form(
self.move_model.with_context(
default_name="Invoice test", default_move_type="out_invoice"
)
default_name="Invoice test",
default_move_type="out_invoice",
default_company_id=self.env.ref("base.main_company").id,
).with_company(self.env.ref("base.main_company").id)
)
self.assertEqual(move_form.payment_mode_id, payment_mode)

4
account_payment_purchase/models/account_move.py
View File

@@ -29,13 +29,13 @@ class AccountMove(models.Model):
"message": _("Selected purchase order have different payment mode."),
}
return res
elif self.payment_mode_id.id != new_mode:
elif new_mode and self.payment_mode_id.id != new_mode:
self.payment_mode_id = new_mode
if old_bank and new_bank and old_bank != new_bank:
res["warning"] = {
"title": _("Warning"),
"message": _("Selected purchase order have different supplier bank."),
}
elif self.partner_bank_id.id != new_bank:
elif new_bank and self.partner_bank_id.id != new_bank:
self.partner_bank_id = new_bank
return res