<hafid> merging & fix tempo

4 files changed, 88 insertions, 6 deletions

diff --git a/indoteknik_custom/views/res_partner.xml b/indoteknik_custom/views/res_partner.xml
index cb9fa3ac..30b5ca36 100644
--- a/indoteknik_custom/views/res_partner.xml
+++ b/indoteknik_custom/views/res_partner.xml
@@ -65,6 +65,21 @@
                 <group name="purchase" position="inside">
                     <field name="leadtime"/>
                 </group>
+                <xpath expr="//notebook/page[@name='contact_addresses']" position="before">
+                    <page string="Pin Point Location" name="map_location">
+                        <group>
+                            <button name="geocode_address" type="object" string="Get Pin Point Location" class="btn btn-primary"/>
+                        </group>
+                        <div style="margin: 16px 0;">
+                            <field name="map_view" widget="googlemap" nolabel="1"/>
+                        </div>
+                        <group>
+                            <field name="address_map" readonly="1" force_save="1"/>
+                            <field name="latitude" readonly="1" force_save="1"/>
+                            <field name="longtitude" readonly="1" force_save="1"/>
+                        </group>
+                    </page>
+                </xpath>
                 <field name="vat" position="after">
                     <field name="email_finance" widget="email"/>
                     <field name="email_sales" widget="email"/>
@@ -78,6 +93,15 @@
                     <field name="main_parent_id" invisible="1" />
                     <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='child_ids']/form/sheet/group" position="after">
+                    <div class="oe_left" style="margin-top: 16px;">
+                        <button name="action_open_full_form"
+                                type="object"
+                                string="Detail Information"
+                                class="btn btn-primary"
+                                />
+                    </div>
+                </xpath>
                 <xpath expr="//field[@name='property_payment_term_id']" position="attributes">
                     <attribute name="readonly">0</attribute>
                 </xpath>
diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml
index 4b74825e..d0442677 100755
--- a/indoteknik_custom/views/sale_order.xml
+++ b/indoteknik_custom/views/sale_order.xml
@@ -134,10 +134,11 @@
                     <field name="real_invoice_id"/>
                     <field name="approval_status"/>
                     <field name="sales_tax_id"
-                           domain="[('type_tax_use','=','sale'), ('active', '=', True)]" required="1"/>
-                    <field name="carrier_id" required="1"/>
-                    <field name="delivery_service_type" readonly="1"/>
-                    <field name="shipping_option_id"/>
+                        domain="[('type_tax_use','=','sale'), ('active', '=', True)]" required="1" />
+                    <field name="select_shipping_option"/>
+                    <field name="carrier_id" required="1" domain="[]" />
+                    <field name="delivery_service_type" readonly="1" />
+                    <field name="shipping_option_id" />
                 </field>
                 <field name="medium_id" position="after">
                     <field name="date_doc_kirim" readonly="1"/>
@@ -302,10 +303,14 @@
                     <field name="picking_iu_id"/>
                     <field name="note_ekspedisi"/>
                 </field>
+                <field name="select_shipping_option" position="attributes">
+                    <attribute name="attrs">
+                        {'readonly': [('state', 'in', ['cancel', 'done'])]}
+                    </attribute>
+                </field>
                 <field name="carrier_id" position="attributes">
                     <attribute name="attrs">
-                        {'readonly': [('approval_status', '=', 'approved'), ('state', 'not in',
-                                                                             ['cancel', 'draft'])]}
+                        {'readonly': [('state', 'in', ['cancel', 'done'])]}
                     </attribute>
                 </field>
                 <field name="payment_term_id" position="attributes">
diff --git a/indoteknik_custom/views/sale_order_delay.xml b/indoteknik_custom/views/sale_order_delay.xml
new file mode 100644
index 00000000..b2aad8eb
--- /dev/null
+++ b/indoteknik_custom/views/sale_order_delay.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <record id="view_sale_order_delay_tree" model="ir.ui.view">
+        <field name="name">sale.order.delay.tree</field>
+        <field name="model">sale.order.delay</field>
+        <field name="arch" type="xml">
+            <tree>
+                <field name="so_number" />
+                <field name="days_delayed" />
+                <field name="status" />
+            </tree>
+        </field>
+    </record>
+
+    <record id="sale_order_delay_action" model="ir.actions.act_window">
+        <field name="name">Sale Order Delay</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">sale.order.delay</field>
+        <field name="view_mode">tree,form</field>
+    </record>
+
+    <record id="view_sale_order_delay_form" model="ir.ui.view">
+        <field name="name">sale.order.delay.form</field>
+        <field name="model">sale.order.delay</field>
+        <field name="arch" type="xml">
+            <form>
+                <sheet>
+                    <group>
+                        <field name="so_number" />
+                        <field name="days_delayed" />
+                        <field name="status" />
+                    </group>
+                </sheet>
+            </form>
+        </field>
+    </record>
+
+    <menuitem id="menu_sale_order_delay"
+        name="Sale Order Delay"
+         action="sale_order_delay_action"
+        parent="sale.product_menu_catalog"
+        sequence="8"
+    />
+</odoo>
\ No newline at end of file
diff --git a/indoteknik_custom/views/stock_picking.xml b/indoteknik_custom/views/stock_picking.xml
index ae77ab9a..97a9fbed 100644
--- a/indoteknik_custom/views/stock_picking.xml
+++ b/indoteknik_custom/views/stock_picking.xml
@@ -63,6 +63,12 @@
                             string="Biteship"
                             type="object"
                     />
+                     <button name="action_sync_biteship_tracking"
+                        type="object"
+                        string="Lacak dari Biteship"
+                        class="btn-primary"
+                        attrs="{'invisible': [('biteship_id', '=', False)]}"
+                    />
                     <button name="track_envio_shipment"
                             string="Tracking Envio"
                             type="object"
@@ -91,7 +97,9 @@
                     />
                 </button>
                 <field name="backorder_id" position="after">
+                    <field name="select_shipping_option_so"/>
                     <field name="shipping_method_so_id"/>
+                    <field name="shipping_option_so_id"/>
                     <field name="summary_qty_detail"/>
                     <field name="count_line_detail"/>
                     <field name="dokumen_tanda_terima"/>
@@ -184,6 +192,7 @@
                                 <field name="note_info"/>
                                 <field name="responsible" />
                                 <field name="carrier_id"/>
+                                <field name="biteship_id" invisible="1"/>
                                 <field name="out_code" attrs="{'invisible': [['out_code', '=', False]]}"/>
                                 <field name="picking_code" attrs="{'invisible': [['picking_code', '=', False]]}"/>
                                 <field name="picking_code" string="Picking code (akan digenerate ketika sudah di-validate)" attrs="{'invisible': [['picking_code', '!=', False]]}"/>