Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions account_payment_partner/models/account_move.py
Original file line number Diff line number Diff line change
Expand Up @@ -120,8 +120,6 @@ def _compute_partner_bank_id(self):
continue
else:
move.partner_bank_id = False
else:
move.partner_bank_id = False
return res

@api.depends("line_ids.matched_credit_ids", "line_ids.matched_debit_ids")
Expand Down
38 changes: 21 additions & 17 deletions account_payment_partner/tests/test_account_payment_partner.py
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,12 @@ def setUpClass(cls):
"type": "service",
}
)
cls.company_default_bank = cls.company.partner_id.bank_ids.filtered(
lambda bank: not bank.company_id or bank.company_id == cls.company
).sorted(lambda bank: not bank.allow_out_payment)[:1]
cls.company_2_default_bank = cls.company_2.partner_id.bank_ids.filtered(
lambda bank: not bank.company_id or bank.company_id == cls.company_2
).sorted(lambda bank: not bank.allow_out_payment)[:1]

def _create_invoice(self, default_move_type, partner):
move_form = Form(
Expand Down Expand Up @@ -246,27 +252,25 @@ def test_partner_id_changes_compute_partner_bank(self):
move_form = Form(
self.env["account.move"].with_context(default_move_type="out_invoice")
)
self.assertFalse(move_form.partner_bank_id)
self.assertEqual(move_form.partner_bank_id, self.company_default_bank)
move_form.partner_id = self.customer
self.assertEqual(move_form.payment_mode_id, self.customer_payment_mode)
self.assertFalse(move_form.partner_bank_id)

def test_out_invoice_onchange(self):
# Test the onchange methods in invoice
invoice = self.move_model.new(
{
"partner_id": self.customer.id,
"move_type": "out_invoice",
"company_id": self.company.id,
}
)
self.assertEqual(invoice.payment_mode_id, self.customer_payment_mode)

invoice.company_id = self.company_2
self.assertEqual(invoice.payment_mode_id, self.payment_mode_model)

invoice.payment_mode_id = False
self.assertFalse(invoice.partner_bank_id)
invoice_form = Form(
self.move_model.with_context(default_move_type="out_invoice")
)
invoice_form.partner_id = self.customer
self.assertEqual(invoice_form.company_id, self.company)
self.assertFalse(invoice_form.partner_bank_id)
self.assertEqual(invoice_form.payment_mode_id, self.customer_payment_mode)
invoice_form.company_id = self.company_2
self.assertEqual(invoice_form.partner_bank_id, self.company_2_default_bank)
self.assertEqual(invoice_form.payment_mode_id, self.payment_mode_model)
invoice_form.payment_mode_id = self.payment_mode_model.browse()
self.assertEqual(invoice_form.partner_bank_id, self.company_2_default_bank)

def test_invoice_create_in_invoice(self):
invoice = self._create_invoice(
Expand Down Expand Up @@ -476,7 +480,7 @@ def test_partner_onchange(self):
self.assertFalse(invoice.partner_bank_id)
vals = {"partner_id": False, "move_type": "in_refund"}
invoice = self.move_model.new(vals)
self.assertFalse(invoice.partner_bank_id)
self.assertEqual(invoice.partner_bank_id, self.company_default_bank)

def test_onchange_payment_mode_id(self):
mode = self.supplier_payment_mode
Expand All @@ -487,7 +491,7 @@ def test_onchange_payment_mode_id(self):
mode.payment_method_id.bank_account_required = False
self.assertEqual(self.supplier_invoice.partner_bank_id, self.supplier_bank)
self.supplier_invoice.payment_mode_id = False
self.assertFalse(self.supplier_invoice.partner_bank_id)
self.assertEqual(self.supplier_invoice.partner_bank_id, self.supplier_bank)

def test_print_report(self):
self.supplier_invoice.partner_bank_id = self.supplier_bank.id
Expand Down
Loading