[IMP] account_cutoff_accrual_*

Add support for service products

account_cutoff_accrual_order_base/models/order_line_mixin.py

@@ -72,9 +72,18 @@ def _get_cutoff_accrual_line_delivered_after(self, cutoff):
         """Return order lines"""
         return self.browse()
 
-    def _get_cutoff_accrual_delivered_quantity(self, cutoff):
+    def _get_cutoff_accrual_delivered_service_quantity(self, cutoff):
+        return NotImplemented()
+
+    def _get_cutoff_accrual_delivered_stock_quantity(self, cutoff):
         return NotImplemented()
 
+    def _get_cutoff_accrual_delivered_quantity(self, cutoff):
+        self.ensure_one()
+        if self.product_id.detailed_type == "service":
+            return self._get_cutoff_accrual_delivered_service_quantity(cutoff)
+        return self._get_cutoff_accrual_delivered_stock_quantity(cutoff)
+
     def _get_cutoff_accrual_lines_delivered_after(self, cutoff):
         return self.browse()
 

account_cutoff_accrual_purchase/models/purchase_order_line.py

@@ -58,6 +58,12 @@ def _get_cutoff_accrual_lines_invoiced_after(self, cutoff):
         purchases = self.env["purchase.order"].browse(purchase_ids)
         return purchases.order_line
 
-    def _get_cutoff_accrual_delivered_quantity(self, cutoff):
+    def _get_cutoff_accrual_delivered_service_quantity(self, cutoff):
+        # By default, no cutoff on purchase. Set received as invoiced.
         self.ensure_one()
-        return self.qty_received
+        return self._get_cutoff_accrual_invoiced_quantity(cutoff)
+
+    def _get_cutoff_accrual_delivered_stock_quantity(self, cutoff):
+        # By default, no cutoff on purchase. Set received as invoiced.
+        self.ensure_one()
+        return self._get_cutoff_accrual_invoiced_quantity(cutoff)

account_cutoff_accrual_purchase_stock/models/purchase_order_line.py

@@ -38,9 +38,9 @@ def _get_cutoff_accrual_delivered_min_date(self):
             return
         return min(stock_moves.mapped("date")).date()
 
-    def _get_cutoff_accrual_delivered_quantity(self, cutoff):
+    def _get_cutoff_accrual_delivered_stock_quantity(self, cutoff):
         self.ensure_one()
-        received_qty = super()._get_cutoff_accrual_delivered_quantity(cutoff)
+        received_qty = self.qty_received
         # The quantity received on the PO line must be deducted from all
         # moves done after the cutoff date.
         cutoff_nextday = cutoff._nextday_start_dt()

account_cutoff_accrual_sale/models/sale_order_line.py

@@ -64,6 +64,14 @@ def _get_cutoff_accrual_lines_invoiced_after(self, cutoff):
         sales = self.env["sale.order"].browse(sale_ids)
         return sales.order_line
 
-    def _get_cutoff_accrual_delivered_quantity(self, cutoff):
+    def _get_cutoff_accrual_delivered_service_quantity(self, cutoff):
         self.ensure_one()
+        if self.product_id.invoice_policy == "order":
+            return self.product_uom_qty
+        return self.qty_delivered
+
+    def _get_cutoff_accrual_delivered_stock_quantity(self, cutoff):
+        self.ensure_one()
+        if self.product_id.invoice_policy == "order":
+            return self.product_uom_qty
         return self.qty_delivered

account_cutoff_accrual_sale_stock/models/sale_order_line.py

@@ -37,9 +37,9 @@ def _get_cutoff_accrual_delivered_min_date(self):
             return
         return min(stock_moves.mapped("date")).date()
 
-    def _get_cutoff_accrual_delivered_quantity(self, cutoff):
+    def _get_cutoff_accrual_delivered_stock_quantity(self, cutoff):
         self.ensure_one()
-        delivered_qty = super()._get_cutoff_accrual_delivered_quantity(cutoff)
+        delivered_qty = self.qty_delivered
         # The quantity delivered on the SO line must be deducted from all
         # moves done after the cutoff date.
         cutoff_nextday = cutoff._nextday_start_dt()