Merge branch 'production' into iman/telegram

# Conflicts:
#	indoteknik_custom/models/stock_picking.py

4 files changed, 46 insertions, 1 deletions

diff --git a/indoteknik_custom/views/product_template.xml b/indoteknik_custom/views/product_template.xml
index b6599137..af21984a 100755
--- a/indoteknik_custom/views/product_template.xml
+++ b/indoteknik_custom/views/product_template.xml
@@ -20,6 +20,7 @@
                     <field name="unpublished" />
                     <field name="desc_update_solr" readonly="1" />
                     <field name="last_update_solr" readonly="1" />
+                    <!-- <field name="qr_code" widget="image" invisible="1"/> -->
                 </field>
                 <field name="public_categ_ids" position="attributes">
                     <attribute name="required">0</attribute>
@@ -29,6 +30,10 @@
                         <field name="merchandise_ok"/>
                         <label for="merchandise_ok"/>
                     </div>
+                    <div>
+                        <field name="print_barcode"/>
+                        <label for="print_barcode"/>
+                    </div>
                 </div>
                 <field name="public_categ_ids" position="attributes">
                     <attribute name="options">{'no_create': True}</attribute>
@@ -58,6 +63,7 @@
             <field name="arch" type="xml">
                 <field name="last_update_solr" position="after">
                     <field name="clean_website_description" />
+                    <field name="qr_code_variant" widget="image" readonly="True"/>
                 </field>
             </field>
         </record>
diff --git a/indoteknik_custom/views/purchase_order.xml b/indoteknik_custom/views/purchase_order.xml
index 0e6b6792..d22c3b5c 100755
--- a/indoteknik_custom/views/purchase_order.xml
+++ b/indoteknik_custom/views/purchase_order.xml
@@ -41,6 +41,7 @@
                 </field>
                 <field name="approval_status" position="after">
                     <field name="revisi_po"/>
+                    <field name="not_update_purchasepricelist"/>
                 </field>
                 <field name="incoterm_id" position="after">
                     <field name="amount_total_without_service"/>
diff --git a/indoteknik_custom/views/res_partner.xml b/indoteknik_custom/views/res_partner.xml
index 712ebdd2..472569eb 100644
--- a/indoteknik_custom/views/res_partner.xml
+++ b/indoteknik_custom/views/res_partner.xml
@@ -76,7 +76,7 @@
                     <field name="site_id" attrs="{'readonly': [('parent_id', '=', False)]}" domain="[('partner_id', '=', main_parent_id)]" context="{'default_partner_id': active_id}" />
                 </xpath>
                 <xpath expr="//field[@name='property_payment_term_id']" position="attributes">
-                    <attribute name="readonly">1</attribute>
+                    <attribute name="readonly">0</attribute>
                 </xpath>
                 <xpath expr="//field[@name='property_supplier_payment_term_id']" position="attributes">
                     <attribute name="readonly">1</attribute>
diff --git a/indoteknik_custom/views/stock_picking.xml b/indoteknik_custom/views/stock_picking.xml
index 1893fcaf..fab83885 100644
--- a/indoteknik_custom/views/stock_picking.xml
+++ b/indoteknik_custom/views/stock_picking.xml
@@ -56,6 +56,11 @@
                             string="Biteship"
                             type="object"
                     />
+                    <button name="track_envio_shipment"
+                            string="Tracking Envio"
+                            type="object"
+                            attrs="{'invisible': [('carrier_id', '!=', 151)]}"
+                    />
                 </button>
                 <field name="backorder_id" position="after">
                     <field name="summary_qty_detail"/>
@@ -115,6 +120,8 @@
                 </field>
                 <field name="product_uom" position="after">
                     <field name="sale_id" attrs="{'readonly': 1}" optional="hide"/>
+                    <field name="print_barcode" optional="hide"/>
+                    <field name="qr_code_variant" widget="image" optional="hide"/>
                 </field>
                 <page name="note" position="after">
                     <page string="E-Faktur" name="efaktur" attrs="{'invisible': [['is_internal_use', '=', False]]}">
@@ -143,13 +150,44 @@
                                 <field name="sj_documentation" widget="image" />
                                 <field name="paket_documentation" widget="image" />
                             </group>
+                            <group>
+                                <field name="envio_id" invisible="1"/>
+                                <field name="envio_code"/>
+                                <field name="envio_ref_code"/>
+                                <field name="envio_eta_at"/>
+                                <field name="envio_ata_at"/>
+                                <field name="envio_etd_at" invisible="1"/>
+                                <field name="envio_atd_at" invisible="1"/>
+                                <field name="envio_received_by"/>
+                                <field name="envio_status"/>
+                                <field name="envio_cod_value" invisible="1"/>
+                                <field name="envio_cod_status" invisible="1"/>
+                                <field name="envio_latest_message"/>
+                                <field name="envio_latest_recorded_at"/>
+                                <field name="envio_latest_latitude" invisible="1"/>
+                                <field name="envio_latest_longitude" invisible="1"/>
+                                <field name="tracking_by" invisible="1"/>
+                            </group>
                         </group>
                     </page>
+                    <!-- <page string="Check Product" name="check_product">
+                        <field name="check_product_lines"/>
+                    </page> -->
                 </page>
                 
             </field>
         </record>
 
+        <!-- <record id="check_product_tree" model="ir.ui.view">
+            <field name="name">check.product.tree</field>
+            <field name="model">check.product</field>
+            <field name="arch" type="xml">
+                <tree editable="bottom">
+                    <field name="product_id"/>
+                </tree>
+            </field>
+        </record> -->
+
         <record id="view_stock_move_line_detailed_operation_tree_inherit" model="ir.ui.view">
             <field name="name">stock.move.line.operations.tree.inherit</field>
             <field name="model">stock.move.line</field>