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

merge

13 files changed, 194 insertions, 19 deletions

diff --git a/indoteknik_custom/models/advance_payment_request.py b/indoteknik_custom/models/advance_payment_request.py
index ed0b0809..8cadb1b6 100644
--- a/indoteknik_custom/models/advance_payment_request.py
+++ b/indoteknik_custom/models/advance_payment_request.py
@@ -641,10 +641,16 @@ class AdvancePaymentRequest(models.Model):
         today = date.today()
         for rec in self:
 
-            current_days = rec.days_remaining or 0
-            current_due_date = rec.estimated_return_date or False
-            if rec.type_request == 'pum':
-                is_settlement_approved = any(s.status == 'approved' for s in rec.settlement_ids)
+            # current_days = rec.days_remaining or 0
+            # current_due_date = rec.estimated_return_date or False
+            current_days = 0
+            current_due_date = False
+
+            is_settlement_approved = any(s.status == 'approved' for s in rec.settlement_ids)
+            is_pum_canceled = (rec.status == 'cancel')
+
+            if rec.type_request == 'pum' and not is_pum_canceled and not is_settlement_approved:
+                
                 if not is_settlement_approved:
                     due_date = False
 
diff --git a/indoteknik_custom/models/purchase_order.py b/indoteknik_custom/models/purchase_order.py
index e16c8d61..b3ecca56 100755
--- a/indoteknik_custom/models/purchase_order.py
+++ b/indoteknik_custom/models/purchase_order.py
@@ -53,6 +53,7 @@ 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')
@@ -1410,19 +1411,36 @@ class PurchaseOrder(models.Model):
             real_item_margin = sales_price - purchase_price
             sum_margin += real_item_margin
 
+            cashback_amount = 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
+
+            # line.amount_cashback = cashback_amount
+
         if sum_so_margin != 0 and sum_sales_price != 0 and sum_margin != 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 = 0
+        elif self.partner_id.id == 5571 and 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
+        sum_so_margin = sum_sales_price = sum_margin = cashback_amount = 0
         for line in self.order_sales_match_line:
             po_line = self.env['purchase.order.line'].search([
                 ('product_id', '=', line.product_id.id),
@@ -1459,18 +1477,27 @@ class PurchaseOrder(models.Model):
                 if line.purchase_order_id.delivery_amt > 0:
                     purchase_price += line.purchase_order_id.delivery_amt
 
+                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
 
+        self.amount_cashback = cashback_amount
         # Akumulasi hasil akhir
         if sum_sales_price != 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 = 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/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..4c3ca52e 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)
@@ -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']:
@@ -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),
@@ -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..49e36279 100755
--- a/indoteknik_custom/models/sale_order.py
+++ b/indoteknik_custom/models/sale_order.py
@@ -2316,7 +2316,7 @@ class SaleOrder(models.Model):
         for order in self:
             for line in order.order_line:
                 search_product = self.env['sale.order.line'].search(
-                    [('product_id', '=', line.product_id.id), ('order_id', '=', order.id)])
+                    [('product_id', '=', line.product_id.id), ('order_id', '=', order.id), ('display_type', '=', False)])
                 if len(search_product) > 1:
                     raise UserError("Terdapat DUPLIKASI data pada Product {}".format(line.product_id.display_name))
 
@@ -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/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
 
diff --git a/indoteknik_custom/models/stock_inventory.py b/indoteknik_custom/models/stock_inventory.py
index 84eb5a17..c4ebaeda 100644
--- a/indoteknik_custom/models/stock_inventory.py
+++ b/indoteknik_custom/models/stock_inventory.py
@@ -16,6 +16,12 @@ class StockInventory(models.Model):
         ('in', 'Adjusment In'),
         ('out', 'Adjusment Out'),
     ], string='Adjusments Type', required=True)
+    approval_state = fields.Selection([
+        ('draft', 'Draft'),
+        ('logistic', 'Logistic'),
+        ('accounting', 'Accounting'),
+        ('approved', 'Approved'),
+    ], default='draft', tracking=True)
 
     def _generate_number_stock_inventory(self):
         """Men-generate nomor untuk semua stock inventory yang belum memiliki number."""
@@ -53,8 +59,11 @@ class StockInventory(models.Model):
         return "00001"  # Jika belum ada data, mulai dari 00001
 
     def action_start(self):
-        if self.env.user.id not in [21, 17, 571, 28]:
-            raise UserError("Hanya Rafly, Denise, Iqmal, dan Stephan yang bisa start inventory")
+        if self.approval_state != 'approved' and self.adjusment_type == 'out':
+            raise UserError('Harus melalui proses approval')
+        if self.adjusment_type == 'in':
+            if self.env.user.id not in [21, 17, 571, 28]:
+                raise UserError("Hanya Rafly, Denise, Iqmal, dan Stephan yang bisa start inventory")
         return super(StockInventory, self).action_start()
 
     @api.model
@@ -69,6 +78,22 @@ class StockInventory(models.Model):
             self._assign_number(order)  # Generate number setelah save
 
         return order
+    
+    def action_approve(self):
+        if self.adjusment_type == 'out':
+            for rec in self:
+                if self.approval_state in [False, '', 'draft']:
+                    self.approval_state = 'logistic'
+                elif self.approval_state == 'logistic':
+                    if not rec.env.user.has_group('indoteknik_custom.group_role_logistic'):
+                        raise UserError("Harus diapprove logistic")
+                    self.approval_state = 'accounting'
+                elif self.approval_state == 'accounting':
+                    if not rec.env.user.has_group('indoteknik_custom.group_role_fat'):
+                        raise UserError("Harus diapprove accounting")
+                    self.approval_state = 'approved'
+                else:
+                    raise UserError("Sudah Approved")
 
     def write(self, vals):
         """Jika adjusment_type diubah, generate ulang nomor."""
diff --git a/indoteknik_custom/models/tukar_guling_po.py b/indoteknik_custom/models/tukar_guling_po.py
index ae58d509..1ee10679 100644
--- a/indoteknik_custom/models/tukar_guling_po.py
+++ b/indoteknik_custom/models/tukar_guling_po.py
@@ -582,7 +582,23 @@ class TukarGulingPO(models.Model):
                     ('group_id', '=', group.id),
                     ('state', '=', 'done')
                 ])
-                bu_inputs = po_pickings.filtered(lambda p: p.picking_type_id.id == 28)
+
+                product_ids = set(record.line_ids.mapped("product_id").ids)
+
+                _logger.info("TG product_ids: %s", product_ids)
+
+                def _get_moves(picking):
+                    return picking.move_ids_without_package if picking.move_ids_without_package else picking.move_lines
+
+                bu_inputs = po_pickings.filtered(
+                    lambda p: p.picking_type_id.id == 28 and any(
+                        m.product_id.id in product_ids
+                        for m in _get_moves(p)
+                    )
+                )
+
+                _logger.info("BU INPUT dengan product sama: %s", bu_inputs.mapped("name"))
+
                 bu_puts = po_pickings.filtered(lambda p: p.picking_type_id.id == 75)
             else:
                 raise UserError("Group ID tidak ditemukan pada BU Operations.")
@@ -711,12 +727,26 @@ class TukarGulingPO(models.Model):
 
                 # Ambil pasangannya di BU INPUT (asumsi urutan sejajar)
                 sorted_bu_puts = sorted(bu_puts, key=lambda p: p.name)
+                # sorted_bu_inputs = sorted(bu_inputs, key=lambda p: p.name)
+
+                # if bu_put_index >= len(sorted_bu_inputs):
+                #     raise UserError("Tidak ditemukan pasangan BU INPUT untuk BU PUT yang dipilih.")
+
+                # paired = [(sorted_bu_puts[bu_put_index], sorted_bu_inputs[bu_put_index])]
                 sorted_bu_inputs = sorted(bu_inputs, key=lambda p: p.name)
 
-                if bu_put_index >= len(sorted_bu_inputs):
-                    raise UserError("Tidak ditemukan pasangan BU INPUT untuk BU PUT yang dipilih.")
+                if not sorted_bu_inputs:
+                    raise UserError(
+                        "Tidak ditemukan BU INPUT yang memiliki product TG."
+                    )
 
-                paired = [(sorted_bu_puts[bu_put_index], sorted_bu_inputs[bu_put_index])]
+                paired = [(record.operations, sorted_bu_inputs[0])]
+
+                _logger.info(
+                    "🔗 Pairing BU PUT %s dengan BU INPUT %s",
+                    record.operations.name,
+                    sorted_bu_inputs[0].name
+                )
 
                 for bu_put, bu_input in paired:
                     vrt = _create_return_from_picking(bu_put, bu_put_qty_map)
diff --git a/indoteknik_custom/views/advance_payment_request.xml b/indoteknik_custom/views/advance_payment_request.xml
index 7f422aa9..340e0caf 100644
--- a/indoteknik_custom/views/advance_payment_request.xml
+++ b/indoteknik_custom/views/advance_payment_request.xml
@@ -236,6 +236,7 @@
                 <filter string="PUM" name="filter_pum" domain="[('type_request','=','pum')]"/>
                 <filter string="Reimburse" name="filter_reimburse" domain="[('type_request','=','reimburse')]"/>
                 <separator/>
+                <filter string="Cancelled" name="filter_cancelled" domain="[('status','=','cancel')]"/>
                 <filter string="Waiting for Approval" name="filter_waiting_approval" domain="[('status','in',['pengajuan1','pengajuan2','pengajuan3'])]"/>
                 <filter string="Approved" name="filter_approved" domain="[('status','=','approved')]"/>
                 <separator/>
diff --git a/indoteknik_custom/views/approval_date_doc.xml b/indoteknik_custom/views/approval_date_doc.xml
index 3d597aa8..a3aae3b4 100644
--- a/indoteknik_custom/views/approval_date_doc.xml
+++ b/indoteknik_custom/views/approval_date_doc.xml
@@ -14,6 +14,7 @@
                 <field name="approve_date"/>
                 <field name="approve_by"/>
                 <field name="create_uid"/>
+                <field name="create_date"/>
             </tree>
         </field>
     </record>
@@ -46,6 +47,7 @@
                             <field name="approve_date"/>
                             <field name="approve_by"/>
                             <field name="create_uid"/>
+                            <field name="create_date"/>
                             <field name="note" attrs="{'invisible': [('state', '!=', 'cancel')]}"/>
                             <field name="state" readonly="1"/>
                         </group>
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>
diff --git a/indoteknik_custom/views/stock_inventory.xml b/indoteknik_custom/views/stock_inventory.xml
index db85f05c..df747830 100644
--- a/indoteknik_custom/views/stock_inventory.xml
+++ b/indoteknik_custom/views/stock_inventory.xml
@@ -6,9 +6,14 @@
         <field name="model">stock.inventory</field>
         <field name="inherit_id" ref="stock.view_inventory_form"/>
         <field name="arch" type="xml">
+            <header>
+                <button name="action_approve" string="Approve" type="object"
+                    class="btn-primary" attrs="{'invisible': [('adjusment_type', 'not in', ['out'])]}"/>
+            </header>
             <xpath expr="//field[@name='location_ids']" position="after">
                 <field name="number" readonly="1"/>
                 <field name="adjusment_type" />
+                <field name="approval_state"  readonly="1" attrs="{'invisible': [('adjusment_type', 'not in', ['out'])]}"/>
             </xpath>
         </field>
     </record>
diff --git a/indoteknik_custom/views/tukar_guling.xml b/indoteknik_custom/views/tukar_guling.xml
index 8cfb5680..609dea15 100644
--- a/indoteknik_custom/views/tukar_guling.xml
+++ b/indoteknik_custom/views/tukar_guling.xml
@@ -133,5 +133,29 @@
                 </form>
             </field>
         </record>
+        <record id="view_tukar_guling_filter" model="ir.ui.view">
+            <field name="name">tukar.guling.filter</field>
+            <field name="model">tukar.guling</field>
+            <field name="arch" type="xml">
+                <search string="Tukar Guling">
+                    <field name="name" string="No. Dokumen"/>
+                    <field name="partner_id" string="Customer"/>
+                    <field name="origin" string="SO Number"/>
+                    <field name="operations" string="Operations"/>
+                    <!-- <filter string="Pengajuan Saya" name="my_tukar_guling" domain="[('create_uid', '=', uid)]"/> -->
+                    <separator/>
+                    <filter string="Tukar Guling" name="tukar_guling" domain="[('return_type', '=', 'tukar_guling')]"/>
+                    <filter string="Return SO" name="return_so" domain="[('return_type', '=', 'retur_so')]"/>
+                    <separator/>
+                    <filter string="Approval Sales" name="approval_sales" domain="[('state', '=', 'approval_sales')]"/>
+                    <filter string="Approval Logistic" name="approval_logistic" domain="[('state', '=', 'approval_logistic')]"/>
+                    <filter string="Approval Finance" name="approval_finance" domain="[('state', '=', 'approval_finance')]"/>
+                    <filter string="Approved" name="approved" domain="[('state', '=', 'approved')]"/>
+                    <separator/>
+                    <filter string="Done" name="done" domain="[('state', '=', 'done')]"/>
+                    <filter string="Cancelled" name="cancel" domain="[('state', '=', 'cancel')]"/>
+                </search>
+            </field>
+        </record>
     </data>
 </odoo>