<Miqdad> merge

2 files changed, 31 insertions, 6 deletions

diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml
index b2ecc21c..3e424788 100755
--- a/indoteknik_custom/views/sale_order.xml
+++ b/indoteknik_custom/views/sale_order.xml
@@ -55,6 +55,10 @@
                         attrs="{'invisible':['|', ('partner_is_cbd_locked','=',False), ('state', 'not in', ['draft', 'cancel'])]}">
                         <strong>Warning!</strong> Payment Terms Customer terkunci menjadi <b>Cash Before Delivery (C.B.D.)</b> karena ada invoice telah jatuh tempo <b>30 hari</b>. Silakan ajukan <b>Approval Payment Term</b> untuk membuka kunci.
                     </div>
+                    <widget name="web_ribbon"
+                        title="FIKTIF"
+                        bg_color="bg-danger"
+                        attrs="{'invisible': [('is_so_fiktif', '=', False)]}"/>
                 </xpath>
                 <div class="oe_button_box" name="button_box">
                     <field name="advance_payment_move_ids" invisible="1"/>
@@ -499,8 +503,8 @@
                     <field name="date_kirim_ril"/>
                     <field name="date_driver_departure"/>
                     <field name="date_driver_arrival"/>
-                    <field name="payment_state_custom" widget="badge" 
-                    decoration-danger="payment_state_custom == 'unpaid'" 
+                    <field name="payment_state_custom" widget="badge"
+                    decoration-danger="payment_state_custom == 'unpaid'"
                     decoration-success="payment_state_custom == 'paid'"
                     decoration-warning="payment_state_custom == 'partial'" optional="hide"/>
                     <field name="unreserved_percent" widget="percentpie" string="Unreserved" optional="hide"/>
diff --git a/indoteknik_custom/views/stock_picking.xml b/indoteknik_custom/views/stock_picking.xml
index 4779c5d3..84eafbaf 100644
--- a/indoteknik_custom/views/stock_picking.xml
+++ b/indoteknik_custom/views/stock_picking.xml
@@ -115,6 +115,7 @@
                        position="after">
                     <field name="product_image" widget="image"
                            style="height:128px;width:128px;" readonly="1"/>
+
                 </xpath> -->
                 <field name="backorder_id" position="after">
                     <field name="select_shipping_option_so"/>
@@ -162,11 +163,12 @@
 
                 <field name="origin" position="after">
                     <!--                    <field name="show_state_approve_md" invisible="1" optional="hide"/>-->
-                    <field name="state_approve_md" widget="badge" attrs="{'invisible': [('picking_type_id', 'in', [29,30])]}"/>
+                    <field name="state_approve_md" widget="badge"
+                           attrs="{'invisible': [('picking_type_id', 'in', [29,30])]}"/>
                     <field name="purchase_id"/>
                     <field name="sale_order"/>
                     <field name="invoice_status"/>
-                    <field name="is_bu_iu" />
+                    <field name="is_bu_iu"/>
                     <field name="is_so_fiktif" readonly="1"/>
                     <field name="approval_status" attrs="{'invisible': [('is_bu_iu', '=', False)]}"/>
                     <field name="date_doc_kirim" attrs="{'readonly':[('invoice_status', '=', 'invoiced')]}"/>
@@ -341,6 +343,22 @@
             </field>
         </record>
 
+        <record id="view_picking_form_inherit_ribbon" model="ir.ui.view">
+            <field name="name">stock.picking.form.ribbon</field>
+            <field name="model">stock.picking</field>
+            <field name="inherit_id" ref="stock.view_picking_form"/>
+            <field name="arch" type="xml">
+                <!-- Sisipkan sebelum elemen dengan class oe_title -->
+                <xpath expr="//sheet/div[@class='oe_title']" position="before">
+                    <widget name="web_ribbon"
+                            title="FIKTIF"
+                            bg_color="bg-danger"
+                            attrs="{'invisible': [('is_so_fiktif', '=', False)]}"/>
+                </xpath>
+            </field>
+        </record>
+
+
         <record id="scan_koli_tree" model="ir.ui.view">
             <field name="name">scan.koli.tree</field>
             <field name="model">scan.koli</field>
@@ -413,7 +431,8 @@
                     <field name="qty_yang_mau_dikirim"/>
                     <field name="qty_terkirim"/>
                     <field name="qty_gantung"/>
-                    <field name="delivery_status" widget="badge" options="{'colors': {'full': 'success', 'partial': 'warning', 'partial_final': 'danger'}}"/>
+                    <field name="delivery_status" widget="badge"
+                           options="{'colors': {'full': 'success', 'partial': 'warning', 'partial_final': 'danger'}}"/>
                 </tree>
             </field>
         </record>
@@ -437,7 +456,9 @@
                 <form string="Peringatan Koli Belum Diperiksa">
                     <sheet>
                         <div class="oe_title">
-                            <h2><span>⚠️ Perhatian!</span></h2>
+                            <h2>
+                                <span>⚠️ Perhatian!</span>
+                            </h2>
                         </div>
                         <group>
                             <field name="message" readonly="1" nolabel="1" widget="text"/>