@@ -58,7 +58,7 @@ def _create_expense(
58
58
expense .employee_id = employee
59
59
if not advance :
60
60
expense .product_id = product
61
- expense .total_amount = amount
61
+ expense .total_amount_currency = amount
62
62
expense .payment_mode = payment_mode
63
63
expense = expense .save ()
64
64
expense .tax_ids = False # Test no vat
@@ -170,10 +170,10 @@ def test_1_clear_equal_advance(self):
170
170
"""When clear equal advance, all set"""
171
171
# ------------------ Advance --------------------------
172
172
self .advance .action_submit_sheet ()
173
- self .advance .approve_expense_sheets ()
173
+ self .advance .action_approve_expense_sheets ()
174
174
self .advance .action_sheet_move_create ()
175
175
self .assertEqual (self .advance .clearing_residual , 1000.0 )
176
- self ._register_payment (self .advance .account_move_id , 1000.0 )
176
+ self ._register_payment (self .advance .account_move_ids , 1000.0 )
177
177
self .assertEqual (self .advance .state , "done" )
178
178
# ------------------ Clearing --------------------------
179
179
# Clear this with previous advance
@@ -183,15 +183,15 @@ def test_1_clear_equal_advance(self):
183
183
self .clearing_equal .advance_sheet_id = self .advance
184
184
self .assertEqual (self .clearing_equal .advance_sheet_residual , 1000.0 )
185
185
self .clearing_equal .action_submit_sheet ()
186
- self .clearing_equal .approve_expense_sheets ()
186
+ self .clearing_equal .action_approve_expense_sheets ()
187
187
self .clearing_equal .action_sheet_move_create ()
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 .approve_expense_sheets ()
194
+ self .clearing_more .action_approve_expense_sheets ()
195
195
with self .assertRaises (ValidationError ):
196
196
self .clearing_more .action_sheet_move_create ()
197
197
# There are 2 clearing in advance
@@ -209,57 +209,57 @@ def test_1_clear_equal_advance(self):
209
209
)
210
210
# Check back state move in advance after create clearing
211
211
with self .assertRaises (UserError ):
212
- self .advance .account_move_id .button_draft ()
212
+ self .advance .account_move_ids .button_draft ()
213
213
with self .assertRaises (UserError ):
214
- self .advance .account_move_id .button_cancel ()
214
+ self .advance .account_move_ids .button_cancel ()
215
215
with self .assertRaises (UserError ):
216
- self .advance .account_move_id ._reverse_moves ()
216
+ self .advance .account_move_ids ._reverse_moves ()
217
217
218
218
@mute_logger ("odoo.models.unlink" )
219
219
def test_2_clear_more_than_advance (self ):
220
220
"""When clear more than advance, do pay more"""
221
221
# ------------------ Advance --------------------------
222
222
self .advance .action_submit_sheet ()
223
- self .advance .approve_expense_sheets ()
223
+ self .advance .action_approve_expense_sheets ()
224
224
self .advance .action_sheet_move_create ()
225
225
self .assertEqual (self .advance .clearing_residual , 1000.0 )
226
- self ._register_payment (self .advance .account_move_id , 1000.0 )
226
+ self ._register_payment (self .advance .account_move_ids , 1000.0 )
227
227
self .assertEqual (self .advance .state , "done" )
228
228
# ------------------ Clearing --------------------------
229
229
# Clear this with previous advance
230
230
self .clearing_more .advance_sheet_id = self .advance
231
231
self .assertEqual (self .clearing_more .advance_sheet_residual , 1000.0 )
232
232
self .clearing_more .action_submit_sheet ()
233
- self .clearing_more .approve_expense_sheets ()
233
+ self .clearing_more .action_approve_expense_sheets ()
234
234
self .clearing_more .action_sheet_move_create ()
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 )
238
- self ._register_payment (self .clearing_more .account_move_id , 200.0 )
238
+ self ._register_payment (self .clearing_more .account_move_ids , 200.0 )
239
239
self .assertEqual (self .clearing_more .state , "done" )
240
240
241
241
@mute_logger ("odoo.models.unlink" )
242
242
def test_3_clear_less_than_advance (self ):
243
243
"""When clear less than advance, do return advance"""
244
244
# ------------------ Advance --------------------------
245
245
self .advance .action_submit_sheet ()
246
- self .advance .approve_expense_sheets ()
246
+ self .advance .action_approve_expense_sheets ()
247
247
self .advance .action_sheet_move_create ()
248
248
# Test return advance register payment with move state draft
249
249
with self .assertRaises (UserError ):
250
- self .advance .account_move_id .button_draft ()
250
+ self .advance .account_move_ids .button_draft ()
251
251
self ._register_payment (
252
- self .advance .account_move_id , 200.0 , hr_return_advance = True
252
+ self .advance .account_move_ids , 200.0 , hr_return_advance = True
253
253
)
254
254
self .assertEqual (self .advance .clearing_residual , 1000.0 )
255
- self ._register_payment (self .advance .account_move_id , 1000.0 )
255
+ self ._register_payment (self .advance .account_move_ids , 1000.0 )
256
256
self .assertEqual (self .advance .state , "done" )
257
257
# ------------------ Clearing, Return Advance --------------------------
258
258
# Clear this with previous advance
259
259
self .clearing_less .advance_sheet_id = self .advance
260
260
self .assertEqual (self .clearing_less .advance_sheet_residual , 1000.0 )
261
261
self .clearing_less .action_submit_sheet ()
262
- self .clearing_less .approve_expense_sheets ()
262
+ self .clearing_less .action_approve_expense_sheets ()
263
263
register_payment = self .advance .with_context (
264
264
hr_return_advance = True
265
265
).action_register_payment ()
@@ -271,7 +271,7 @@ def test_3_clear_less_than_advance(self):
271
271
# Test return advance over residual
272
272
with self .assertRaises (UserError ):
273
273
self ._register_payment (
274
- self .advance .account_move_id ,
274
+ self .advance .account_move_ids ,
275
275
300.0 ,
276
276
ctx = register_payment ["context" ],
277
277
hr_return_advance = True ,
@@ -282,7 +282,7 @@ def test_3_clear_less_than_advance(self):
282
282
self .assertEqual (self .clearing_less .advance_sheet_residual , 200.0 )
283
283
# Back to advance and do return advance, clearing residual become 0.0
284
284
self ._register_payment (
285
- self .advance .account_move_id ,
285
+ self .advance .account_move_ids ,
286
286
200.0 ,
287
287
ctx = register_payment ["context" ],
288
288
hr_return_advance = True ,
@@ -300,10 +300,10 @@ def test_4_clearing_product_advance(self):
300
300
# ------------------ Advance --------------------------
301
301
self .advance .expense_line_ids .clearing_product_id = self .product_a
302
302
self .advance .action_submit_sheet ()
303
- self .advance .approve_expense_sheets ()
303
+ self .advance .action_approve_expense_sheets ()
304
304
self .advance .action_sheet_move_create ()
305
305
self .assertEqual (self .advance .clearing_residual , 1000.0 )
306
- self ._register_payment (self .advance .account_move_id , 1000.0 )
306
+ self ._register_payment (self .advance .account_move_ids , 1000.0 )
307
307
self .assertEqual (self .advance .state , "done" )
308
308
# ------------------ Clearing --------------------------
309
309
with Form (self .env ["hr.expense.sheet" ]) as sheet :
@@ -314,10 +314,10 @@ def test_4_clearing_product_advance(self):
314
314
self .assertEqual (len (ex_sheet .expense_line_ids ), 0 )
315
315
ex_sheet ._onchange_advance_sheet_id ()
316
316
self .assertEqual (len (ex_sheet .expense_line_ids ), 1 )
317
- reverse_move = self .advance .account_move_id ._reverse_moves (
317
+ reverse_move = self .advance .account_move_ids ._reverse_moves (
318
318
default_values_list = [
319
- {"invoice_date" : self .advance .account_move_id .date , "ref" : False }
319
+ {"invoice_date" : self .advance .account_move_ids .date , "ref" : False }
320
320
],
321
321
cancel = True ,
322
322
)
323
- self .assertNotEqual (reverse_move , self .advance .account_move_id )
323
+ self .assertNotEqual (reverse_move , self .advance .account_move_ids )
0 commit comments