Merge branch 'production' into unreserved_permission

# Conflicts:
#	indoteknik_custom/models/sale_order.py

1 files changed, 11 insertions, 0 deletions

diff --git a/indoteknik_custom/models/purchase_order.py b/indoteknik_custom/models/purchase_order.py
index edcbbb19..8a47482a 100755
--- a/indoteknik_custom/models/purchase_order.py
+++ b/indoteknik_custom/models/purchase_order.py
@@ -69,6 +69,17 @@ class PurchaseOrder(models.Model):
     date_done_picking = fields.Datetime(string='Date Done Picking', compute='get_date_done')
     bills_dp_id = fields.Many2one('account.move', string='Bills DP')
     grand_total = fields.Monetary(string='Grand Total', help='Amount total + amount delivery', compute='_compute_grand_total')
+    total_margin_match = fields.Float(string='Total Margin Match', compute='_compute_total_margin_match')
+
+    def _compute_total_margin_match(self):
+        for purchase in self:
+            match = self.env['purchase.order.sales.match']
+            result = match.read_group(
+                [('purchase_order_id', '=', purchase.id)],
+                ['margin_item'],
+                []
+            )
+            purchase.total_margin_match = result[0].get('margin_item', 0.0)
     
     def _compute_grand_total(self):
         for order in self: