Skip to content

Commit

Permalink
Merge PR #199 into 15.0
Browse files Browse the repository at this point in the history
Signed-off-by Saran440
  • Loading branch information
OCA-git-bot committed Sep 18, 2023
2 parents 03d4fd2 + 71daaf0 commit d6f39c2
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 89 deletions.
5 changes: 0 additions & 5 deletions hr_expense_cancel/tests/test_hr_expense_cancel.py
Original file line number Diff line number Diff line change
Expand Up @@ -98,13 +98,8 @@ def test_action_cancel_no_update_posted(self):
def test_action_cancel_company_account(self):
self.expense.payment_mode = "company_account"
self.expense_sheet.action_sheet_move_create()

self.assertEqual(len(self.expense_sheet.payment_ids), 1)
self.assertTrue(self.expense_sheet.account_move_id)

self.expense_sheet.action_cancel()
payment = self.expense_sheet.payment_ids.filtered(lambda l: l.state != "cancel")
self.assertFalse(payment)
self.assertFalse(self.expense_sheet.account_move_id)

def test_action_cancel_own_account(self):
Expand Down
1 change: 0 additions & 1 deletion hr_expense_payment/models/__init__.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).

from . import account_payment
from . import hr_expense
from . import hr_expense_sheet
68 changes: 0 additions & 68 deletions hr_expense_payment/models/hr_expense.py

This file was deleted.

15 changes: 0 additions & 15 deletions hr_expense_payment/tests/test_hr_expense_payment.py
Original file line number Diff line number Diff line change
Expand Up @@ -83,18 +83,3 @@ def test_get_payment_vals(self):
self.assertFalse(self.expense_sheet.payment_ids)
payment_wizard.action_create_payments()
self.assertEqual(len(self.expense_sheet.payment_ids), 1)

def test_action_sheet_move_create(self):
self.expense.payment_mode = "company_account"
self.assertFalse(self.expense_sheet.payment_ids)
self.expense_sheet.action_sheet_move_create()
self.assertEqual(len(self.expense_sheet.payment_ids), 1)

def test_action_sheet_move_create_skip_payment(self):
self.expense.payment_mode = "company_account"
self.assertFalse(self.expense_sheet.payment_ids)
self.expense_sheet.with_context(
skip_create_payment_company_account=True
).action_sheet_move_create()
self.assertFalse(self.expense_sheet.payment_ids)
self.assertEqual(self.expense_sheet.state, "done")

0 comments on commit d6f39c2

Please sign in to comment.