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

6 files changed, 64 insertions, 76 deletions

diff --git a/indoteknik_custom/models/account_move.py b/indoteknik_custom/models/account_move.py
index 6713e87c..e09f9c5c 100644
--- a/indoteknik_custom/models/account_move.py
+++ b/indoteknik_custom/models/account_move.py
@@ -323,8 +323,9 @@ class AccountMove(models.Model):
                 'reply_to': 'finance@indoteknik.co.id',
             }
 
-            _logger.info(f"Mengirim email ke: {values['email_to']} > email CC: {values['email_cc']}")
             template.send_mail(invs[0].id, force_send=True, email_values=values)
+            _logger.info(f"Mengirim email ke: {values['email_to']} > email CC: {values['email_cc']}")
+            _logger.info(f"Reminder terkirim ke {partner.name} ({values['email_to']}) → {len(invs)} invoice (dtd = {dtd})")
             # flag
             invs.write({'reminder_sent_date': today})
             # Post ke chatter
@@ -338,7 +339,6 @@ class AccountMove(models.Model):
                     author_id=system_id,
                 )
 
-            _logger.info(f"Reminder terkirim ke {partner.name} ({values['email_to']}) → {len(invs)} invoice (dtd = {dtd})")
 
 
     @api.onchange('invoice_date')
diff --git a/indoteknik_custom/models/approval_payment_term.py b/indoteknik_custom/models/approval_payment_term.py
index 4cf9a4c8..8618856a 100644
--- a/indoteknik_custom/models/approval_payment_term.py
+++ b/indoteknik_custom/models/approval_payment_term.py
@@ -72,20 +72,20 @@ class ApprovalPaymentTerm(models.Model):
         if self.env.user.id != 688:
             return
 
+        tracked_fields = {"blocking_stage", "warning_stage", "property_payment_term_id"}
+
         for rec in self:
             changes = []
             old_values = old_values_dict.get(rec.id, {})
 
             for field_name, new_value in vals.items():
-                if field_name not in rec._fields or field_name == 'change_log_688':
+                if field_name not in tracked_fields:
                     continue
 
                 field = rec._fields[field_name]
                 old_value = old_values.get(field_name)
+                field_label = field.string  # label user-friendly
 
-                field_label = field.string  # Ambil label user-friendly
-
-                # Relational field
                 if field.type == 'many2one':
                     old_id = old_value[0] if old_value else False
                     is_different = old_id != new_value
diff --git a/indoteknik_custom/models/sale_order.py b/indoteknik_custom/models/sale_order.py
index 53be999f..ffb53dce 100755
--- a/indoteknik_custom/models/sale_order.py
+++ b/indoteknik_custom/models/sale_order.py
@@ -391,9 +391,9 @@ class SaleOrder(models.Model):
     payment_state_custom = fields.Selection([
         ('unpaid', 'Unpaid'),
         ('partial', 'Partially Paid'),
-        ('paid', 'Paid'),
+        ('paid', 'Full Paid'),
         ('no_invoice', 'No Invoice'),
-    ], string="Payment Status", compute="_compute_payment_state_custom", store=False)
+    ], string="Payment Status Invoice", 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):
@@ -416,44 +416,43 @@ class SaleOrder(models.Model):
             else:
                 order.payment_state_custom = 'partial'
 
-    @api.depends('order_line.move_ids.state', 
-             'order_line.move_ids.reserved_availability', 
-             'order_line.move_ids.quantity_done')
+    @api.depends(
+        'order_line.move_ids.state',
+        'order_line.move_ids.reserved_availability',
+        'order_line.move_ids.quantity_done',
+        'order_line.move_ids.picking_type_id'
+    )
     def _compute_reserved_delivered_pie(self):
         for order in self:
-            total_qty = sum(order.order_line.mapped('product_uom_qty'))
+            order_qty = sum(order.order_line.mapped('product_uom_qty')) or 0.0
             reserved_qty = delivered_qty = 0.0
 
-            if total_qty > 0:
-                for line in order.order_line:
-                    order_qty = line.product_uom_qty or 0.0
-                    if not order_qty:
+            if order_qty > 0:
+                # Kumpulin semua moves dari order
+                all_moves = order.order_line.mapped('move_ids')
+
+                for move in all_moves:
+                    # --- CASE 1: Move belum selesai ---
+                    if move.state not in ('done', 'cancel'):
+                        # Reserved qty hanya dari move yang belum selesai
+                        reserved_qty += move.reserved_availability or 0.0
                         continue
 
-                    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
-
-                        # 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)
+                    # --- CASE 2: Move sudah done ---
+                    if move.location_dest_id.usage == 'customer':
+                        # Barang dikirim ke customer
+                        delivered_qty += move.quantity_done or 0.0
+                    elif move.location_id.usage == 'customer':
+                        # Barang balik dari customer (retur)
+                        delivered_qty -= move.quantity_done or 0.0
 
-                order.reserved_percent = (reserved_qty / total_qty) * 100
-                order.delivered_percent = (delivered_qty / total_qty) * 100
-                order.unreserved_percent = 100 - order.reserved_percent - order.delivered_percent
-            else:
-                order.reserved_percent = order.delivered_percent = order.unreserved_percent = 0
+                # Clamp supaya delivered gak minus
+                delivered_qty = max(delivered_qty, 0)
 
+            # Hitung persen
+            order.reserved_percent = min((reserved_qty / order_qty) * 100, 100) if order_qty else 0
+            order.delivered_percent = min((delivered_qty / order_qty) * 100, 100) if order_qty else 0
+            order.unreserved_percent = max(100 - order.reserved_percent - order.delivered_percent, 0)
 
     def _has_ccm(self):
         if self.id:
diff --git a/indoteknik_custom/models/sale_order_line.py b/indoteknik_custom/models/sale_order_line.py
index 2406995d..a20f93ef 100644
--- a/indoteknik_custom/models/sale_order_line.py
+++ b/indoteknik_custom/models/sale_order_line.py
@@ -66,21 +66,29 @@ class SaleOrderLine(models.Model):
 
             if order_qty > 0:
                 for move in line.move_ids:
+                    # --- CASE 1: Picking belum done ---
                     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
+                    # --- CASE 2: Picking sudah done ---
+                    if move.picking_type_id.code == 'internal':
+                        # PICK done → qty_done tetap dianggap reserved (masih nunggu OUT)
+                        reserved_qty += move.quantity_done or 0.0
+
+                    elif move.location_dest_id.usage == 'customer':
+                        # OUT done (barang nyampe customer)
                         delivered_qty += move.quantity_done
+                        reserved_qty -= move.quantity_done
+
                     elif move.location_id.usage == 'customer':
-                        # Barang balik dari customer (retur) → kurangi delivered
+                        # Retur dari customer
                         delivered_qty -= move.quantity_done
+                        reserved_qty += move.quantity_done
 
-                # Jangan sampai delivered minus
+                # clamp supaya gak minus
+                reserved_qty = max(reserved_qty, 0)
                 delivered_qty = max(delivered_qty, 0)
 
             # Hitung persentase
@@ -88,9 +96,6 @@ class SaleOrderLine(models.Model):
             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 3d04a416..a48e0ed1 100644
--- a/indoteknik_custom/models/stock_picking.py
+++ b/indoteknik_custom/models/stock_picking.py
@@ -1330,18 +1330,20 @@ class StockPicking(models.Model):
             current_time = datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S')
             self.date_reserved = current_time
 
+        
         # Validate Qty Demand Can't higher than Qty Product
-        for move_line in self.move_line_ids_without_package:
-            purchase_line = move_line.move_id.purchase_line_id
-            if purchase_line:
-                if purchase_line.product_uom_qty < move_line.product_uom_qty:
-                    raise UserError(
-                        _("Quantity demand (%s) tidak bisa lebih besar dari qty product (%s) untuk produk %s") % (
-                            move_line.product_uom_qty,
-                            purchase_line.product_uom_qty,
-                            move_line.product_id.display_name
+        if self.location_dest_id.id == 58 and 'BU/INPUT/' in self.name:
+            for move in self.move_ids_without_package:
+                purchase_line = move.purchase_line_id
+                if purchase_line:
+                    if purchase_line.product_qty < move.quantity_done:
+                        raise UserError(
+                            _("Quantity demand (%s) tidak bisa lebih besar dari qty product (%s) untuk produk %s") % (
+                                move.quantity_done,
+                                purchase_line.product_qty,
+                                move.product_id.display_name
+                            )
                         )
-                    )
 
         self.validation_minus_onhand_quantity()
         self.responsible = self.env.user.id
@@ -2070,7 +2072,7 @@ class CheckProduct(models.Model):
     _name = 'check.product'
     _description = 'Check Product'
     _order = 'picking_id, id'
-    _inherit = ['barcodes.barcode_events_mixin']  # ⬅️ aktifkan barcode handler
+    _inherit = ['barcodes.barcode_events_mixin']
 
 
     picking_id = fields.Many2one(
@@ -2086,21 +2088,6 @@ 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:
diff --git a/indoteknik_custom/models/tukar_guling.py b/indoteknik_custom/models/tukar_guling.py
index 4b03d4b0..23b9f085 100644
--- a/indoteknik_custom/models/tukar_guling.py
+++ b/indoteknik_custom/models/tukar_guling.py
@@ -109,9 +109,6 @@ class TukarGuling(models.Model):
                 ('invoice_line_ids.product_id', 'in', product_ids),
             ]
 
-            if rec.partner_id:
-                domain.append(('partner_id', '=', rec.partner_id.id))
-
             extra = []
             if rec.origin:
                 extra.append(('invoice_origin', 'ilike', rec.origin))