Skip to content

Commit 648cf60

Browse files
committed
[16.0][IMP] account_banking_mandate: finishing migration
Adjusting changes to complete the version 16.0 migration
1 parent ca6478f commit 648cf60

File tree

6 files changed

+35
-162
lines changed

6 files changed

+35
-162
lines changed

account_banking_mandate/__manifest__.py

-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
"views/account_payment_line.xml",
2626
"views/res_partner_bank_view.xml",
2727
"views/res_partner.xml",
28-
"views/bank_payment_line_view.xml",
2928
"data/mandate_reference_sequence.xml",
3029
"security/mandate_security.xml",
3130
"security/ir.model.access.csv",

account_banking_mandate/models/__init__.py

-1
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,4 @@
44
from . import res_partner_bank
55
from . import res_partner
66
from . import account_payment_line
7-
from . import bank_payment_line
87
from . import account_move_line

account_banking_mandate/models/bank_payment_line.py

-23
This file was deleted.

account_banking_mandate/tests/test_invoice_mandate.py

+2-10
Original file line numberDiff line numberDiff line change
@@ -262,11 +262,7 @@ def setUp(self):
262262

263263
self.invoice_account = self.env["account.account"].search(
264264
[
265-
(
266-
"user_type_id",
267-
"=",
268-
self.env.ref("account.data_account_type_receivable").id,
269-
),
265+
("account_type", "=", "asset_receivable"),
270266
("company_id", "=", self.company.id),
271267
],
272268
limit=1,
@@ -275,11 +271,7 @@ def setUp(self):
275271
self.env["account.account"]
276272
.search(
277273
[
278-
(
279-
"user_type_id",
280-
"=",
281-
self.env.ref("account.data_account_type_expenses").id,
282-
),
274+
("account_type", "=", "expense"),
283275
("company_id", "=", self.company.id),
284276
],
285277
limit=1,

account_banking_mandate/tests/test_mandate.py

+33-93
Original file line numberDiff line numberDiff line change
@@ -9,115 +9,64 @@
99

1010

1111
class TestMandate(TransactionCase):
12-
def test_mandate_01(self):
13-
bank_account = self.env.ref("account_payment_mode.res_partner_12_iban")
14-
mandate = self.env["account.banking.mandate"].create(
12+
def setUp(self):
13+
super(TestMandate, self).setUp()
14+
self.company = self.env.company
15+
self.company_2 = self.env["res.company"].create({"name": "company 2"})
16+
self.company_2.partner_id.company_id = self.company_2.id
17+
self.bank_account = self.env.ref("account_payment_mode.res_partner_12_iban")
18+
self.bank_account.partner_id.company_id = self.company.id
19+
self.mandate = self.env["account.banking.mandate"].create(
1520
{
16-
"partner_bank_id": bank_account.id,
21+
"partner_bank_id": self.bank_account.id,
1722
"signature_date": "2015-01-01",
1823
"company_id": self.company.id,
1924
}
2025
)
21-
self.assertEqual(mandate.state, "draft")
22-
mandate.validate()
23-
self.assertEqual(mandate.state, "valid")
24-
mandate.cancel()
25-
self.assertEqual(mandate.state, "cancel")
26-
mandate.back2draft()
27-
self.assertEqual(mandate.state, "draft")
26+
27+
def test_mandate_01(self):
28+
self.assertEqual(self.mandate.state, "draft")
29+
self.mandate.validate()
30+
self.assertEqual(self.mandate.state, "valid")
31+
self.mandate.cancel()
32+
self.assertEqual(self.mandate.state, "cancel")
33+
self.mandate.back2draft()
34+
self.assertEqual(self.mandate.state, "draft")
2835

2936
def test_mandate_02(self):
30-
bank_account = self.env.ref("account_payment_mode.res_partner_12_iban")
31-
mandate = self.env["account.banking.mandate"].create(
32-
{
33-
"partner_bank_id": bank_account.id,
34-
"signature_date": "2015-01-01",
35-
"company_id": self.company.id,
36-
}
37-
)
3837
with self.assertRaises(UserError):
39-
mandate.back2draft()
38+
self.mandate.back2draft()
4039

4140
def test_mandate_03(self):
42-
bank_account = self.env.ref("account_payment_mode.res_partner_12_iban")
43-
mandate = self.env["account.banking.mandate"].create(
44-
{
45-
"partner_bank_id": bank_account.id,
46-
"signature_date": "2015-01-01",
47-
"company_id": self.company.id,
48-
}
49-
)
50-
mandate.validate()
51-
41+
self.mandate.validate()
5242
with self.assertRaises(UserError):
53-
mandate.validate()
43+
self.mandate.validate()
5444

5545
def test_mandate_04(self):
56-
bank_account = self.env.ref("account_payment_mode.res_partner_12_iban")
57-
mandate = self.env["account.banking.mandate"].create(
58-
{
59-
"partner_bank_id": bank_account.id,
60-
"signature_date": "2015-01-01",
61-
"company_id": self.company.id,
62-
}
63-
)
64-
mandate.validate()
65-
mandate.cancel()
46+
self.mandate.validate()
47+
self.mandate.cancel()
6648
with self.assertRaises(UserError):
67-
mandate.cancel()
49+
self.mandate.cancel()
6850

6951
def test_onchange_methods(self):
70-
bank_account = self.env.ref("account_payment_mode.res_partner_12_iban")
71-
mandate = self.env["account.banking.mandate"].new(
72-
{
73-
"partner_bank_id": bank_account.id,
74-
"signature_date": "2015-01-01",
75-
"company_id": self.company.id,
76-
}
77-
)
7852
bank_account_2 = self.env.ref("account_payment_mode.res_partner_2_iban")
79-
mandate.partner_bank_id = bank_account_2
80-
mandate.mandate_partner_bank_change()
81-
self.assertEqual(mandate.partner_id, bank_account_2.partner_id)
53+
self.mandate.partner_bank_id = bank_account_2
54+
self.mandate.mandate_partner_bank_change()
55+
self.assertEqual(self.mandate.partner_id, bank_account_2.partner_id)
8256

8357
def test_constrains_01(self):
84-
bank_account = self.env.ref("account_payment_mode.res_partner_12_iban")
85-
mandate = self.env["account.banking.mandate"].create(
86-
{
87-
"partner_bank_id": bank_account.id,
88-
"signature_date": "2015-01-01",
89-
"company_id": self.company.id,
90-
}
91-
)
92-
mandate.validate()
58+
self.mandate.validate()
9359
with self.assertRaises(ValidationError):
94-
mandate.signature_date = fields.Date.to_string(
95-
fields.Date.from_string(fields.Date.context_today(mandate))
60+
self.mandate.signature_date = fields.Date.to_string(
61+
fields.Date.from_string(fields.Date.context_today(self.mandate))
9662
+ timedelta(days=1)
9763
)
9864

9965
def test_constrains_02(self):
100-
bank_account = self.env.ref("account_payment_mode.res_partner_12_iban")
101-
mandate = self.env["account.banking.mandate"].create(
102-
{
103-
"partner_bank_id": bank_account.id,
104-
"signature_date": "2015-01-01",
105-
"company_id": self.company.id,
106-
}
107-
)
108-
10966
with self.assertRaises(UserError):
110-
mandate.company_id = self.company_2
67+
self.mandate.company_id = self.company_2
11168

11269
def test_constrains_03(self):
113-
bank_account = self.env.ref("account_payment_mode.res_partner_12_iban")
114-
mandate = self.env["account.banking.mandate"].create(
115-
{
116-
"partner_bank_id": bank_account.id,
117-
"signature_date": "2015-01-01",
118-
"company_id": self.company.id,
119-
}
120-
)
12170
bank_account_2 = self.env["res.partner.bank"].create(
12271
{
12372
"acc_number": "1234",
@@ -126,7 +75,7 @@ def test_constrains_03(self):
12675
}
12776
)
12877
with self.assertRaises(UserError):
129-
mandate.partner_bank_id = bank_account_2
78+
self.mandate.partner_bank_id = bank_account_2
13079

13180
def test_constrains_04(self):
13281
mandate = self.env["account.banking.mandate"].create(
@@ -140,7 +89,7 @@ def test_constrains_04(self):
14089
}
14190
)
14291
with self.assertRaises(UserError):
143-
bank_account.mandate_ids += mandate
92+
bank_account.write({"mandate_ids": [(6, 0, mandate.ids)]})
14493

14594
def test_mandate_reference_01(self):
14695
"""
@@ -222,12 +171,3 @@ def test_mandate_reference_06(self):
222171
}
223172
)
224173
self.assertTrue(mandate.unique_mandate_reference)
225-
226-
def setUp(self):
227-
res = super(TestMandate, self).setUp()
228-
# Company
229-
self.company = self.env.ref("base.main_company")
230-
231-
# Company 2
232-
self.company_2 = self.env["res.company"].create({"name": "Company 2"})
233-
return res

account_banking_mandate/views/bank_payment_line_view.xml

-34
This file was deleted.

0 commit comments

Comments
 (0)