From 9b8b61ff47b1b2bff38ec1973b1babbfcc120395 Mon Sep 17 00:00:00 2001 From: Mazen Abdo Date: Mon, 30 Sep 2024 12:22:03 +0300 Subject: [PATCH] fix button action budget --- odex25_accounting/exp_budget_check/models/hr_expense.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/odex25_accounting/exp_budget_check/models/hr_expense.py b/odex25_accounting/exp_budget_check/models/hr_expense.py index 66bb37827..a24d1ac9c 100644 --- a/odex25_accounting/exp_budget_check/models/hr_expense.py +++ b/odex25_accounting/exp_budget_check/models/hr_expense.py @@ -14,7 +14,7 @@ class BudgetConfirmationCustom(models.Model): if self.expense_id and self.type == 'expense': self.expense_id.write({'state': 'draft'}) self.expense_id.message_post(body=_( - "Rejected By : %s With Reject Reason : %s" % (str(self.env.user.name), str(self.reject_reason)))) + "Rejected By : %s With Reject Reason : %s" % (str(self.env.user.name), str(self.reject_reason or self.env.context.get('reject_reason',''))))) def done(self): super(BudgetConfirmationCustom, self).done() @@ -149,9 +149,11 @@ class AccountMove(models.Model): else: budget_line = budget_lines[0] remain = abs(budget_line.remain) - amount = self.total_amount + tax_id = self.tax_ids[0].analytic if self.tax_ids else False + price_before_tax= self.unit_amount* self.quantity + tax_price = self.total_amount - price_before_tax + amount = price_before_tax + (tax_price if tax_id else 0) new_remain = remain - amount - data = { 'name': _('Expense: %s') % self.employee_id.name, 'date': self.date,