[FIX] purchase_stock: AVCO computation - support line discount

MANIFEST.in

@@ -1,6 +1,8 @@
 include requirements.txt
 include LICENSE
 include README.md
+include pyproject.toml
+include setup/pep517_odoo.py
 graft odoo
 recursive-exclude * *.py[co]
 recursive-exclude .git *

addons/product_expiry/models/stock_move_line.py

@@ -28,7 +28,7 @@ def _auto_init(self):
             create_column(self._cr, "stock_move_line", "expiration_date", "timestamp")
         return super()._auto_init()
 
-    @api.depends('product_id', 'picking_type_use_create_lots', 'lot_id.expiration_date')
+    @api.depends('product_id', 'lot_id.expiration_date')
     def _compute_expiration_date(self):
         for move_line in self:
             if move_line.lot_id.expiration_date:

addons/purchase_stock/models/stock_move.py

@@ -55,11 +55,14 @@ def _get_price_unit(self):
             invoiced_value = 0
             invoiced_qty = 0
             for invoice_line in line.sudo().invoice_lines:
-                if invoice_line.tax_ids:
-                    invoiced_value += invoice_line.tax_ids.with_context(round=False).compute_all(
-                        invoice_line.price_unit, currency=invoice_line.currency_id, quantity=invoice_line.quantity)['total_void']
-                else:
-                    invoiced_value += invoice_line.price_unit * invoice_line.quantity
+                # FIX je@bcim.be - Use discounted untaxed sub-total in price unit used for avco computation
+                # Current odoo computation is missing the line discount
+                invoiced_value += invoice_line.price_subtotal
+                # if invoice_line.tax_ids:
+                #     invoiced_value += invoice_line.tax_ids.with_context(round=False).compute_all(
+                #         invoice_line.price_unit, currency=invoice_line.currency_id, quantity=invoice_line.quantity)['total_void']
+                # else:
+                #     invoiced_value += invoice_line.price_unit * invoice_line.quantity
                 invoiced_qty += invoice_line.product_uom_id._compute_quantity(invoice_line.quantity, line.product_id.uom_id)
             # TODO currency check
             remaining_value = invoiced_value - receipt_value

addons/stock/models/product.py

@@ -556,7 +556,7 @@ def action_open_quants(self):
             )
         else:
             self = self.with_context(product_tmpl_ids=self.product_tmpl_id.ids)
-        action = self.env['stock.quant'].action_view_inventory()
+        action = self.with_context(quant_product_ids=self.ids).env['stock.quant'].action_view_inventory()
         # note that this action is used by different views w/varying customizations
         if not self.env.context.get('is_stock_report'):
             action['domain'] = [('product_id', 'in', self.ids)]

addons/stock/models/stock_quant.py

@@ -886,6 +886,12 @@ def _merge_quants(self):
                                 AND product_id in %s
             """
             params = [tuple(self.location_id.ids), tuple(self.product_id.ids)]
+        elif "quant_product_ids" in self.env.context:
+            query += """
+                            WHERE
+                                product_id in %s
+                """
+            params = [tuple(self.env.context['quant_product_ids'])]
         query += """
                             GROUP BY product_id, company_id, location_id, lot_id, package_id, owner_id
                             HAVING count(id) > 1