Merged in development (pull request #1)

Development

2 files changed, 59 insertions, 0 deletions

diff --git a/indoteknik_custom/views/account_asset_views.xml b/indoteknik_custom/views/account_asset_views.xml
new file mode 100644
index 00000000..90c53623
--- /dev/null
+++ b/indoteknik_custom/views/account_asset_views.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <data>
+        <record id="account_asset_form_view_inherit" model="ir.ui.view">
+            <field name="name">Account Asset</field>
+            <field name="model">account.asset.asset</field>
+            <field name="inherit_id" ref="base_accounting_kit.view_account_asset_asset_form"/>
+            <field name="arch" type="xml">
+                <button name="set_to_draft" position="after">
+                    <button name="action_close_asset"
+                            string="Close Asset"
+                            type="object"
+                    />
+                </button>
+            </field>
+        </record>
+    </data>
+</odoo>
\ No newline at end of file
diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml
new file mode 100755
index 00000000..82058837
--- /dev/null
+++ b/indoteknik_custom/views/sale_order.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <data>
+        <record id="sale_order_form_view_inherit" model="ir.ui.view">
+            <field name="name">Sale Order</field>
+            <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="approval_status" />
+                </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="item_percent_margin" groups="sales_team.group_sale_manager"/>
+                </xpath>
+                <field name="amount_total" position="after">
+                    <field name="total_margin" groups="sales_team.group_sale_manager"/>
+                    <field name="total_percent_margin" groups="sales_team.group_sale_manager"/>
+                </field>
+            </field>
+        </record>
+    </data>
+    <data>
+        <record id="sale_order_tree_view_inherit" model="ir.ui.view">
+            <field name="name">Sale Order</field>
+            <field name="model">sale.order</field>
+            <field name="inherit_id" ref="sale.view_quotation_tree_with_onboarding"/>
+            <field name="arch" type="xml">
+                <field name="state" position="after">
+                    <field name="approval_status" />
+                </field>
+            </field>
+        </record>
+    </data>
+</odoo>
\ No newline at end of file