Merged in iu_approval (pull request #442)

<Miqdad> CR BU/IU Approval flow

2 files changed, 56 insertions, 8 deletions

diff --git a/indoteknik_custom/models/stock_picking.py b/indoteknik_custom/models/stock_picking.py
index 0b91e79d..a2bd7339 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
@@ -1080,10 +1103,18 @@ class StockPicking(models.Model):
 
         return res
 
+
     def ask_approval(self):
-        if self.env.user.is_accounting:
+        # 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")
 
+
+
         # for calendar distribute only
         # if self.is_internal_use:
         #     stock_move_lines = self.env['stock.move.line'].search([
@@ -1106,6 +1137,7 @@ class StockPicking(models.Model):
                     raise UserError("Qty tidak boleh 0")
             pick.approval_status = 'pengajuan1'
 
+
     def ask_receipt_approval(self):
         if self.env.user.is_logistic_approver:
             raise UserError('Bisa langsung validate tanpa Ask Receipt')
@@ -1307,8 +1339,11 @@ 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_accounting:
-            raise UserError("Harus di Approve oleh Accounting")
+        # 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 not self.env.user.is_logistic_approver and self.approval_status in ['pengajuan1', 'pengajuan2'] and self.location_id.id == 57:
+            raise UserError("Harus di Approve oleh Logistik")
 
         if self.picking_type_id.id == 28 and not self.env.user.is_logistic_approver:
             raise UserError("Harus di Approve oleh Logistik")
@@ -1316,8 +1351,10 @@ 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.is_internal_use and self.approval_status in ['pengajuan1', '', False]:
+            raise UserError("Tidak Bisa Validate, set approval status ke approval logistik terlebih dahhulu")
         elif self.picking_type_id.code == 'incoming':
             self.approval_receipt_status = 'approved'
 
@@ -1333,6 +1370,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:
diff --git a/indoteknik_custom/views/stock_picking.xml b/indoteknik_custom/views/stock_picking.xml
index 21762202..d943f27a 100644
--- a/indoteknik_custom/views/stock_picking.xml
+++ b/indoteknik_custom/views/stock_picking.xml
@@ -45,6 +45,14 @@
             <field name="model">stock.picking</field>
             <field name="inherit_id" ref="stock.view_picking_form"/>
             <field name="arch" type="xml">
+                <!-- Tambahkan tombol custom: tampil hanya saat BU/IU + pengajuan1 -->
+                <xpath expr="//header" position="inside">
+                    <button name="action_bu_iu_to_pengajuan2"
+                            type="object"
+                            string="Approve by Accounting"
+                            class="btn-primary"
+                            attrs="{'invisible': [('is_bu_iu', '=', False), ('approval_status', 'in', ['pengajuan2', False, 'false', ''])]}"/>
+                </xpath>
                 <button name="action_confirm" position="before">
                     <button name="ask_approval"
                             string="Ask Approval"
@@ -158,6 +166,8 @@
                     <field name="purchase_id"/>
                     <field name="sale_order"/>
                     <field name="invoice_status"/>
+                    <field name="is_bu_iu" />
+                    <field name="approval_status" attrs="{'invisible': [('is_bu_iu', '=', False)]}"/>
                     <field name="date_doc_kirim" attrs="{'readonly':[('invoice_status', '=', 'invoiced')]}"/>
                     <field name="summary_qty_operation"/>
                     <field name="count_line_operation"/>