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

1 files changed, 63 insertions, 23 deletions

diff --git a/indoteknik_custom/models/stock_picking.py b/indoteknik_custom/models/stock_picking.py
index 16e235da..4772c433 100644
--- a/indoteknik_custom/models/stock_picking.py
+++ b/indoteknik_custom/models/stock_picking.py
@@ -176,6 +176,29 @@ class StockPicking(models.Model):
     linked_manual_bu_out = fields.Many2one('stock.picking', string='BU Out', copy=False)
 
     area_name = fields.Char(string="Area", compute="_compute_area_name")
+    is_bu_iu = fields.Boolean('Is BU/IU', compute='_compute_is_bu_iu', default=False, copy=False, readonl=True)
+
+    @api.depends('name')
+    def _compute_is_bu_iu(self):
+        for record in self:
+            if 'BU/IU' in record.name:
+                record.is_bu_iu = True
+            else:
+                record.is_bu_iu = False
+
+    def action_bu_iu_to_pengajuan2(self):
+        for rec in self:
+            if not rec.is_bu_iu or not rec.is_internal_use:
+                raise UserError(_("Tombol ini hanya untuk dokumen BU/IU - Internal Use."))
+            if rec.approval_status == False:
+                raise UserError("Harus Ask Approval terlebih dahulu")
+            if rec.approval_status in ['pengajuan1'] and self.env.user.is_accounting:
+                rec.approval_status = 'pengajuan2'
+                rec.message_post(body=_("Status naik ke Approval Logistik oleh %s") % self.env.user.display_name)
+            if rec.approval_status in ['pengajuan1', 'pengajuan2', ''] and not self.env.user.is_accounting:
+                raise UserError("Tombol hanya untuk accounting")
+
+        return True
 
     # def _get_biteship_api_key(self):
     #     # return self.env['ir.config_parameter'].sudo().get_param('biteship.api_key_test')
@@ -191,7 +214,7 @@ class StockPicking(models.Model):
     # def write(self, vals):
     #     if 'linked_manual_bu_out' in vals:
     #         for record in self:
-    #             if (record.picking_type_code == 'internal' 
+    #             if (record.picking_type_code == 'internal'
     #                 and 'BU/PICK/' in record.name):
     #                 # Jika menghapus referensi (nilai di-set False/None)
     #                 if record.linked_manual_bu_out and not vals['linked_manual_bu_out']:
@@ -205,8 +228,8 @@ class StockPicking(models.Model):
     # @api.model
     # def create(self, vals):
     #     record = super().create(vals)
-    #     if (record.picking_type_code == 'internal' 
-    #         and 'BU/PICK/' in record.name 
+    #     if (record.picking_type_code == 'internal'
+    #         and 'BU/PICK/' in record.name
     #         and vals.get('linked_manual_bu_out')):
     #         picking = self.env['stock.picking'].browse(vals['linked_manual_bu_out'])
     #         picking.state_packing = 'packing_done'
@@ -511,7 +534,7 @@ class StockPicking(models.Model):
     #                 rts_days = rts.days
     #                 rts_hours = divmod(rts.seconds, 3600)
 
-    #                 estimated_by_erts = rts.total_seconds() / 3600  
+    #                 estimated_by_erts = rts.total_seconds() / 3600
 
     #                 record.countdown_ready_to_ship = f"{rts_days} days, {rts_hours} hours"
     #                 record.countdown_hours = estimated_by_erts
@@ -1082,9 +1105,12 @@ class StockPicking(models.Model):
 
 
     def ask_approval(self):
-        if self.env.user.is_accounting:
-            raise UserError("Bisa langsung Validate")
-        if self.env.user.is_logistic_approver and self.location_id.id == 57 or self.location_id== 57:
+        # if self.env.user.is_accounting:
+        # if self.env.user.is_accounting and self.location_id.id == 57 or self.location_id == 57 and self.approval_status in ['pengajuan1', ''] and 'BU/IU' in self.name and self.approval_status == 'pengajuan1':
+        #         raise UserError("Bisa langsung set ke approval logistik")
+        if self.env.user.is_accounting and self.approval_status == "pengajuan2" and 'BU/IU' in self.name:
+            raise UserError("Tidak perlu ask approval sudah approval logistik")
+        if self.env.user.is_logistic_approver and self.location_id.id == 57 or self.location_id== 57 and self.approval_status == 'pengajuan2' and 'BU/IU' in self.name:
             raise UserError("Bisa langsung Validate")
 
 
@@ -1110,9 +1136,7 @@ class StockPicking(models.Model):
                 if line.qty_done <= 0:
                     raise UserError("Qty tidak boleh 0")
             pick.approval_status = 'pengajuan1'
-            if pick.location_id.id == 57:
-                pick.approval_status = 'pengajuan2'
-                return
+
 
     def ask_receipt_approval(self):
         if self.env.user.is_logistic_approver:
@@ -1315,10 +1339,16 @@ class StockPicking(models.Model):
         if self.picking_type_id.code == 'incoming' and self.group_id.id == False and self.is_internal_use == False:
             raise UserError(_('Tidak bisa Validate jika tidak dari Document SO / PO'))
 
-        if self.is_internal_use and not self.env.user.is_logistic_approver and self.location_id.id == 57:
+        # if self.is_internal_use and not self.env.user.is_logistic_approver and self.location_id.id == 57 and self.approval_status == 'pengajuan2':
+        #     raise UserError("Harus di Approve oleh Logistik")
+
+        if self.is_internal_use and self.approval_status in ['pengajuan1', '', False] and 'BU/IU' in self.name and self.is_bu_iu == True:
+            raise UserError("Tidak Bisa Validate, set approval status ke approval logistik terlebih dahhulu")
+
+        if self.is_internal_use and not self.env.user.is_logistic_approver and self.approval_status in ['pengajuan2'] and self.is_bu_iu == True and 'BU/IU' in self.name:
             raise UserError("Harus di Approve oleh Logistik")
 
-        if self.is_internal_use and not self.env.user.is_accounting:
+        if self.is_internal_use and not self.env.user.is_accounting and self.approval_status in ['pengajuan1', '', False] and self.is_bu_iu == False:
             raise UserError("Harus di Approve oleh Accounting")
 
         if self.picking_type_id.id == 28 and not self.env.user.is_logistic_approver:
@@ -1327,7 +1357,7 @@ class StockPicking(models.Model):
         if self.location_dest_id.id == 47 and not self.env.user.is_purchasing_manager:
             raise UserError("Transfer ke gudang selisih harus di approve Rafly Hanggara")
 
-        if self.is_internal_use:
+        if self.is_internal_use and self.approval_status == 'pengajuan2':
             self.approval_status = 'approved'
         elif self.picking_type_id.code == 'incoming':
             self.approval_receipt_status = 'approved'
@@ -1344,7 +1374,7 @@ 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
         if self.location_dest_id.id == 58 and 'BU/INPUT/' in self.name:
             for move in self.move_ids_without_package:
@@ -1360,22 +1390,19 @@ class StockPicking(models.Model):
                         )
 
         self.validation_minus_onhand_quantity()
-        loc = self.location_id
-        if loc.id == 57 and not self.env.user.is_logistic_approver and self.approval_status in ['pengajuan2']:
-            raise UserError ("Harus Ask Approval Logistik")
         self.responsible = self.env.user.id
         # self.send_koli_to_so()
         if self.picking_type_code == 'outgoing' and 'BU/OUT/' in self.name:
             self.check_koli()
         res = super(StockPicking, self).button_validate()
-        
+
         # Penambahan link PO di Stock Journal untuk Picking BD
         for picking in self:
             if picking.name and 'BD/' in picking.name and picking.purchase_id:
                 stock_journal = self.env['account.move'].search([
                     ('ref', 'ilike', picking.name + '%'),
-                    ('journal_id', '=', 3) # Stock Journal ID
-                ], limit = 1)
+                    ('journal_id', '=', 3)  # Stock Journal ID
+                ], limit=1)
                 if stock_journal:
                     stock_journal.write({
                         'purchase_order_id': picking.purchase_id.id
@@ -2552,9 +2579,22 @@ class ScanKoli(models.Model):
                 out_moves = self.env['stock.move.line'].search([('picking_id', '=', picking.linked_out_picking_id.id)])
 
                 for pick_move in pick_moves:
-                    corresponding_out_move = out_moves.filtered(lambda m: m.product_id == pick_move.product_id)
-                    if corresponding_out_move:
-                        corresponding_out_move.qty_done += pick_move.qty_done
+                    corresponding_out_moves = out_moves.filtered(lambda m: m.product_id == pick_move.product_id)
+
+                    if len(corresponding_out_moves) == 1:
+                        corresponding_out_moves.qty_done += pick_move.qty_done
+
+                    elif len(corresponding_out_moves) > 1:
+                        qty_koli = pick_move.qty_done
+                        for out_move in corresponding_out_moves:
+                            if qty_koli <= 0:
+                                break
+                            # ambil sesuai kebutuhan atau sisa qty
+                            qty_to_assign = min(qty_koli, out_move.product_uom_qty)
+                            out_move.qty_done += qty_to_assign
+                            qty_koli -= qty_to_assign
+
+
 
     def _reset_qty_done_if_no_scan(self, picking_id):
         product_bu_pick = self.env['stock.move.line'].search([('picking_id', '=', picking_id)])