4
4
5
5
from odoo import fields
6
6
from odoo .exceptions import UserError , ValidationError
7
- from odoo .tests . common import Form , tagged
7
+ from odoo .tests import Form , tagged
8
8
from odoo .tools import mute_logger
9
9
10
10
from odoo .addons .hr_expense .tests .common import TestExpenseCommon
13
13
@tagged ("-at_install" , "post_install" )
14
14
class TestHrExpenseAdvanceClearing (TestExpenseCommon ):
15
15
@classmethod
16
- def setUpClass (cls , chart_template_ref = None ):
17
- super ().setUpClass (chart_template_ref = chart_template_ref )
18
- advance_account = cls .company_data ["default_account_assets " ]
16
+ def setUpClass (cls ):
17
+ super ().setUpClass ()
18
+ advance_account = cls .company_data ["default_account_deferred_expense " ]
19
19
advance_account .reconcile = True
20
20
cls .emp_advance = cls .env .ref ("hr_expense_advance_clearing.product_emp_advance" )
21
21
cls .emp_advance .property_account_expense_id = advance_account
@@ -171,7 +171,7 @@ def test_1_clear_equal_advance(self):
171
171
# ------------------ Advance --------------------------
172
172
self .advance .action_submit_sheet ()
173
173
self .advance .action_approve_expense_sheets ()
174
- self .advance .action_sheet_move_create ()
174
+ self .advance .action_sheet_move_post ()
175
175
self .assertEqual (self .advance .clearing_residual , 1000.0 )
176
176
self ._register_payment (self .advance .account_move_ids , 1000.0 )
177
177
self .assertEqual (self .advance .state , "done" )
@@ -184,16 +184,16 @@ def test_1_clear_equal_advance(self):
184
184
self .assertEqual (self .clearing_equal .advance_sheet_residual , 1000.0 )
185
185
self .clearing_equal .action_submit_sheet ()
186
186
self .clearing_equal .action_approve_expense_sheets ()
187
- self .clearing_equal .action_sheet_move_create ()
187
+ self .clearing_equal .action_sheet_move_post ()
188
188
# Equal amount, state change to Paid and advance is cleared
189
189
self .assertEqual (self .clearing_equal .state , "done" )
190
190
self .assertEqual (self .clearing_equal .advance_sheet_residual , 0.0 )
191
191
# Clear this with previous advance is done
192
192
self .clearing_more .advance_sheet_id = self .advance
193
193
self .clearing_more .action_submit_sheet ()
194
- self . clearing_more . action_approve_expense_sheets ()
194
+ # Can't approved clearing, because advance residual is 0.0
195
195
with self .assertRaises (ValidationError ):
196
- self .clearing_more .action_sheet_move_create ()
196
+ self .clearing_more .action_approve_expense_sheets ()
197
197
# There are 2 clearing in advance
198
198
self .assertEqual (self .advance .clearing_count , 2 )
199
199
# Check link clearing in advance must be equal clearing count
@@ -221,7 +221,7 @@ def test_2_clear_more_than_advance(self):
221
221
# ------------------ Advance --------------------------
222
222
self .advance .action_submit_sheet ()
223
223
self .advance .action_approve_expense_sheets ()
224
- self .advance .action_sheet_move_create ()
224
+ self .advance .action_sheet_move_post ()
225
225
self .assertEqual (self .advance .clearing_residual , 1000.0 )
226
226
self ._register_payment (self .advance .account_move_ids , 1000.0 )
227
227
self .assertEqual (self .advance .state , "done" )
@@ -231,7 +231,7 @@ def test_2_clear_more_than_advance(self):
231
231
self .assertEqual (self .clearing_more .advance_sheet_residual , 1000.0 )
232
232
self .clearing_more .action_submit_sheet ()
233
233
self .clearing_more .action_approve_expense_sheets ()
234
- self .clearing_more .action_sheet_move_create ()
234
+ self .clearing_more .action_sheet_move_post ()
235
235
# More amount, state not changed to paid, and has to pay 200 more
236
236
self .assertEqual (self .clearing_more .state , "post" )
237
237
self .assertEqual (self .clearing_more .amount_payable , 200.0 )
@@ -244,13 +244,7 @@ def test_3_clear_less_than_advance(self):
244
244
# ------------------ Advance --------------------------
245
245
self .advance .action_submit_sheet ()
246
246
self .advance .action_approve_expense_sheets ()
247
- self .advance .action_sheet_move_create ()
248
- # Test return advance register payment with move state draft
249
- with self .assertRaises (UserError ):
250
- self .advance .account_move_ids .button_draft ()
251
- self ._register_payment (
252
- self .advance .account_move_ids , 200.0 , hr_return_advance = True
253
- )
247
+ self .advance .action_sheet_move_post ()
254
248
self .assertEqual (self .advance .clearing_residual , 1000.0 )
255
249
self ._register_payment (self .advance .account_move_ids , 1000.0 )
256
250
self .assertEqual (self .advance .state , "done" )
@@ -276,7 +270,7 @@ def test_3_clear_less_than_advance(self):
276
270
ctx = register_payment ["context" ],
277
271
hr_return_advance = True ,
278
272
)
279
- self .clearing_less .action_sheet_move_create ()
273
+ self .clearing_less .action_sheet_move_post ()
280
274
# Less amount, state set to done. Still remain 200 to be returned
281
275
self .assertEqual (self .clearing_less .state , "done" )
282
276
self .assertEqual (self .clearing_less .advance_sheet_residual , 200.0 )
@@ -301,7 +295,7 @@ def test_4_clearing_product_advance(self):
301
295
self .advance .expense_line_ids .clearing_product_id = self .product_a
302
296
self .advance .action_submit_sheet ()
303
297
self .advance .action_approve_expense_sheets ()
304
- self .advance .action_sheet_move_create ()
298
+ self .advance .action_sheet_move_post ()
305
299
self .assertEqual (self .advance .clearing_residual , 1000.0 )
306
300
self ._register_payment (self .advance .account_move_ids , 1000.0 )
307
301
self .assertEqual (self .advance .state , "done" )
0 commit comments