@@ -14,7 +14,7 @@ def setUpClass(cls):
1414 super ().setUpClass ()
1515 cls .env = cls .env (context = dict (cls .env .context , ** DISABLED_MAIL_CONTEXT ))
1616
17- def create_sale_order (self , payment_mode = None ):
17+ def create_sale_order (self , payment_method_line = None ):
1818 with Form (self .env ["sale.order" ]) as sale_form :
1919 sale_form .partner_id = self .base_partner
2020 for _ , p in self .products .items ():
@@ -26,62 +26,65 @@ def create_sale_order(self, payment_mode=None):
2626 order_line .price_unit = p .list_price
2727 sale = sale_form .save ()
2828 self .assertEqual (
29- sale .payment_mode_id , self .base_partner .customer_payment_mode_id
29+ sale .payment_method_line_id ,
30+ self .base_partner .property_inbound_payment_method_line_id ,
3031 )
3132 sale_form = Form (sale )
3233
3334 # force payment mode
34- if payment_mode :
35- sale_form .payment_mode_id = payment_mode
35+ if payment_method_line :
36+ sale_form .payment_method_line_id = payment_method_line
3637 return sale_form .save ()
3738
3839 def create_invoice_and_check (
39- self , order , expected_payment_mode , expected_partner_bank
40+ self , order , expected_payment_method_line , expected_partner_bank
4041 ):
4142 order .action_confirm ()
4243 order ._create_invoices ()
4344 invoice = order .invoice_ids
4445 self .assertEqual (len (invoice ), 1 )
45- self .assertEqual (invoice .payment_mode_id , expected_payment_mode )
46+ self .assertEqual (
47+ invoice .preferred_payment_method_line_id , expected_payment_method_line
48+ )
4649 self .assertEqual (invoice .partner_bank_id , expected_partner_bank )
4750
48- def test_sale_to_invoice_payment_mode (self ):
51+ def test_sale_to_invoice_payment_method_line (self ):
4952 """
5053 Data:
51- A partner with a specific payment_mode
52- A sale order created with the payment_mode of the partner
54+ A partner with a specific payment_method_line
55+ A sale order created with the payment_method_line of the partner
5356 Test case:
5457 Create the invoice from the sale order
5558 Expected result:
56- The invoice must be created with the payment_mode of the partner
59+ The invoice must be created with the payment_method_line of the partner
5760 """
5861 order = self .create_sale_order ()
59- self .create_invoice_and_check (order , self .payment_mode , self .bank )
62+ self .create_invoice_and_check (order , self .payment_method_line , self .bank )
6063
61- def test_sale_to_invoice_payment_mode_2 (self ):
64+ def test_sale_to_invoice_payment_method_line_2 (self ):
6265 """
6366 Data:
64- A partner with a specific payment_mode
65- A sale order created with an other payment_mode
67+ A partner with a specific payment_method_line
68+ A sale order created with an other payment_method_line
6669 Test case:
6770 Create the invoice from the sale order
6871 Expected result:
69- The invoice must be created with the specific payment_mode
72+ The invoice must be created with the specific payment_method_line
7073 """
71- order = self .create_sale_order (payment_mode = self .payment_mode_2 )
72- self .create_invoice_and_check (order , self .payment_mode_2 , self .bank )
74+ order = self .create_sale_order (payment_method_line = self .payment_method_line_2 )
75+ self .create_invoice_and_check (order , self .payment_method_line_2 , self .bank )
7376
74- def test_sale_to_invoice_payment_mode_via_payment (self ):
77+ def test_sale_to_invoice_payment_method_line_via_payment (self ):
7578 """
7679 Data:
77- A partner with a specific payment_mode
78- A sale order created with an other payment_mode
80+ A partner with a specific payment_method_line
81+ A sale order created with an other payment_method_line
7982 Test case:
8083 Create the invoice from sale.advance.payment.inv
8184 Expected result:
82- The invoice must be created with the specific payment_mode
85+ The invoice must be created with the specific payment_method_line
8386 """
84- order = self .create_sale_order (payment_mode = self .payment_mode_2 )
87+ order = self .create_sale_order (payment_method_line = self .payment_method_line_2 )
8588 context = {
8689 "active_model" : "sale.order" ,
8790 "active_ids" : [order .id ],
@@ -92,30 +95,33 @@ def test_sale_to_invoice_payment_mode_via_payment(self):
9295 {
9396 "advance_payment_method" : "fixed" ,
9497 "fixed_amount" : 5 ,
95- "product_id" : self .env .ref ("sale.advance_product_0" ).id ,
9698 "sale_order_ids" : order ,
9799 }
98100 )
99101 payment .with_context (** context ).create_invoices ()
100102 invoice = order .invoice_ids
101103 self .assertEqual (len (invoice ), 1 )
102- self .assertEqual (invoice .payment_mode_id , self .payment_mode_2 )
103- self .assertFalse (invoice .partner_bank_id )
104+ self .assertEqual (
105+ invoice .preferred_payment_method_line_id , self .payment_method_line_2
106+ )
107+ self .assertEqual (
108+ invoice .partner_bank_id ,
109+ self .payment_method_line_2 .journal_id .bank_account_id ,
110+ )
104111
105- def test_several_sale_to_invoice_payment_mode (self ):
112+ def test_several_sale_to_invoice_payment_method_line (self ):
106113 """
107114 Data:
108- A partner with a specific payment_mode
109- A sale order created with the payment_mode of the partner
115+ A partner with a specific payment_method_line
116+ A sale order created with the payment_method_line of the partner
110117 A sale order created with another payment mode
111118 Test case:
112119 Create the invoice from the sale orders
113120 Expected result:
114121 Two invoices should be generated
115122 """
116- payment_mode_2 = self .env .ref ("account_payment_mode.payment_mode_outbound_dd1" )
117123 order_1 = self .create_sale_order ()
118- order_2 = self .create_sale_order (payment_mode_2 )
124+ order_2 = self .create_sale_order (self . payment_method_line_2 )
119125 orders = order_1 | order_2
120126 orders .action_confirm ()
121127 invoices = orders ._create_invoices ()
0 commit comments