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

4 files changed, 29 insertions, 9 deletions

diff --git a/indoteknik_custom/views/assets.xml b/indoteknik_custom/views/assets.xml
new file mode 100644
index 00000000..4475004e
--- /dev/null
+++ b/indoteknik_custom/views/assets.xml
@@ -0,0 +1,7 @@
+<odoo>
+    <template id="indoteknik_assets_backend" inherit_id="web.assets_backend" name="Indoteknik Custom Backend Assets">
+        <xpath expr="." position="inside">
+            <script type="text/javascript" src="/indoteknik_custom/static/src/js/check_product_barcode.js"/>
+        </xpath>
+    </template>
+</odoo>
diff --git a/indoteknik_custom/views/product_template.xml b/indoteknik_custom/views/product_template.xml
index 8f9d1190..177449f4 100755
--- a/indoteknik_custom/views/product_template.xml
+++ b/indoteknik_custom/views/product_template.xml
@@ -66,6 +66,7 @@
             <field name="model">image.carousel</field>
             <field name="arch" type="xml">
                 <tree editable="bottom">
+                    <field name="sequence" widget="handle"/>
                     <field name="image" widget="image" width="80"/>
                 </tree>
             </field>
diff --git a/indoteknik_custom/views/purchase_order.xml b/indoteknik_custom/views/purchase_order.xml
index 15cdc788..821f3295 100755
--- a/indoteknik_custom/views/purchase_order.xml
+++ b/indoteknik_custom/views/purchase_order.xml
@@ -14,6 +14,16 @@
                             attrs="{'invisible': ['|', ('sale_order_id', '=', False), ('state', 'not in', ['draft'])]}"
                     />
                 </div>
+                <xpath expr="//button[@name='action_view_invoice']" position="after">
+                <button type="object"
+                        name="action_view_related_bu"
+                        class="oe_stat_button"
+                        icon="fa-truck"                
+                        attrs="{'invisible': [('state', 'in', ['draft', 'sent'])]}">
+                        <field name="bu_related_count" widget="statinfo" string="BU Related"/>
+                    </button>
+                    <field name="picking_count" invisible="1"/>
+                </xpath>
                 <xpath expr="//button[@name='action_view_invoice']" position="before">
                     <field name="is_cab_visible" invisible="1"/>
                     <button type="object"
@@ -21,21 +31,19 @@
                         class="oe_stat_button"
                         icon="fa-book"
                         attrs="{'invisible': [('is_cab_visible', '=', False)]}"
-                        style="width: 200px;">
+                        >
                         <field name="move_id" widget="statinfo" string="Journal Uang Muka"/>
                         <span class="o_stat_text">
                             <t t-esc="record.move_id.name"/>
                         </span>
                     </button>
-                    <button type="object"
-                            name="action_view_related_bu"
-                            class="oe_stat_button"
-                            icon="fa-truck"
-                            style="width: 200px;"
-                            attrs="{'invisible': [('state', 'in', ['draft', 'sent'])]}">
-                        <field name="bu_related_count" widget="statinfo" string="BU Related"/>
+                    <button name="action_view_bills"
+                            type="object"
+                            icon="fa-pencil-square-o"
+                            attrs="{'invisible': [
+                                ('bills_related_count', '=', 0)]}">
+                        <field string="Bills DP &amp; Pelunasan" name="bills_related_count" widget="statinfo"/>
                     </button>
-                    <field name="picking_count" invisible="1"/>
                 </xpath>
                 <button id="draft_confirm" position="after">
                     <button name="po_approve"
diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml
index 5fad5700..be31456b 100755
--- a/indoteknik_custom/views/sale_order.xml
+++ b/indoteknik_custom/views/sale_order.xml
@@ -483,6 +483,10 @@
                     <field name="date_kirim_ril"/>
                     <field name="date_driver_departure"/>
                     <field name="date_driver_arrival"/>
+                    <field name="payment_state_custom" widget="badge" 
+                    decoration-danger="payment_state_custom == 'unpaid'" 
+                    decoration-success="payment_state_custom == 'paid'"
+                    decoration-warning="payment_state_custom == 'partial'"/>
                     <field name="unreserved_percent" widget="percentpie" string="Unreserved"/>
                     <field name="reserved_percent" widget="percentpie" string="Reserved"/>
                     <field name="delivered_percent" widget="percentpie" string="Delivered"/>