Merged in cashback_brand (pull request #489)

<hafid> coba margin po last

3 files changed, 25 insertions, 2 deletions

diff --git a/indoteknik_custom/models/purchase_order.py b/indoteknik_custom/models/purchase_order.py
index e16c8d61..6b6e6aa2 100755
--- a/indoteknik_custom/models/purchase_order.py
+++ b/indoteknik_custom/models/purchase_order.py
@@ -53,6 +53,9 @@ class PurchaseOrder(models.Model):
     total_so_percent_margin = fields.Float(
         'SO Margin%', compute='compute_total_margin',
         help="Total % Margin in Sales Order Header")
+    amount_cashback = fields.Float(
+        'Cashback', compute='compute_total_margin',
+        help="Total Cashback brand Altama")
     amount_total_without_service = fields.Float('AmtTotalWithoutService', compute='compute_amt_total_without_service')
     summary_qty_po = fields.Float('Total Qty', compute='_compute_summary_qty')
     summary_qty_receipt = fields.Float('Summary Qty Receipt', compute='_compute_summary_qty')
@@ -1407,19 +1410,29 @@ class PurchaseOrder(models.Model):
                 purchase_price += line.delivery_amt_line
             if line.order_id.delivery_amt > 0:
                 purchase_price += line.order_id.delivery_amt
+
+            cashback_amount = 0.0
+            if self.partner_id.id == 5571:
+                cashback_percent = line.product_id.x_manufacture.cashback_percent or 0.0
+                if cashback_percent > 0:
+                    cashback_amount = purchase_price * cashback_percent
+                    purchase_price -= cashback_amount
+
             real_item_margin = sales_price - purchase_price
             sum_margin += real_item_margin
 
-        if sum_so_margin != 0 and sum_sales_price != 0 and sum_margin != 0:
+        if sum_so_margin != 0 and sum_sales_price != 0 and sum_margin != 0 and cashback_amount  != 0:
             self.total_so_margin = sum_so_margin
             self.total_so_percent_margin = round((sum_so_margin / sum_sales_price), 2) * 100
             self.total_margin = sum_margin
             self.total_percent_margin = round((sum_margin / sum_sales_price), 2) * 100
+            self.amount_cashback = cashback_amount
         else:
             self.total_margin = 0
             self.total_percent_margin = 0
             self.total_so_margin = 0
             self.total_so_percent_margin = 0
+            self.amount_cashback = 0
 
     def compute_total_margin_from_apo(self):
         sum_so_margin = sum_sales_price = sum_margin = 0
@@ -1458,6 +1471,13 @@ class PurchaseOrder(models.Model):
                     purchase_price += (po_line.delivery_amt_line / po_line.product_qty) * qty_po
                 if line.purchase_order_id.delivery_amt > 0:
                     purchase_price += line.purchase_order_id.delivery_amt
+                    
+            cashback_amount = 0.0
+            if self.partner_id.id == 5571:
+                cashback_percent = line.product_id.x_manufacture.cashback_percent or 0.0
+                if cashback_percent > 0:
+                    cashback_amount = purchase_price * cashback_percent
+                    purchase_price -= cashback_amount
 
                 real_item_margin = sales_price - purchase_price
                 sum_margin += real_item_margin
@@ -1468,9 +1488,11 @@ class PurchaseOrder(models.Model):
             self.total_so_percent_margin = round((sum_so_margin / sum_sales_price), 2) * 100
             self.total_margin = sum_margin
             self.total_percent_margin = round((sum_margin / sum_sales_price), 2) * 100
+            self.amount_cashback = cashback_amount
         else:
             self.total_margin = self.total_percent_margin = 0
             self.total_so_margin = self.total_so_percent_margin = 0
+            self.amount_cashback = 0
 
 
     def compute_amt_total_without_service(self):
diff --git a/indoteknik_custom/models/refund_sale_order.py b/indoteknik_custom/models/refund_sale_order.py
index 79309694..4c3ca52e 100644
--- a/indoteknik_custom/models/refund_sale_order.py
+++ b/indoteknik_custom/models/refund_sale_order.py
@@ -624,7 +624,7 @@ class RefundSaleOrder(models.Model):
         for rec in self:
             move_links = []
 
-            invoice_ids = rec.sale_order_ids.mapped('invoice_ids')
+            invoice_ids = rec.sale_order_ids.mapped('invoice_ids').filtered(lambda m: m.state == 'posted')
 
             moves = self.env['account.move'].search([
                 ('sale_id', 'in', rec.sale_order_ids.ids),
diff --git a/indoteknik_custom/views/purchase_order.xml b/indoteknik_custom/views/purchase_order.xml
index 16b8bd44..59e317d2 100755
--- a/indoteknik_custom/views/purchase_order.xml
+++ b/indoteknik_custom/views/purchase_order.xml
@@ -105,6 +105,7 @@
                 <field name="amount_total" position="after">
                     <field name="total_margin"/>
                     <field name="total_so_margin"/>
+                    <field name="amount_cashback"/>
                     <field name="total_percent_margin"/>
                     <field name="total_so_percent_margin"/>
                 </field>