Merge branch 'production' of bitbucket.org:altafixco/indoteknik-addons into production

# Conflicts:
#	indoteknik_custom/__manifest__.py
#	indoteknik_custom/models/__init__.py

7 files changed, 41 insertions, 0 deletions

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/product_template.xml b/indoteknik_custom/views/product_template.xml
index 6fdb5e8f..92d2191e 100755
--- a/indoteknik_custom/views/product_template.xml
+++ b/indoteknik_custom/views/product_template.xml
@@ -10,6 +10,7 @@
                     <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">
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
diff --git a/indoteknik_custom/views/res_partner.xml b/indoteknik_custom/views/res_partner.xml
index d609fdd5..ef4898d0 100644
--- a/indoteknik_custom/views/res_partner.xml
+++ b/indoteknik_custom/views/res_partner.xml
@@ -14,6 +14,7 @@
                 <field name="industry_id" position="after">
                     <field name="company_type_id"/>
                     <field name="group_partner_id"/>
+                    <field name="digital_invoice_tax"/>
                 </field>
                 <field name="npwp" position="before">
                     <field name="customer_type"/>
diff --git a/indoteknik_custom/views/stock_picking.xml b/indoteknik_custom/views/stock_picking.xml
index 3702dcf8..b0932d5a 100644
--- a/indoteknik_custom/views/stock_picking.xml
+++ b/indoteknik_custom/views/stock_picking.xml
@@ -72,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/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"/>