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

5 files changed, 118 insertions, 23 deletions

diff --git a/indoteknik_custom/models/product_template.py b/indoteknik_custom/models/product_template.py
index f59bea6b..13e99707 100755
--- a/indoteknik_custom/models/product_template.py
+++ b/indoteknik_custom/models/product_template.py
@@ -1365,4 +1365,5 @@ class ImageCarousel(models.Model):
     _order = 'product_id, id'
 
     product_id = fields.Many2one('product.template', string='Product', required=True, ondelete='cascade', index=True, copy=False)
+    sequence = fields.Integer("Sequence", default=10)
     image = fields.Binary(string='Image')
diff --git a/indoteknik_custom/models/purchase_order.py b/indoteknik_custom/models/purchase_order.py
index 103a9131..50913a80 100755
--- a/indoteknik_custom/models/purchase_order.py
+++ b/indoteknik_custom/models/purchase_order.py
@@ -103,6 +103,11 @@ class PurchaseOrder(models.Model):
         string="BU Related Count",
         compute='_compute_bu_related_count'
     )
+
+    bills_related_count = fields.Integer(
+        string="Bills DP & Pelunasan",
+        compute="_compute_bills_related_count"
+    )
     manufacturing_id = fields.Many2one('mrp.production', string='Manufacturing Orders')
 
     complete_bu_in_count = fields.Integer(
@@ -260,6 +265,33 @@ class PurchaseOrder(models.Model):
             'target': 'current',
         }
 
+    def action_view_bills(self):
+        self.ensure_one()
+
+        bill_ids = []
+        if self.bills_dp_id:
+            bill_ids.append(self.bills_dp_id.id)
+        if self.bills_pelunasan_id:
+            bill_ids.append(self.bills_pelunasan_id.id)
+
+        return {
+            'name': 'Bills (DP & Pelunasan)',
+            'type': 'ir.actions.act_window',
+            'res_model': 'account.move',
+            'view_mode': 'tree,form',
+            'target': 'current',
+            'domain': [('id', 'in', bill_ids)],
+        }
+
+    def _compute_bills_related_count(self):
+        for order in self:
+            count = 0
+            if order.bills_dp_id:
+                count += 1
+            if order.bills_pelunasan_id:
+                count += 1
+            order.bills_related_count = count
+
     # cek payment term
     def _check_payment_term(self):
         _logger.info("Check Payment Term Terpanggil")
diff --git a/indoteknik_custom/models/sale_order.py b/indoteknik_custom/models/sale_order.py
index 80790ebe..53be999f 100755
--- a/indoteknik_custom/models/sale_order.py
+++ b/indoteknik_custom/models/sale_order.py
@@ -388,8 +388,37 @@ class SaleOrder(models.Model):
         string="Unreserved %", digits=(16, 2),
         compute="_compute_reserved_delivered_pie", store=False
     )
+    payment_state_custom = fields.Selection([
+        ('unpaid', 'Unpaid'),
+        ('partial', 'Partially Paid'),
+        ('paid', 'Paid'),
+        ('no_invoice', 'No Invoice'),
+    ], string="Payment Status", compute="_compute_payment_state_custom", store=False)
+
+    @api.depends('invoice_ids.payment_state', 'invoice_ids.amount_total', 'invoice_ids.amount_residual')
+    def _compute_payment_state_custom(self):
+        for order in self:
+            invoices = order.invoice_ids.filtered(lambda inv: inv.state != 'cancel')
+            total = sum(invoices.mapped('amount_total'))
+            residual = sum(invoices.mapped('amount_residual'))
+
+            if not invoices or total == 0:
+                order.payment_state_custom = 'no_invoice'
+                continue
+
+            paid = total - residual
+            percent_paid = (paid / total) * 100 if total > 0 else 0.0
+
+            if percent_paid == 100:
+                order.payment_state_custom = 'paid'
+            elif percent_paid == 0:
+                order.payment_state_custom = 'unpaid'
+            else:
+                order.payment_state_custom = 'partial'
 
-    @api.depends('order_line.reserved_percent', 'order_line.delivered_percent', 'order_line.unreserved_percent')
+    @api.depends('order_line.move_ids.state', 
+             'order_line.move_ids.reserved_availability', 
+             'order_line.move_ids.quantity_done')
     def _compute_reserved_delivered_pie(self):
         for order in self:
             total_qty = sum(order.order_line.mapped('product_uom_qty'))
@@ -401,16 +430,23 @@ class SaleOrder(models.Model):
                     if not order_qty:
                         continue
 
-                    # ambil qty asli dari move, bukan percent agar akurat
-                    pick_moves = line.move_ids.filtered(
-                        lambda m: m.picking_type_id.code == 'internal' and m.state not in ('done', 'cancel')
-                    )
-                    reserved_qty += sum(pick_moves.mapped('reserved_availability'))
+                    for move in line.move_ids:
+                        if move.state != 'done':
+                            # reserve qty (draft/assigned)
+                            if move.picking_type_id.code == 'internal':
+                                reserved_qty += move.reserved_availability or 0.0
+                            continue
 
-                    out_moves = line.move_ids.filtered(
-                        lambda m: m.picking_type_id.code == 'outgoing' and m.state == 'done'
-                    )
-                    delivered_qty += sum(out_moves.mapped('quantity_done'))
+                        # sudah done → cek alur lokasi
+                        if move.location_dest_id.usage == 'customer':
+                            # barang keluar → delivered
+                            delivered_qty += move.quantity_done
+                        elif move.location_id.usage == 'customer':
+                            # barang balik (return) → kurangi delivered
+                            delivered_qty -= move.quantity_done
+
+                # clamp biar ga minus
+                delivered_qty = max(delivered_qty, 0)
 
                 order.reserved_percent = (reserved_qty / total_qty) * 100
                 order.delivered_percent = (delivered_qty / total_qty) * 100
@@ -418,6 +454,7 @@ class SaleOrder(models.Model):
             else:
                 order.reserved_percent = order.delivered_percent = order.unreserved_percent = 0
 
+
     def _has_ccm(self):
         if self.id:
             self.ccm_id = self.env['tukar.guling'].search([('origin', 'ilike', self.name)], limit=1)
diff --git a/indoteknik_custom/models/sale_order_line.py b/indoteknik_custom/models/sale_order_line.py
index 2a00bac0..2406995d 100644
--- a/indoteknik_custom/models/sale_order_line.py
+++ b/indoteknik_custom/models/sale_order_line.py
@@ -58,31 +58,39 @@ class SaleOrderLine(models.Model):
     delivered_percent = fields.Float(string="Delivered %", digits=(16, 2), compute="_compute_reserved_delivered_pie", store=False)
     unreserved_percent = fields.Float(string="Unreserved %", digits=(16, 2), compute="_compute_reserved_delivered_pie", store=False)
 
-    @api.depends('move_ids')
+    @api.depends('move_ids.state', 'move_ids.reserved_availability', 'move_ids.quantity_done')
     def _compute_reserved_delivered_pie(self):
         for line in self:
             order_qty = line.product_uom_qty or 0.0
             reserved_qty = delivered_qty = 0.0
 
             if order_qty > 0:
-                # Reserved: hanya dari BU/PICK yang masih aktif
-                pick_moves = line.move_ids.filtered(
-                    lambda m: m.picking_type_id.code == 'internal' and m.state not in ('done', 'cancel')
-                )
-                reserved_qty = sum(pick_moves.mapped('reserved_availability'))
-
-                # Delivered: hanya dari BU/OUT yang sudah done
-                out_moves = line.move_ids.filtered(
-                    lambda m: m.picking_type_id.code == 'outgoing' and m.state == 'done'
-                )
-                delivered_qty = sum(out_moves.mapped('quantity_done'))
-
+                for move in line.move_ids:
+                    if move.state != 'done':
+                        # Reserve qty (hanya dari picking internal yang belum selesai)
+                        if move.picking_type_id.code == 'internal':
+                            reserved_qty += move.reserved_availability or 0.0
+                        continue
+
+                    # Kalau sudah done → cek lokasi
+                    if move.location_dest_id.usage == 'customer':
+                        # Barang keluar → tambah delivered
+                        delivered_qty += move.quantity_done
+                    elif move.location_id.usage == 'customer':
+                        # Barang balik dari customer (retur) → kurangi delivered
+                        delivered_qty -= move.quantity_done
+
+                # Jangan sampai delivered minus
+                delivered_qty = max(delivered_qty, 0)
+
+            # Hitung persentase
             line.reserved_percent = (reserved_qty / order_qty) * 100 if order_qty else 0
             line.delivered_percent = (delivered_qty / order_qty) * 100 if order_qty else 0
             line.unreserved_percent = 100 - line.reserved_percent - line.delivered_percent
 
 
 
+
     def _get_outgoing_incoming_moves(self):
         outgoing_moves = self.env['stock.move']
         incoming_moves = self.env['stock.move']
diff --git a/indoteknik_custom/models/stock_picking.py b/indoteknik_custom/models/stock_picking.py
index cb36eb2f..3d04a416 100644
--- a/indoteknik_custom/models/stock_picking.py
+++ b/indoteknik_custom/models/stock_picking.py
@@ -2070,6 +2070,8 @@ class CheckProduct(models.Model):
     _name = 'check.product'
     _description = 'Check Product'
     _order = 'picking_id, id'
+    _inherit = ['barcodes.barcode_events_mixin']  # ⬅️ aktifkan barcode handler
+
 
     picking_id = fields.Many2one(
         'stock.picking',
@@ -2084,6 +2086,21 @@ class CheckProduct(models.Model):
     status = fields.Char(string='Status', compute='_compute_status')
     code_product = fields.Char(string='Code Product')
 
+    def write(self, vals):
+        if 'code_product' in vals and not self.env.context.get('from_barcode_scan'):
+            raise UserError("Field Code Product hanya bisa diisi melalui barcode scan.")
+        res = super().write(vals)
+        # konsolidasi dll milik Anda tetap jalan
+        if not self.env.context.get('skip_consolidate'):
+            self.with_context(skip_consolidate=True)._consolidate_duplicate_lines()
+        return res
+
+    # Scanner handler
+    def on_barcode_scanned(self, barcode):
+        self.ensure_one()
+        self.with_context(from_barcode_scan=True).write({'code_product': barcode})
+        self._onchange_code_product()
+
     @api.onchange('code_product')
     def _onchange_code_product(self):
         if not self.code_product: