19.0 vanilla

odoo-bringout-oca-ocb-hr_expense/hr_expense/models/account_move_line.py

@@ -1,62 +1,42 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 from odoo import api, fields, models
-from odoo.tools.misc import frozendict
+from odoo.tools import SQL
 
 
 class AccountMoveLine(models.Model):
     _inherit = "account.move.line"
 
-    expense_id = fields.Many2one('hr.expense', string='Expense', copy=True)
+    expense_id = fields.Many2one('hr.expense', string='Expense', copy=True, index='btree_not_null')  # copy=True, else we don't know price is tax incl.
+
+    def _compute_partner_id(self):
+        # EXTENDS account to ensure the partner is correctly set on all the move lines, preventing wrong bank accounts on payments
+        expense_lines = self.filtered('move_id.expense_ids')  # Can't use expense_id because the payment terms line may not have it set
+        super(AccountMoveLine, self - expense_lines)._compute_partner_id()
+        for line in expense_lines:
+            line.partner_id = line.move_id.partner_id  # The employee partner is correctly set on the move
 
     @api.constrains('account_id', 'display_type')
     def _check_payable_receivable(self):
-        super(AccountMoveLine, self.filtered(lambda line: line.move_id.expense_sheet_id.payment_mode != 'company_account'))._check_payable_receivable()
-
-    def reconcile(self):
-        # OVERRIDE
-        not_paid_expenses = self.move_id.expense_sheet_id.expense_line_ids.filtered(lambda expense: expense.state != 'done')
-        res = super().reconcile()
-        # Do not update expense or expense sheet states when reversing journal entries
-        not_paid_expense_sheets = not_paid_expenses.sheet_id.filtered(lambda sheet: sheet.account_move_id.payment_state != 'reversed')
-        paid_expenses = not_paid_expenses.filtered(lambda expense: expense.currency_id.is_zero(expense.amount_residual))
-        paid_expenses.write({'state': 'done'})
-        not_paid_expense_sheets.filtered(lambda sheet: all(expense.state == 'done' for expense in sheet.expense_line_ids)).set_to_paid()
-        return res
+        super(AccountMoveLine, self.filtered(lambda line: line.expense_id.payment_mode != 'company_account'))._check_payable_receivable()
 
     def _get_attachment_domains(self):
         attachment_domains = super(AccountMoveLine, self)._get_attachment_domains()
         if self.expense_id:
-            attachment_domains.append([('res_model', '=', 'hr.expense'), ('res_id', '=', self.expense_id.id)])
+            attachment_domains.append([('res_model', '=', 'hr.expense'), ('res_id', 'in', self.expense_id.ids)])
         return attachment_domains
 
-    def _compute_tax_key(self):
-        super()._compute_tax_key()
-        for line in self:
-            if line.expense_id:
-                line.tax_key = frozendict(**line.tax_key, expense_id=line.expense_id.id)
-
-    def _compute_all_tax(self):
-        expense_lines = self.filtered('expense_id')
-        super(AccountMoveLine, expense_lines.with_context(force_price_include=True))._compute_all_tax()
-        super(AccountMoveLine, self - expense_lines)._compute_all_tax()
-        for line in expense_lines:
-            for key in list(line.compute_all_tax.keys()):
-                new_key = frozendict(**key, expense_id=line.expense_id.id)
-                line.compute_all_tax[new_key] = line.compute_all_tax.pop(key)
+    @api.model
+    def _get_attachment_by_record(self, id_model2attachments, move_line):
+        return (
+            super()._get_attachment_by_record(id_model2attachments, move_line)
+            or id_model2attachments.get(('hr.expense', move_line.expense_id.id))
+        )
 
     def _compute_totals(self):
         expenses = self.filtered('expense_id')
         super(AccountMoveLine, expenses.with_context(force_price_include=True))._compute_totals()
         super(AccountMoveLine, self - expenses)._compute_totals()
 
-    def _convert_to_tax_base_line_dict(self):
-        result = super()._convert_to_tax_base_line_dict()
-        if self.expense_id:
-            result.setdefault('extra_context', {})
-            result['extra_context']['force_price_include'] = True
-        return result
-
-    def _get_extra_query_base_tax_line_mapping(self):
-        return ' AND (base_line.expense_id IS NULL OR account_move_line.expense_id = base_line.expense_id)'
+    def _get_extra_query_base_tax_line_mapping(self) -> SQL:
+        return SQL(' AND (base_line.expense_id IS NULL OR account_move_line.expense_id = base_line.expense_id)')