Merge branch 'odoo-backup' of https://bitbucket.org/altafixco/indoteknik-addons into approve_by_value

3 files changed, 56 insertions, 0 deletions

diff --git a/indoteknik_custom/views/purchase_order.xml b/indoteknik_custom/views/purchase_order.xml
index 59e317d2..9651cdd6 100755
--- a/indoteknik_custom/views/purchase_order.xml
+++ b/indoteknik_custom/views/purchase_order.xml
@@ -46,6 +46,19 @@
                     </button>
                 </xpath>
                 <button id="draft_confirm" position="after">
+                    <button name="action_create_order_altama"
+                        type="object"
+                        string="Create Order Altama"
+                        class="oe_highlight"
+                        icon="fa-cloud-upload"
+                        attrs="{'invisible': [('partner_id', '!=', 5571)]}"
+                    />
+                    <button name="action_get_order_altama"
+                        type="object"
+                        string="Get Order Altama"
+                        class="oe_highlight"
+                        attrs="{'invisible': [('partner_id', '!=', 5571)]}"
+                        icon="fa-cloud-download"/>
                     <button name="po_approve"
                             string="Ask Approval"
                             type="object"
@@ -76,6 +89,10 @@
                 </field>
                 <field name="approval_status" position="after">
                     <field name="revisi_po"/>
+                    <field name="soo_number" attrs="{'invisible': [('partner_id', '!=', 5571)]}"/>
+                    <field name="soo_price" attrs="{'invisible': [('partner_id', '!=', 5571)]}"/>
+                    <field name="soo_discount" attrs="{'invisible': [('partner_id', '!=', 5571)]}"/>
+                    <field name="soo_tax" attrs="{'invisible': [('partner_id', '!=', 5571)]}"/>
                     <field name="not_update_purchasepricelist"/>
                 </field>
                 <field name="approval_status" position="after">
@@ -153,8 +170,13 @@
                 </field>
                 <field name="price_unit" position="after">
                     <field name="price_vendor" attrs="{'readonly': 1}" optional="hide"/>
+                    <field name="description" optional="hide"/>
+                    <field name="docstatus_altama" optional="hide"/>
                 </field>
                 <field name="price_subtotal" position="after">
+                    <field name="altama_ordered" optional="hide" readonly="1"/>
+                    <field name="altama_delivered" optional="hide" readonly="1"/>
+                    <field name="altama_invoiced" optional="hide" readonly="1"/>
                     <field name="so_item_margin" attrs="{'readonly': 1}" optional="hide"/>
                     <field name="so_item_percent_margin" attrs="{'readonly': 1}" optional="hide"/>
                     <field name="item_margin" attrs="{'readonly': 1}" optional="hide"/>
diff --git a/indoteknik_custom/views/stock_picking.xml b/indoteknik_custom/views/stock_picking.xml
index 9cd63e25..29a95626 100644
--- a/indoteknik_custom/views/stock_picking.xml
+++ b/indoteknik_custom/views/stock_picking.xml
@@ -133,6 +133,7 @@
                     <field name="total_mapping_koli" attrs="{'invisible': [('location_id', '!=', 60)]}"/>
                     <field name="total_koli_display" readonly="1" attrs="{'invisible': [('location_id', '!=', 60)]}"/>
                     <field name="linked_out_picking_id" readonly="1" attrs="{'invisible': [('location_id', '=', 60)]}"/>
+                    <field name="number_soo" attrs="{'invisible': [('picking_type_id', 'in', [29,30])]}"/>
                 </field>
                 <field name="weight_uom_name" position="after">
                     <group>
diff --git a/indoteknik_custom/views/token_log.xml b/indoteknik_custom/views/token_log.xml
new file mode 100644
index 00000000..77e6dd48
--- /dev/null
+++ b/indoteknik_custom/views/token_log.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<odoo>
+    <record id="token_log_tree" model="ir.ui.view">
+        <field name="name">token.log.tree</field>
+        <field name="model">token.log</field>
+        <field name="arch" type="xml">
+            <tree editable="top" default_order="create_date desc">
+                <field name="token"/>
+                <field name="expires_at"/>
+                <field name="token_from"/>
+                <field name="created_at"/>
+                <field name="created_by"/>
+                <field name="source"/>
+                <field name="is_active" widget="boolean_toggle"/>
+            </tree>
+        </field>
+    </record>
+
+    <record id="token_log_action" model="ir.actions.act_window">
+        <field name="name">Token Log</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">token.log</field>
+        <field name="view_mode">tree,form</field>
+    </record>
+
+    <menuitem
+            action="token_log_action"
+            id="token_log"
+            parent="base.menu_users"
+            name="Token Log"
+            sequence="1"
+    />
+</odoo>