<miqdad> remove ask return in stock picking

3 files changed, 45 insertions, 37 deletions

diff --git a/indoteknik_custom/models/stock_picking.py b/indoteknik_custom/models/stock_picking.py
index 6d868db4..1827c489 100644
--- a/indoteknik_custom/models/stock_picking.py
+++ b/indoteknik_custom/models/stock_picking.py
@@ -1074,38 +1074,40 @@ class StockPicking(models.Model):
             self.approval_receipt_status = 'pengajuan1'
 
     def ask_return_approval(self):
-        for pick in self:
-            if self.env.user.is_accounting:
-                pick.approval_return_status = 'approved'
-                continue
-            else:
-                pick.approval_return_status = 'pengajuan1'
-
-            action = self.env['ir.actions.act_window']._for_xml_id('indoteknik_custom.action_stock_return_note_wizard')
-
-            if self.picking_type_code == 'outgoing':
-                if self.env.user.id in [3988, 3401, 20] or (
-                        self.env.user.has_group(
-                            'indoteknik_custom.group_role_purchasing') and 'Return of' in self.origin
-                ):
-                    action['context'] = {'picking_ids': [x.id for x in self]}
-                    return action
-                elif not self.env.user.has_group(
-                        'indoteknik_custom.group_role_purchasing') and 'Return of' in self.origin:
-                    raise UserError('Harus Purchasing yang Ask Return')
-                else:
-                    raise UserError('Harus Sales Admin yang Ask Return')
-
-            elif self.picking_type_code == 'incoming':
-                if self.env.user.has_group('indoteknik_custom.group_role_purchasing') or (
-                        self.env.user.id in [3988, 3401, 20] and 'Return of' in self.origin
-                ):
-                    action['context'] = {'picking_ids': [x.id for x in self]}
-                    return action
-                elif not self.env.user.id in [3988, 3401, 20] and 'Return of' in self.origin:
-                    raise UserError('Harus Sales Admin yang Ask Return')
-                else:
-                    raise UserError('Harus Purchasing yang Ask Return')
+        pass
+        raise UserError("Bisa langsung Validate")
+        # for pick in self:
+        #     if self.env.user.is_accounting:
+        #         pick.approval_return_status = 'approved'
+        #         continue
+        #     else:
+        #         pick.approval_return_status = 'pengajuan1'
+        #
+        #     action = self.env['ir.actions.act_window']._for_xml_id('indoteknik_custom.action_stock_return_note_wizard')
+        #
+        #     if self.picking_type_code == 'outgoing':
+        #         if self.env.user.id in [3988, 3401, 20] or (
+        #                 self.env.user.has_group(
+        #                     'indoteknik_custom.group_role_purchasing') and 'Return of' in self.origin
+        #         ):
+        #             action['context'] = {'picking_ids': [x.id for x in self]}
+        #             return action
+        #         elif not self.env.user.has_group(
+        #                 'indoteknik_custom.group_role_purchasing') and 'Return of' in self.origin:
+        #             raise UserError('Harus Purchasing yang Ask Return')
+        #         else:
+        #             raise UserError('Harus Sales Admin yang Ask Return')
+        #
+        #     elif self.picking_type_code == 'incoming':
+        #         if self.env.user.has_group('indoteknik_custom.group_role_purchasing') or (
+        #                 self.env.user.id in [3988, 3401, 20] and 'Return of' in self.origin
+        #         ):
+        #             action['context'] = {'picking_ids': [x.id for x in self]}
+        #             return action
+        #         elif not self.env.user.id in [3988, 3401, 20] and 'Return of' in self.origin:
+        #             raise UserError('Harus Sales Admin yang Ask Return')
+        #         else:
+        #             raise UserError('Harus Purchasing yang Ask Return')
 
     def calculate_line_no(self):
 
diff --git a/indoteknik_custom/models/stock_picking_return.py b/indoteknik_custom/models/stock_picking_return.py
index 97b622b4..f7900a27 100644
--- a/indoteknik_custom/models/stock_picking_return.py
+++ b/indoteknik_custom/models/stock_picking_return.py
@@ -11,8 +11,14 @@ class StockReturnPicking(models.TransientModel):
     #     ('tukar_guling', 'Tukar Guling')
     # ], string='Jenis Retur', default='revisi_so')
 
+
     def create_returns(self):
         picking = self.picking_id
+        # guling = self.env['tukar.guling']
+        # if guling._is_already_returned(picking):
+        #     raise UserError("BU ini sudah pernah diretur oleh dokumen lain.")
+        # if self._is_already_returned(picking):
+        #     raise UserError("BU ini sudah pernah diretur oleh dokumen lain.")
         if picking.picking_type_id.id == 30 and picking.linked_manual_bu_out.state == 'done':
             raise UserError("❌ BU/PICK tidak dapat di retur karena BU/OUT Sudah Done")
 
diff --git a/indoteknik_custom/views/stock_picking.xml b/indoteknik_custom/views/stock_picking.xml
index c088e00c..f4159b1b 100644
--- a/indoteknik_custom/views/stock_picking.xml
+++ b/indoteknik_custom/views/stock_picking.xml
@@ -50,11 +50,11 @@
                             type="object"
                             attrs="{'invisible': ['|', ('state', 'in', ['done']), ('approval_receipt_status', '=', 'pengajuan1')]}"
                     />
-                    <button name="ask_return_approval"
-                            string="Ask Return/Acc"
-                            type="object"
-                            attrs="{'invisible': [('state', 'in', ['draft', 'cancel', 'assigned'])]}"
-                    />
+<!--                    <button name="ask_return_approval"-->
+<!--                            string="Ask Return/Acc"-->
+<!--                            type="object"-->
+<!--                            attrs="{'invisible': [('state', 'in', ['draft', 'cancel', 'assigned'])]}"-->
+<!--                    />-->
                     <button name="action_create_invoice_from_mr"
                             string="Create Bill"
                             type="object"