Merge commit '1d6351cbab4df3a5f5ceff92c53560437d7b40a4'

3 files changed, 70 insertions, 1 deletions

diff --git a/indoteknik_custom/views/purchase_order.xml b/indoteknik_custom/views/purchase_order.xml
index f209d18a..a8b71d5a 100755
--- a/indoteknik_custom/views/purchase_order.xml
+++ b/indoteknik_custom/views/purchase_order.xml
@@ -14,8 +14,45 @@
                             attrs="{'invisible': ['|', ('sale_order_id', '=', False), ('state', 'not in', ['draft'])]}"
                     />
                 </div>
+                <button id="draft_confirm" position="after">
+                    <button name="po_approve"
+                            string="Ask Approval"
+                            type="object"
+                    />
+                </button>
                 <field name="date_order" position="before">
                     <field name="sale_order_id" attrs="{'readonly': [('state', 'not in', ['draft'])]}"/>
+                    <field name="approval_status"/>
+                </field>
+                <field name="amount_total" position="after">
+                    <field name="total_margin"/>
+                    <field name="total_so_margin"/>
+                    <field name="total_percent_margin"/>
+                    <field name="total_so_percent_margin"/>
+                </field>
+            </field>
+        </record>
+    </data>
+    <data>
+        <record id="rfq_order_tree_view_inherit" model="ir.ui.view">
+            <field name="name">Purchase</field>
+            <field name="model">purchase.order</field>
+            <field name="inherit_id" ref="purchase.purchase_order_kpis_tree"/>
+            <field name="arch" type="xml">
+                <field name="create_date" position="after">
+                    <field name="approval_status" />
+                </field>
+            </field>
+        </record>
+    </data>
+    <data>
+        <record id="purchase_order_tree_view_inherit" model="ir.ui.view">
+            <field name="name">Purchase</field>
+            <field name="model">purchase.order</field>
+            <field name="inherit_id" ref="purchase.purchase_order_view_tree"/>
+            <field name="arch" type="xml">
+                <field name="invoice_status" position="after">
+                    <field name="procurement_status" />
                 </field>
             </field>
         </record>
diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml
index 19182a6b..0abbae94 100755
--- a/indoteknik_custom/views/sale_order.xml
+++ b/indoteknik_custom/views/sale_order.xml
@@ -6,11 +6,26 @@
             <field name="model">sale.order</field>
             <field name="inherit_id" ref="sale.view_order_form"/>
             <field name="arch" type="xml">
+                <button id="action_confirm" position="after">
+                    <button name="sale_order_approve"
+                            string="Ask Approval"
+                            type="object"
+                    />
+                </button>
                 <field name="payment_term_id" position="after">
+                    <field name="shipping_cost_covered"/>
+                    <field name="shipping_paid_by"/>
+                    <field name="delivery_amt"/>
+                </field>
+                <field name="partner_shipping_id" position="after">
                     <field name="approval_status" />
+                    <field name="sales_tax_id" domain="[('type_tax_use','=','sale')]"/>
+                    <field name="carrier_id"/>
                 </field>
                 <xpath expr="//form/sheet/notebook/page/field[@name='order_line']/tree/field[@name='price_total']" position="after">
-                    <field name="item_margin" groups="sales_team.group_sale_manager"/>
+                    <field name="vendor_id" attrs="{'readonly': [('parent.state', 'not in', ['draft', 'sent', 'sale'])]}"/>
+                    <field name="purchase_price" attrs="{'readonly': [('parent.state', 'not in', ['draft', 'sent', 'sale'])]}"/>
+                    <field name="purchase_tax_id" attrs="{'readonly': [('parent.state', 'not in', ['draft', 'sent', 'sale'])]}"/>
                     <field name="item_percent_margin" groups="sales_team.group_sale_manager"/>
                 </xpath>
                 <field name="amount_total" position="after">
diff --git a/indoteknik_custom/views/users.xml b/indoteknik_custom/views/users.xml
new file mode 100644
index 00000000..d75b35fc
--- /dev/null
+++ b/indoteknik_custom/views/users.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <data>
+        <record id="users_form_view_inherit" model="ir.ui.view">
+            <field name="name">User</field>
+            <field name="model">res.users</field>
+            <field name="inherit_id" ref="base.view_users_form"/>
+            <field name="arch" type="xml">
+                <field name="tz_offset" position="after">
+                    <field name="is_purchasing_manager"/>
+                    <field name="is_sales_manager"/>
+                    <field name="is_leader"/>
+                </field>
+            </field>
+        </record>
+    </data>
+</odoo>
\ No newline at end of file