Merge branch 'production' into change/feature/promotion-program

17 files changed, 392 insertions, 23 deletions

diff --git a/indoteknik_custom/views/account_bank_statement.xml b/indoteknik_custom/views/account_bank_statement.xml
new file mode 100644
index 00000000..db380f37
--- /dev/null
+++ b/indoteknik_custom/views/account_bank_statement.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <data>
+        <record id="account_bank_statement_tree_inherit" model="ir.ui.view">
+            <field name="name">account.bank.statement.tree</field>
+            <field name="model">account.bank.statement</field>
+            <field name="inherit_id" ref="account.view_bank_statement_tree"/>
+            <field name="arch" type="xml"> 
+                <field name="state" position="after">
+                    <field name="is_edit"/>
+                </field>
+            </field>
+        </record>
+
+        <record id="account_bank_statement_form_inherit" model="ir.ui.view">
+            <field name="name">account.bank.statement.form</field>
+            <field name="model">account.bank.statement</field>
+            <field name="inherit_id" ref="account.view_bank_statement_form"/>
+            <field name="arch" type="xml">
+                <button name="button_reprocess" position="after">
+                    <button string="Unlock" class="oe_highlight" name="is_edited" type="object" attrs="{'invisible':['|', '|', ('is_edit', '=', True), ('line_ids','=',[]), ('state', '!=', 'confirm')]}"/>
+                    
+                    <button string="Lock" class="oe_highlight" name="not_edited" type="object" attrs="{'invisible':['|', '|', ('is_edit', '=', False), ('line_ids','=',[]), ('state', '!=', 'confirm')]}"/>
+                </button>
+                <field name="date" position="after">
+                    <field name="is_edit" invisible="1"/>
+                </field>
+            </field>
+        </record>
+    </data>
+</odoo>
\ No newline at end of file
diff --git a/indoteknik_custom/views/account_move.xml b/indoteknik_custom/views/account_move.xml
index c45dab25..1721abb6 100644
--- a/indoteknik_custom/views/account_move.xml
+++ b/indoteknik_custom/views/account_move.xml
@@ -13,6 +13,9 @@
                 <field name="invoice_date" position="after">
                     <field name="payment_schedule" attrs="{'invisible': [('move_type', '!=', 'in_invoice')]}"/>
                 </field>
+                <field name="payment_reference" position="after">
+                    <field name="date_completed" readonly="1" attrs="{'invisible': [('move_type', '!=', 'out_invoice')]}"/>
+                </field>
                 <field name="efaktur_document" position="before">
                     <field name="no_faktur_pajak" readonly="1"/>
                 </field>
@@ -28,7 +31,7 @@
                     <field name="counter"/>
                 </field>
                 <notebook position="inside">
-                    <page string="Due Extension">
+                    <page string="Due Extension" attrs="{'invisible': [('move_type', '!=', 'out_invoice')]}">
                         <field name="due_line">
                             <tree>
                                 <field name="due_id"/>
@@ -70,8 +73,12 @@
             <field name="model">account.move</field>
             <field name="inherit_id" ref="account.view_in_invoice_tree"/>
             <field name="arch" type="xml">
-                <field name="payment_state" position="after">
-                    <field name="payment_schedule" optional="hide"/>
+                <field name="invoice_date_due" position="after">
+                    <field name="bill_day_to_due" string="Due Date" widget="remaining_days"/>
+                </field>
+
+                <field name="invoice_date_due" position="attributes">
+                    <attribute name="invisible">1</attribute>
                 </field>
             </field>
         </record>
diff --git a/indoteknik_custom/views/automatic_purchase.xml b/indoteknik_custom/views/automatic_purchase.xml
index 49751f4e..0478304e 100644
--- a/indoteknik_custom/views/automatic_purchase.xml
+++ b/indoteknik_custom/views/automatic_purchase.xml
@@ -10,6 +10,7 @@
                 <field name="description"/>
                 <field name="notification" readonly="1"/>
                 <field name="is_po" readonly="1"/>
+                <field name="responsible_id"/>
             </tree>
         </field>
     </record>
@@ -57,6 +58,7 @@
                             <group>
                                 <field name="date_doc"/>
                                 <field name="vendor_id"/>
+                                <field name="responsible_id"/>
                                 <field name="description"/>
                                 <field name="notification" readonly="1"/>
                             </group>
diff --git a/indoteknik_custom/views/customer_commision.xml b/indoteknik_custom/views/customer_commision.xml
new file mode 100644
index 00000000..008c79f8
--- /dev/null
+++ b/indoteknik_custom/views/customer_commision.xml
@@ -0,0 +1,189 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <record id="customer_commision_tree" model="ir.ui.view">
+        <field name="name">customer.commision.tree</field>
+        <field name="model">customer.commision</field>
+        <field name="arch" type="xml">
+            <tree>
+                <field name="number"/>
+                <field name="date_from"/>
+                <field name="date_to"/>
+                <field name="partner_id"/>
+                <field name="description"/>
+                <field name="notification" readonly="1"/>
+                <field name="status" readonly="1"/>
+            </tree>
+        </field>
+    </record>
+
+    <record id="customer_commision_line_tree" model="ir.ui.view">
+        <field name="name">customer.commision.line.tree</field>
+        <field name="model">customer.commision.line</field>
+        <field name="arch" type="xml">
+            <tree editable="top" create="false">
+                <field name="partner_id" readonly="1"/>
+                <field name="invoice_id" readonly="1"/>
+                <field name="state" readonly="1"/>
+                <field name="product_id" readonly="1" optional="hide"/>
+                <field name="dpp" readonly="1"/>
+                <field name="tax" readonly="1" optional="hide"/>
+                <field name="total" readonly="1" optional="hide"/>
+            </tree>
+        </field>
+    </record>
+
+    <record id="customer_commision_form" model="ir.ui.view">
+        <field name="name">customer_commision_form</field>
+        <field name="model">customer.commision</field>
+        <field name="arch" type="xml">
+            <form>
+                <header>
+                    <button name="action_confirm_customer_commision" 
+                    string="Confirm" type="object"
+                    options="{}"/>
+                </header>
+                <sheet string="Customer Commision">
+                        <div class="oe_button_box" name="button_box"/>
+                        <group>
+                            <group>
+                                <field name="number"/>
+                                <field name="date_from"/>
+                                <field name="partner_id"/>
+                                <field name="description"/>
+                                <field name="commision_percent"/>
+                                <field name="commision_amt"/>
+                            </group>
+                            <group>
+                                <div>
+                                <button name="generate_customer_commision"
+                                    string="Generate Line"
+                                    type="object"
+                                    class="mr-2 oe_highlight"
+                                />
+                                </div>
+                                <field name="date_to"/>
+                                <field name="commision_type"/>
+                                <field name="notification" readonly="1"/>
+                                <field name="status" readonly="1"/>
+                                <field name="total_dpp"/>
+                            </group>
+                        </group>
+                        <notebook>
+                            <page string="Lines">
+                                <field name="commision_lines"/>
+                            </page>
+                        </notebook>
+                    </sheet>
+                    <div class="oe_chatter">
+                        <field name="message_follower_ids" widget="mail_followers"/>
+                        <field name="message_ids" widget="mail_thread"/>
+                    </div>
+            </form>
+        </field>
+    </record>
+
+    <record id="customer_commision_action" model="ir.actions.act_window">
+        <field name="name">Customer Commision</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">customer.commision</field>
+        <field name="view_mode">tree,form</field>
+    </record>
+
+    <menuitem id="menu_customer_commision_acct"
+        name="Customer Commision"
+        action="customer_commision_action"
+        parent="account.menu_finance_entries"
+        sequence="113"
+    />
+
+    <menuitem id="menu_customer_commision_sales"
+        name="Customer Commision"
+        action="customer_commision_action"
+        parent="sale.product_menu_catalog"
+        sequence="101"
+    />
+
+    <record id="customer_rebate_tree" model="ir.ui.view">
+        <field name="name">customer.rebate.tree</field>
+        <field name="model">customer.rebate</field>
+        <field name="arch" type="xml">
+            <tree>
+                <field name="partner_id"/>
+                <field name="date_from"/>
+                <field name="date_to"/>
+                <field name="description"/>
+                <field name="target_1st"/>
+                <field name="target_2nd"/>
+                <field name="achieve_1"/>
+                <field name="achieve_2"/>
+                <field name="dpp_q1" optional="hide"/>
+                <field name="dpp_q2" optional="hide"/>
+                <field name="dpp_q3" optional="hide"/>
+                <field name="dpp_q4" optional="hide"/>
+                <field name="status_q1" optional="hide"/>
+                <field name="status_q2" optional="hide"/>
+                <field name="status_q3" optional="hide"/>
+                <field name="status_q4" optional="hide"/>
+            </tree>
+        </field>
+    </record>
+
+    <record id="customer_rebate_form" model="ir.ui.view">
+        <field name="name">customer_rebate_form</field>
+        <field name="model">customer.rebate</field>
+        <field name="arch" type="xml">
+            <form>
+                <sheet string="Customer Rebate">
+                        <div class="oe_button_box" name="button_box"/>
+                        <group>
+                            <group>
+                                <field name="date_from"/>
+                                <field name="partner_id"/>
+                                <field name="target_1st"/>
+                                <field name="target_2nd"/>
+                                <field name="dpp_q1"/>
+                                <field name="dpp_q2"/>
+                                <field name="dpp_q3"/>
+                                <field name="dpp_q4"/>
+                            </group>
+                            <group>
+                                <field name="date_to"/>
+                                <field name="description"/>
+                                <field name="achieve_1"/>
+                                <field name="achieve_2"/>
+                                <field name="status_q1"/>
+                                <field name="status_q2"/>
+                                <field name="status_q3"/>
+                                <field name="status_q4"/>
+                            </group>
+                        </group>
+                    </sheet>
+                    <div class="oe_chatter">
+                        <field name="message_follower_ids" widget="mail_followers"/>
+                        <field name="message_ids" widget="mail_thread"/>
+                    </div>
+            </form>
+        </field>
+    </record>
+
+    <record id="customer_rebate_action" model="ir.actions.act_window">
+        <field name="name">Customer Rebate</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">customer.rebate</field>
+        <field name="view_mode">tree,form</field>
+    </record>
+
+    <menuitem id="menu_customer_rebate_acct"
+                name="Customer Rebate"
+                action="customer_rebate_action"
+                parent="account.menu_finance_entries"
+                sequence="114"
+    />
+
+    <menuitem id="menu_customer_rebate_sales"
+        name="Customer Rebate"
+        action="customer_rebate_action"
+        parent="sale.product_menu_catalog"
+        sequence="102"
+    />
+</odoo>
\ No newline at end of file
diff --git a/indoteknik_custom/views/ir_sequence.xml b/indoteknik_custom/views/ir_sequence.xml
index 6798e5b4..86259b12 100644
--- a/indoteknik_custom/views/ir_sequence.xml
+++ b/indoteknik_custom/views/ir_sequence.xml
@@ -60,5 +60,15 @@
             <field name="number_next">1</field>
             <field name="number_increment">1</field>
         </record>
+
+        <record id="sequence_commision_customer" model="ir.sequence">
+            <field name="name">Customer Commision</field>
+            <field name="code">customer.commision</field>
+            <field name="active">TRUE</field>
+            <field name="prefix">CC/%(year)s/</field>
+            <field name="padding">5</field>
+            <field name="number_next">1</field>
+            <field name="number_increment">1</field>
+        </record>
     </data>
 </odoo>
\ No newline at end of file
diff --git a/indoteknik_custom/views/product_monitoring.xml b/indoteknik_custom/views/product_monitoring.xml
new file mode 100644
index 00000000..779a7dd7
--- /dev/null
+++ b/indoteknik_custom/views/product_monitoring.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <record id="product_monitoring_tree" model="ir.ui.view">
+        <field name="name">product.monitoring.tree</field>
+        <field name="model">product.monitoring</field>
+        <field name="arch" type="xml">
+            <tree create="false" multi_edit="1">
+                <field name="product_id"/>
+                <field name="outgoing_qty"/>
+                <field name="incoming_qty"/>
+                <field name="qty_available"/>
+                <field name="qty_upcoming"/>
+                <field name="status_stock"
+                       widget="badge"
+                       decoration-danger="status_stock == 'outgoing_gt_stock'"
+                       decoration-success="status_stock == 'outgoing_lt_stock'"
+                />
+            </tree>
+        </field>
+    </record>
+
+    <record id="product_monitoring_form" model="ir.ui.view">
+        <field name="name">product.monitoring.form</field>
+        <field name="model">product.monitoring</field>
+        <field name="arch" type="xml">
+            <form create="false" edit="false">
+                <sheet>
+                    <group>
+                        <group>
+                            <field name="product_id"/>
+                            <field name="outgoing_qty"/>
+                            <field name="incoming_qty"/>
+                            <field name="qty_available"/>
+                        </group>
+                    </group>
+                </sheet>
+            </form>
+        </field>
+    </record>
+
+    <record id="product_monitoring_action" model="ir.actions.act_window">
+        <field name="name">Product Monitoring</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">product.monitoring</field>
+        <field name="view_mode">tree,form</field>
+    </record>
+
+    <menuitem
+            id="menu_product_monitoring_in_purchase"
+            name="Product Monitoring"
+            parent="menu_monitoring_in_purchase"
+            sequence="1"
+            action="product_monitoring_action"
+    />
+</odoo>
\ No newline at end of file
diff --git a/indoteknik_custom/views/product_template.xml b/indoteknik_custom/views/product_template.xml
index a3a23101..92d2191e 100755
--- a/indoteknik_custom/views/product_template.xml
+++ b/indoteknik_custom/views/product_template.xml
@@ -10,9 +10,11 @@
                     <field name="web_tax_id"/>
                     <field name="x_manufacture"/>
                     <field name="x_model_product"/>
+                    <field name="kind_of"/>
                     <field name="x_studio_field_tGhJR" widget="many2many_tags"/>
                 </field>
                 <field name="uom_po_id" position="after">
+                    <field name="unpublished" />
                     <field name="desc_update_solr" readonly="1" />
                     <field name="last_update_solr" readonly="1" />
                 </field>
diff --git a/indoteknik_custom/views/purchase_order.xml b/indoteknik_custom/views/purchase_order.xml
index e0ec86f9..bc84bcd1 100755
--- a/indoteknik_custom/views/purchase_order.xml
+++ b/indoteknik_custom/views/purchase_order.xml
@@ -37,7 +37,7 @@
                 <field name="currency_id" position="after">
                     <field name="summary_qty_po"/>
                     <field name="count_line_product"/>
-                    <field name="payment_term_id"/>
+                    <field name="payment_term_id" required="1"/>
                 </field>
                 <field name="amount_total" position="after">
                     <field name="total_margin"/>
@@ -65,6 +65,7 @@
                 </field>
                 <field name="price_subtotal" position="after">
                     <field name="so_line_id" attrs="{'readonly': 1}" optional="hide"/>
+                    <field name="indent" optional="hide"/>
                 </field>
                 <page name="purchase_delivery_invoice" position="after">
                     <page name="purchase_vendor_bills" string="Vendor Bills" groups="indoteknik_custom.technical_administrator">
@@ -75,8 +76,10 @@
                 </page>
                 <field name="fiscal_position_id" position="after">
                     <field name="note_description"/>
+                    <field name="description"/>
                     <field name="total_so_percent_margin"/>
                     <field name="has_active_invoice" invisible="1" />
+                    <field name="responsible_ids" widget="many2many_tags"/>
                 </field>
 
                 <field name="order_line" position="attributes">
@@ -94,6 +97,12 @@
                 <xpath expr="//form/sheet/notebook/page/field[@name='order_line']/tree/field[@name='product_qty']" position="attributes">
                     <attribute name="attrs">{'readonly': [], 'required': True}</attribute>
                 </xpath>
+
+                <xpath expr="//form/sheet/notebook/page[@name='purchase_delivery_invoice']" position="before">
+                    <page string="Indent" name="purchase_order_lines_indent">
+                        <field name="purchase_order_lines"/>
+                    </page>
+                </xpath>
             </field>
         </record>
     </data>
@@ -106,6 +115,7 @@
             <field name="arch" type="xml">
                 <field name="create_date" position="after">
                     <field name="approval_status" />
+                    <field name="responsible_ids" widget="many2many_tags" optional="hide"/>
                 </field>
             </field>
         </record>
@@ -121,6 +131,7 @@
                     <field name="po_status"/>
                     <field name="note_description" optional="hide"/>
                     <field name="sale_order_id" optional="hide"/>
+                    <field name="responsible_ids" widget="many2many_tags" optional="hide"/>
                 </field>
             </field>
         </record>
@@ -138,7 +149,7 @@
         </record>
     </data>
     <data>
-        <record id="purchase_order_search_inherit" model="ir.ui.view">
+        <record id="rfq_order_search_inherit" model="ir.ui.view">
             <field name="name">purchase.order.select.inherit</field>
             <field name="model">purchase.order</field>
             <field name="inherit_id" ref="purchase.view_purchase_order_filter"/>
@@ -149,4 +160,30 @@
             </field>
         </record>
     </data>
+    <data>
+        <record id="cron_stock_scheduler_compute" model="ir.cron">
+            <field name="name">Run Scheduler Reserve Stock</field>
+            <field name="interval_number">1</field>
+            <field name="interval_type">hours</field>
+            <field name="numbercall">-1</field>
+            <field name="doall" eval="False"/>
+            <field name="model_id" ref="model_stock_scheduler_compute"/>
+            <field name="code">model.procure_calculation()</field>
+            <field name="state">code</field>
+            <field name="priority">75</field>
+            <field name="active">True</field>
+        </record>
+    </data>
+    <data>
+        <record id="purchase_order_line_indent_tree" model="ir.ui.view">
+        <field name="name">purchase.order.line.indent.tree</field>
+        <field name="model">purchase.order.line</field>
+        <field name="arch" type="xml">
+            <tree editable="top" create="false" delete="false">
+                <field name="product_id" readonly="1"/>
+                <field name="indent"/>
+            </tree>
+        </field>
+    </record>
+    </data>
 </odoo>
\ No newline at end of file
diff --git a/indoteknik_custom/views/purchase_pricelist.xml b/indoteknik_custom/views/purchase_pricelist.xml
index f9fd52ba..f4cd4e78 100755
--- a/indoteknik_custom/views/purchase_pricelist.xml
+++ b/indoteknik_custom/views/purchase_pricelist.xml
@@ -11,6 +11,8 @@
                 <field name="system_price"/>
                 <field name="human_last_update"/>
                 <field name="system_last_update"/>
+                <field name="count_trx_po"/>
+                <field name="count_trx_po_vendor"/>
             </tree>
         </field>
     </record>
@@ -27,6 +29,10 @@
                             <field name="vendor_id" context="{'res_partner_search_mode': 'supplier'}"/>
                             <field name="product_price"/>
                             <field name="system_price"/>
+                            <field name="human_last_update"/>
+                            <field name="system_last_update"/>
+                            <field name="count_trx_po"/>
+                            <field name="count_trx_po_vendor"/>
                         </group>
                     </group>
                 </sheet>
diff --git a/indoteknik_custom/views/requisition.xml b/indoteknik_custom/views/requisition.xml
index e7335a57..e9c3b4e0 100644
--- a/indoteknik_custom/views/requisition.xml
+++ b/indoteknik_custom/views/requisition.xml
@@ -62,16 +62,6 @@
                             </group>
                             <group>
                                 <div>
-                                <button name="create_requisition_from_sales"
-                                    string="Create Line"
-                                    type="object"
-                                    class="mr-2 oe_highlight"
-                                />
-                                <button name="create_requisition_from_sales_with_price"
-                                    string="Create Line with Price"
-                                    type="object"
-                                    class="mr-2 oe_highlight"
-                                />
                                 <button name="create_po_from_requisition"
                                     string="Create PO"
                                     type="object"
@@ -82,13 +72,26 @@
                         </group>
                         <notebook>
                             <page string="Lines">
-                                <field name="requisition_lines"/>
+                                <field name="requisition_lines">
+                                    <tree editable="line">
+                                        <field name="product_id"/>
+                                        <field name="partner_id"/>
+                                        <field name="qty_purchase"/>
+                                        <field name="price_unit"/>
+                                        <field name="subtotal"/>
+                                        <field name="brand_id"/>
+                                    </tree>
+                                </field>
                             </page>
                             <page string="Matches">
                                 <field name="requisition_match"/>
                             </page>
                         </notebook>
                     </sheet>
+                    <div class="oe_chatter">
+                        <field name="message_follower_ids" widget="mail_followers"/>
+                        <field name="message_ids" widget="mail_thread"/>
+                    </div>
             </form>
         </field>
     </record>
diff --git a/indoteknik_custom/views/res_partner.xml b/indoteknik_custom/views/res_partner.xml
index d609fdd5..c1ae3ed3 100644
--- a/indoteknik_custom/views/res_partner.xml
+++ b/indoteknik_custom/views/res_partner.xml
@@ -14,6 +14,8 @@
                 <field name="industry_id" position="after">
                     <field name="company_type_id"/>
                     <field name="group_partner_id"/>
+                    <field name="is_potential"/>
+                    <field name="digital_invoice_tax"/>
                 </field>
                 <field name="npwp" position="before">
                     <field name="customer_type"/>
diff --git a/indoteknik_custom/views/sale_monitoring.xml b/indoteknik_custom/views/sale_monitoring.xml
index 641eb8fb..207277af 100755
--- a/indoteknik_custom/views/sale_monitoring.xml
+++ b/indoteknik_custom/views/sale_monitoring.xml
@@ -4,7 +4,7 @@
         <field name="name">sale.monitoring.tree</field>
         <field name="model">sale.monitoring</field>
         <field name="arch" type="xml">
-            <tree create="false" multi_edit="1">
+            <tree create="false" multi_edit="1" default_order="date_order asc">
                 <header>
                     <button name="action_refresh" string="Refresh" class="oe_highlight" type="object" />
                 </header>
@@ -18,6 +18,7 @@
                 <field name="qty_po_received"/>
                 <field name="qty_so_delivered"/>
                 <field name="qty_so_invoiced"/>
+                <field name="purchase_representative_id"/>
                 <field name="status"
                        widget="badge"
                        decoration-danger="status == 'Belum/Kurang PO'"
@@ -25,7 +26,8 @@
                         decoration-success="status == 'Siap kirim'"
                         decoration-info="status == 'Delivered' or status == 'Invoiced'"
                 />
-                <field name="note"/>
+                <field name="note_so_line"/>
+                <field name="note" optional="hide"/>
             </tree>
         </field>
     </record>
@@ -49,7 +51,8 @@
                                    decoration-info="status == 'Delivered' or status == 'Invoiced'"
                             />
                             <field name="po_number"/>
-                            <field name="note"/>
+                            <field name="note_so_line"/>
+                            <field name="note" optional="hide"/>
                         </group>
                         <group>
                             <field name="qty_so"/>
@@ -58,6 +61,7 @@
                             <field name="qty_po_received"/>
                             <field name="qty_so_delivered"/>
                             <field name="qty_so_invoiced"/>
+                            <field name="purchase_representative_id"/>
                         </group>
                     </group>
                 </sheet>
diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml
index e0e9ac54..125296e3 100755
--- a/indoteknik_custom/views/sale_order.xml
+++ b/indoteknik_custom/views/sale_order.xml
@@ -45,12 +45,12 @@
                     <field name="helper_by_id" readonly="1"/>
                 </field>
                 <field name="analytic_account_id" position="after">
-                    <field name="customer_type" attrs="{'required': ['|', ('create_date', '&gt;', '2023-06-28'), ('create_date', '=', False)]}"/>
-                    <field name="npwp" placeholder='99.999.999.9-999.999' attrs="{'required': ['|', ('create_date', '&gt;', '2023-06-28'), ('create_date', '=', False)]}"/>
-                    <field name="sppkp" attrs="{'invisible': [('customer_type','!=','pkp')], 'required': [('customer_type', '=', 'pkp')]}"/>
+                    <field name="customer_type" required="1"/>
+                    <field name="npwp" placeholder='99.999.999.9-999.999' required="1"/>
+                    <field name="sppkp" attrs="{'required': [('customer_type', '=', 'pkp')]}"/>
                     <field name="email" required="1"/>
                     <field name="due_id" readonly="1"/>
-                    <field name="source_id" domain="[('id', 'in', [32, 59, 60, 61])]" attrs="{'required':[('create_date', '&gt;', '2023-09-10')]}"/>
+                    <field name="source_id" domain="[('id', 'in', [32, 59, 60, 61])]" required="1"/>
                 </field>
                 <field name="partner_shipping_id" position="after">
                     <field name="real_shipping_id"/>
@@ -92,6 +92,7 @@
                     "/>
                     <field name="purchase_tax_id" attrs="{'readonly': [('parent.approval_status', '!=', False)]}" domain="[('type_tax_use','=','purchase')]"/>
                     <field name="item_percent_margin"/>
+                    <field name="note" optional="hide"/>
                     <field name="note_procurement" optional="hide"/>
                     <field name="vendor_subtotal" optional="hide"/>
                     <field name="amount_voucher_disc" string="Voucher" readonly="1" optional="hide"/>
diff --git a/indoteknik_custom/views/stock_picking.xml b/indoteknik_custom/views/stock_picking.xml
index 9f03235d..b0932d5a 100644
--- a/indoteknik_custom/views/stock_picking.xml
+++ b/indoteknik_custom/views/stock_picking.xml
@@ -15,6 +15,7 @@
                     <field name="driver_departure_date" optional="hide"/>
                     <field name="driver_arrival_date" optional="hide"/>
                     <field name="note_logistic" optional="hide"/>
+                    <field name="note" optional="hide"/>
                 </field>
                 <field name="partner_id" position="after">
                     <field name="purchase_representative_id"/>
@@ -71,6 +72,7 @@
                     />
                 </field>
                 <field name="group_id" position="before">
+                    <field name="date_reserved"/>
                     <field name="is_internal_use"
                            string="Internal Use"
                            type="object"
diff --git a/indoteknik_custom/views/stock_warehouse_orderpoint.xml b/indoteknik_custom/views/stock_warehouse_orderpoint.xml
new file mode 100644
index 00000000..038b09cc
--- /dev/null
+++ b/indoteknik_custom/views/stock_warehouse_orderpoint.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <data>
+        <record id="stock_warehouse_orderpoint_inherit" model="ir.ui.view">
+            <field name="name">stock.warehouse.orderpoint.tree</field>
+            <field name="model">stock.warehouse.orderpoint</field>
+            <field name="inherit_id" ref="stock.view_warehouse_orderpoint_tree_editable_config"/>
+            <field name="arch" type="xml">
+                <field name="product_uom_name" position="after">
+                    <field name="responsible_id" optional="hide"/>
+                </field>
+            </field>
+        </record>
+    </data>
+</odoo>
\ No newline at end of file
diff --git a/indoteknik_custom/views/users.xml b/indoteknik_custom/views/users.xml
index d67b4474..020d8ddc 100644
--- a/indoteknik_custom/views/users.xml
+++ b/indoteknik_custom/views/users.xml
@@ -13,6 +13,7 @@
                     <field name="is_leader"/>
                     <field name="is_logistic_approver"/>
                     <field name="is_editor_product"/>
+                    <field name="is_admin_reconcile"/>
                 </field>
             </field>
         </record>
diff --git a/indoteknik_custom/views/x_manufactures.xml b/indoteknik_custom/views/x_manufactures.xml
index f68a0e00..d413be12 100755
--- a/indoteknik_custom/views/x_manufactures.xml
+++ b/indoteknik_custom/views/x_manufactures.xml
@@ -24,6 +24,7 @@
                     <field name="x_manufacture_service_center"/>
                     <field name="cache_reset_status"/>
                     <field name="parent_id"/>
+                    <field name="user_id" optional="hide"/>
                 </tree>
             </field>
         </record>
@@ -46,6 +47,7 @@
                                 <field name="cache_reset_status"/>
                                 <field name="parent_id"/>
                                 <field name="category_ids" widget="many2many_tags"/>
+                                <field name="user_id"/>
                             </group>
                             <group>
                                 <field name="x_logo_manufacture" widget="image"/>