Merge branch 'odoo-backup' of bitbucket.org:altafixco/indoteknik-addons into odoo-backup

merge

3 files changed, 56 insertions, 2 deletions

diff --git a/indoteknik_custom/models/purchase_order_line.py b/indoteknik_custom/models/purchase_order_line.py
index 8c72887d..76dcc09e 100755
--- a/indoteknik_custom/models/purchase_order_line.py
+++ b/indoteknik_custom/models/purchase_order_line.py
@@ -23,6 +23,9 @@ class PurchaseOrderLine(models.Model):
     so_item_percent_margin = fields.Float(
         'SO Margin%', compute='compute_item_margin',
         help="Total % Margin in Sales Order Header")
+    amount_cashback = fields.Float(
+        'SO Margin%', compute='_compute_cashback_brand',
+        help="Total % Margin in Sales Order Header")
     delivery_amt_line = fields.Float('DeliveryAmtLine', compute='compute_delivery_amt_line')
     line_no = fields.Integer('No', default=0)
     qty_available = fields.Float('Qty Available', compute='_compute_qty_stock')
@@ -373,6 +376,9 @@ class PurchaseOrderLine(models.Model):
             purchase_price = line.price_subtotal
             if order.delivery_amount > 0:
                 purchase_price += line.delivery_amt_line
+
+            if line.amount_cashback > 0:
+                purchase_price = purchase_price - line.amount_cashback
             
             # Hitung margin dan persentase margin
             real_item_margin = total_sales_price - purchase_price
@@ -384,6 +390,46 @@ class PurchaseOrderLine(models.Model):
             
             sum_margin += real_item_margin
 
+    def _compute_cashback_brand(self):
+        start_date = datetime(2026, 2, 1, 0, 0, 0)
+
+        for line in self:
+            line.amount_cashback = 0.0
+
+            product = line.product_id
+            order = line.order_id
+
+            if not product or not order:
+                continue
+
+            if order.partner_id.id != 5571:
+                continue
+
+            sales_matches = self.env['purchase.order.sales.match'].search([
+                ('purchase_order_id', '=', order.id),
+                ('product_id', '=', product.id)
+            ])
+
+            total_cashback = 0.0
+
+            for match in sales_matches:
+                so_line = match.sale_line_id
+                so_order = so_line.order_id
+
+                if not so_order.date_order or so_order.date_order < start_date:
+                    continue
+
+                cashback_percent = product.x_manufacture.cashback_percent or 0.0
+                if cashback_percent <= 0:
+                    continue
+                sales_price = so_line.price_reduce_taxexcl * match.qty_so
+
+                cashback = sales_price * cashback_percent
+                total_cashback += cashback
+
+            line.amount_cashback = total_cashback
+
+
     def compute_delivery_amt_line(self):
         for line in self:
             if line.product_id.type == 'product':
diff --git a/indoteknik_custom/models/refund_sale_order.py b/indoteknik_custom/models/refund_sale_order.py
index 82f5e1fd..627a6fdd 100644
--- a/indoteknik_custom/models/refund_sale_order.py
+++ b/indoteknik_custom/models/refund_sale_order.py
@@ -540,7 +540,7 @@ class RefundSaleOrder(models.Model):
             else:
                 invoice_ids = rec.invoice_ids.ids
 
-            if invoice_ids and vals.get('refund_type', rec.refund_type) not in ['uang', 'barang_kosong_sebagian', 'barang_kosong', 'retur_half', 'retur']:
+            if invoice_ids and vals.get('refund_type', rec.refund_type) not in ['uang', 'barang_kosong_sebagian', 'barang_kosong', 'retur_half', 'retur', 'berita_acara']:
                 raise UserError("Refund type Hanya Bisa Lebih Bayar, Barang Kosong Sebagian, atau Retur jika ada invoice")
             
             if not invoice_ids and vals.get('refund_type', rec.refund_type) in ['uang', 'barang_kosong_sebagian', 'retur_half']:
diff --git a/indoteknik_custom/models/sale_order_line.py b/indoteknik_custom/models/sale_order_line.py
index 270fc842..dd44f84a 100644
--- a/indoteknik_custom/models/sale_order_line.py
+++ b/indoteknik_custom/models/sale_order_line.py
@@ -261,17 +261,25 @@ class SaleOrderLine(models.Model):
             line.item_before_margin = margin_per_item
 
     def _compute_cashback_brand(self):
+        start_date = datetime(2026, 2, 1, 0, 0, 0)
         for line in self:
             line.amount_cashback = 0
 
             if not line.product_id:
                 continue
 
+            if line.order_id.date_order < start_date:
+                continue
+
+            price, taxes, vendor_id = self._get_purchase_price(line.product_id)
+
             cashback_percent = line.product_id.x_manufacture.cashback_percent or 0
             if cashback_percent <= 0:
                 continue
 
-            price, taxes, vendor = self._get_purchase_price(line.product_id)
+
+            if line.vendor_id.id != 5571:
+                continue
 
             price_tax_excl = price