From dbf09bbf792809e84d2d0330a992e42b3a5c6994 Mon Sep 17 00:00:00 2001
From: stephanchrst <stephanchrst@gmail.com>
Date: Fri, 23 May 2025 09:38:02 +0700
Subject: Revert "Merge branch 'odoo-backup' of
 https://bitbucket.org/altafixco/indoteknik-addons into odoo-backup"

This reverts commit 43313db30da73b87843425c01c723f66ee982886, reversing
changes made to f6f59e660af6c4229ada54f7313d68867df1ba15.
---
 indoteknik_custom/views/sale_order.xml                   | 15 +++++++--------
 indoteknik_custom/views/stock_picking.xml                |  1 -
 indoteknik_custom/views/user_pengajuan_tempo_request.xml |  2 +-
 3 files changed, 8 insertions(+), 10 deletions(-)

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml
index 2191acf4..92d13fa7 100755
--- a/indoteknik_custom/views/sale_order.xml
+++ b/indoteknik_custom/views/sale_order.xml
@@ -96,11 +96,11 @@
                     <attribute name="invisible">1</attribute>
                 </field>
                 <field name="user_id" position="after">
-                    <field name="hold_outgoing" readonly="1"/>
-                    <field name="date_hold" readonly="1" widget="datetime"/>
-                    <field name="date_unhold" readonly="1" widget="datetime"/>
-                    <field name="helper_by_id" readonly="1"/>
-                    <field name="compute_fullfillment" invisible="1"/>
+                    <field name="hold_outgoing" readonly="1" />
+                    <field name="date_hold" readonly="1" widget="datetime" />
+                    <field name="date_unhold" readonly="1" widget="datetime" />
+                    <field name="helper_by_id" readonly="1" />
+                    <field name="compute_fullfillment" invisible="1" />
                 </field>
                 <field name="tag_ids" position="after">
 <<<<<<< HEAD
@@ -316,9 +316,8 @@
                 </field>
                 <field name="payment_term_id" position="attributes">
                     <attribute name="attrs">
-                        {'readonly': ['|', ('approval_status', 'in', ['pengajuan1', 'pengajuan2', 'approved']),
-                                      ('state', 'not in',
-                                       ['cancel', 'draft'])]}
+                        {'readonly': [('approval_status', '=', 'approved'), ('state', 'not in',
+                                                                             ['cancel', 'draft'])]}
                     </attribute>
                 </field>
 
diff --git a/indoteknik_custom/views/stock_picking.xml b/indoteknik_custom/views/stock_picking.xml
index 02959d69..ae77ab9a 100644
--- a/indoteknik_custom/views/stock_picking.xml
+++ b/indoteknik_custom/views/stock_picking.xml
@@ -19,7 +19,6 @@
                     <field name="note" optional="hide"/>
                     <field name="date_reserved" optional="hide"/>
                     <field name="state_reserve" optional="hide"/>
-                    <field name="sj_return_date" optional="hide"/>
                     <field name="state_packing" widget="badge" decoration-success="state_packing == 'packing_done'" decoration-danger="state_packing == 'not_packing'" optional="hide"/>
                     <field name="final_seq"/>
                     <field name="state_approve_md" widget="badge" decoration-success="state_approve_md == 'done'" decoration-warning="state_approve_md == 'pending'" optional="hide"/>
diff --git a/indoteknik_custom/views/user_pengajuan_tempo_request.xml b/indoteknik_custom/views/user_pengajuan_tempo_request.xml
index 898d5b2a..339ce8db 100644
--- a/indoteknik_custom/views/user_pengajuan_tempo_request.xml
+++ b/indoteknik_custom/views/user_pengajuan_tempo_request.xml
@@ -426,7 +426,7 @@
     <menuitem
         id="menu_user_pengajuan_tempo_request"
         name="User Pengajuan Tempo Request"
-        parent="account.menu_finance_receivables"
+        parent="res_partner_menu_user"
         sequence="3"
         action="action_user_pengajuan_tempo_request"
     />
-- 
cgit v1.2.3