Merge branch 'production' into feature/voucher-group

4 files changed, 75 insertions, 0 deletions

diff --git a/indoteknik_custom/views/account_account_views.xml b/indoteknik_custom/views/account_account_views.xml
new file mode 100644
index 00000000..875d5a6b
--- /dev/null
+++ b/indoteknik_custom/views/account_account_views.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <data>
+        <record id="account_account_view_inherit" model="ir.ui.view">
+            <field name="name">account.account.list</field>
+            <field name="model">account.account</field>
+            <field name="inherit_id" ref="account.view_account_list"/>
+            <field name="arch" type="xml">
+                <field name="currency_id" position="after">
+                    <field name="analytic_tag_ids" optional="show" widget="many2many_tags"/>
+                </field>
+            </field>
+        </record>
+    </data>
+</odoo>
\ No newline at end of file
diff --git a/indoteknik_custom/views/account_move_line.xml b/indoteknik_custom/views/account_move_line.xml
new file mode 100644
index 00000000..5b5f73cd
--- /dev/null
+++ b/indoteknik_custom/views/account_move_line.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <data>
+        <record id="view_move_form_inherit" model="ir.ui.view">
+            <field name="name">account.move.form.inherit</field>
+            <field name="model">account.move</field>
+            <field name="inherit_id" ref="account.view_move_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="//page[@id='aml_tab']/field[@name='line_ids']/tree/field[@name='currency_id']" position="before">
+                    <field name="is_required" invisible="1"/>
+                </xpath>
+                <xpath expr="//page[@id='aml_tab']/field[@name='line_ids']/tree/field[@name='analytic_tag_ids']" position="attributes">
+                    <attribute name="groups"/>
+                </xpath>
+            </field>
+        </record>
+    </data>
+</odoo>
diff --git a/indoteknik_custom/views/cost_centre.xml b/indoteknik_custom/views/cost_centre.xml
new file mode 100644
index 00000000..3e4d2736
--- /dev/null
+++ b/indoteknik_custom/views/cost_centre.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <record id="cost_centre_tree" model="ir.ui.view">
+        <field name="name">cost.centre.tree</field>
+        <field name="model">cost.centre</field>
+        <field name="arch" type="xml">
+            <tree editable="top">
+                <field name="name"/>
+                <field name="description"/>
+            </tree>
+        </field>
+    </record>
+
+    <record id="cost_centre_form" model="ir.ui.view">
+        <field name="name">cost.centre.form</field>
+        <field name="model">cost.centre</field>
+        <field name="arch" type="xml">
+            <form>
+                <sheet string="Cost Centre">
+                    <group>
+                        <group>
+                            <field name="name" required="1"/>
+                            <field name="description"/>
+                        </group>
+                    </group>
+                </sheet>
+            </form>
+        </field>
+    </record>
+
+    <record id="cost_centre_action" model="ir.actions.act_window">
+        <field name="name">Cost Centre</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">cost.centre</field>
+        <field name="view_mode">tree,form</field>
+    </record>
+
+    <menuitem name="Cost Centre" action="cost_centre_action"
+        id="menu_cost_centre"
+        parent="account.menu_finance_entries" sequence="112"/>
+</odoo>
\ No newline at end of file
diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml
index bbfc9e3b..d37b5d1e 100755
--- a/indoteknik_custom/views/sale_order.xml
+++ b/indoteknik_custom/views/sale_order.xml
@@ -108,6 +108,7 @@
                 </field>
                 <field name="effective_date" position="after">
                     <field name="carrier_id"/>
+                    <field name="estimated_arrival_days"/>
                 </field>
 
                 <page name="customer_signature" position="after">