Merge branch 'production' into cr/auth

# Conflicts:
#	indoteknik_custom/__manifest__.py

1 files changed, 19 insertions, 0 deletions

diff --git a/indoteknik_custom/views/purchase_order.xml b/indoteknik_custom/views/purchase_order.xml
index d564f260..8f7ea6df 100755
--- a/indoteknik_custom/views/purchase_order.xml
+++ b/indoteknik_custom/views/purchase_order.xml
@@ -79,6 +79,7 @@
                     <field name="description"/>
                     <field name="total_so_percent_margin"/>
                     <field name="has_active_invoice" invisible="1" />
+                    <field name="purchase_order_lines"/>
                 </field>
 
                 <field name="order_line" position="attributes">
@@ -96,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>
@@ -165,4 +172,16 @@
             <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