Merged in cashback_brand (pull request #487)

<hafid> fix margin po 2

4 files changed, 18 insertions, 4 deletions

diff --git a/indoteknik_custom/models/purchase_order.py b/indoteknik_custom/models/purchase_order.py
index e16c8d61..ebe0ae65 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,6 +1410,14 @@ 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
 
@@ -1415,11 +1426,13 @@ 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 = 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
diff --git a/indoteknik_custom/models/refund_sale_order.py b/indoteknik_custom/models/refund_sale_order.py
index 627a6fdd..79309694 100644
--- a/indoteknik_custom/models/refund_sale_order.py
+++ b/indoteknik_custom/models/refund_sale_order.py
@@ -243,7 +243,7 @@ class RefundSaleOrder(models.Model):
                                 )
 
                 invoices = sale_orders.mapped('invoice_ids').filtered(
-                    lambda inv: inv.move_type in ['out_invoice', 'out_refund'] and inv.payment_state == 'paid'
+                    lambda inv: inv.move_type in ['out_invoice', 'out_refund'] and inv.state == 'posted'
                 )
                 if invoices:
                     vals['invoice_ids'] = [(6, 0, invoices.ids)]
@@ -497,7 +497,7 @@ class RefundSaleOrder(models.Model):
 
 
                 valid_invoices = sale_orders.mapped('invoice_ids').filtered(
-                    lambda inv: inv.move_type in ['out_invoice', 'out_refund'] and inv.payment_state == 'paid'
+                    lambda inv: inv.move_type in ['out_invoice', 'out_refund'] and inv.state == 'posted'
                 )
                 vals['invoice_ids'] = [(6, 0, valid_invoices.ids)]
                 vals['ongkir'] = sum(so.delivery_amt or 0.0 for so in sale_orders)
@@ -731,7 +731,7 @@ class RefundSaleOrder(models.Model):
         for so in self.sale_order_ids:
             self.ongkir += so.delivery_amt or 0.0
             valid_invoices = so.invoice_ids.filtered(
-                lambda inv: inv.move_type in ['out_invoice', 'out_refund'] and inv.payment_state == 'paid'
+                lambda inv: inv.move_type in ['out_invoice', 'out_refund'] and inv.state == 'posted'
             )
             all_invoices |= valid_invoices
             total_invoice += sum(valid_invoices.mapped('amount_total_signed'))
diff --git a/indoteknik_custom/models/sale_order.py b/indoteknik_custom/models/sale_order.py
index 469509d4..a4bc2309 100755
--- a/indoteknik_custom/models/sale_order.py
+++ b/indoteknik_custom/models/sale_order.py
@@ -3438,7 +3438,7 @@ class SaleOrder(models.Model):
     def button_refund(self):
         self.ensure_one()
         
-        invoice_ids = self.invoice_ids.filtered(lambda inv: inv.payment_state == 'paid')
+        invoice_ids = self.invoice_ids.filtered(lambda inv: inv.state == 'posted')
 
         moves = self.env['account.move'].search([
             ('sale_id', '=', self.id),
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>