Merge branch 'release' into staging

8 files changed, 304 insertions, 0 deletions

diff --git a/indoteknik_custom/views/brand_vendor.xml b/indoteknik_custom/views/brand_vendor.xml
new file mode 100644
index 00000000..ee253748
--- /dev/null
+++ b/indoteknik_custom/views/brand_vendor.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <record id="brand_vendor_tree" model="ir.ui.view">
+        <field name="name">brand.vendor.tree</field>
+        <field name="model">brand.vendor</field>
+        <field name="arch" type="xml">
+            <tree>
+                <field name="x_manufacture_id"/>
+                <field name="partner_id"/>
+                <field name="priority"/>
+            </tree>
+        </field>
+    </record>
+
+    <record id="brand_vendor_form" model="ir.ui.view">
+        <field name="name">brand.vendor.form</field>
+        <field name="model">brand.vendor</field>
+        <field name="arch" type="xml">
+            <form>
+                <sheet>
+                    <group>
+                        <group>
+                            <field name="x_manufacture_id"/>
+                            <field name="partner_id"/>
+                            <field name="priority"/>
+                        </group>
+                    </group>
+                </sheet>
+            </form>
+        </field>
+    </record>
+
+    <record id="brand_vendor_filter" model="ir.ui.view">
+            <field name="name">brand.vendor.filter</field>
+            <field name="model">brand.vendor</field>
+            <field name="priority" eval="15"/>
+            <field name="arch" type="xml">
+                <search string="Search Channel">
+                    <field name="x_manufacture_id"/>
+                    <field name="partner_id"/>
+               </search>
+            </field>
+        </record>
+
+    <record id="brand_vendor_action" model="ir.actions.act_window">
+        <field name="name">Brand Vendor</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">brand.vendor</field>
+        <field name="search_view_id" ref="brand_vendor_filter"/>
+        <field name="view_mode">tree,form</field>
+    </record>
+
+    <menuitem
+            id="menu_brand_vendor"
+            name="Brand Vendor"
+            parent="purchase.menu_purchase_products"
+            sequence="6"
+            action="brand_vendor_action"
+    />
+</odoo>
\ No newline at end of file
diff --git a/indoteknik_custom/views/procurement_monitoring_detail.xml b/indoteknik_custom/views/procurement_monitoring_detail.xml
new file mode 100644
index 00000000..8f3827c1
--- /dev/null
+++ b/indoteknik_custom/views/procurement_monitoring_detail.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <record id="procurement_monitoring_detail_tree" model="ir.ui.view">
+        <field name="name">procurement.monitoring.detail.tree</field>
+        <field name="model">procurement.monitoring.detail</field>
+        <field name="arch" type="xml">
+            <tree create="false" multi_edit="1">
+                <field name="date_order"/>
+                <field name="sale_order_id"/>
+                <field name="partner_id"/>
+                <field name="user_id"/>
+                <field name="product_id"/>
+                <field name="qty_so"/>
+                <field name="qty_reserved"/>
+                <field name="qty_available"/>
+                <field name="qty_suggest"/>
+                <field name="po_ids" widget="many2many_tags"/>
+                <field name="qty_po"/>
+                <field name="status"
+                       widget="badge"
+                       decoration-danger="status == 'harus beli'"
+                       decoration-success="status == 'cukup'"
+                />
+            </tree>
+        </field>
+    </record>
+
+    <record id="procurement_monitoring_detail_action" model="ir.actions.act_window">
+        <field name="name">Procurement Monitoring Detail</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">procurement.monitoring.detail</field>
+        <field name="view_mode">tree,form</field>
+    </record>
+
+    <menuitem
+            id="menu_procurement_monitoring_detail_in_purchase"
+            name="Procurement Monitoring Detail"
+            parent="menu_monitoring_in_purchase"
+            sequence="150"
+            action="procurement_monitoring_detail_action"
+    />
+
+</odoo>
\ No newline at end of file
diff --git a/indoteknik_custom/views/product_pricelist.xml b/indoteknik_custom/views/product_pricelist.xml
index 4cf06e18..0ad9e200 100644
--- a/indoteknik_custom/views/product_pricelist.xml
+++ b/indoteknik_custom/views/product_pricelist.xml
@@ -17,6 +17,9 @@
                     <field name="banner_mobile" widget="image" attrs="{
                         'invisible': [('is_flash_sale', '=', False)]
                     }" />
+                    <field name="banner_top" widget="image" attrs="{
+                        'invisible': [('is_flash_sale', '=', False)]
+                    }" />
                     <field name="start_date" attrs="{
                         'invisible': [('is_flash_sale', '=', False)],
                         'required': [('is_flash_sale', '=', True)]
diff --git a/indoteknik_custom/views/product_product.xml b/indoteknik_custom/views/product_product.xml
new file mode 100644
index 00000000..d3ef3e15
--- /dev/null
+++ b/indoteknik_custom/views/product_product.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <data>
+        <record id="product_product_tree_inherit" model="ir.ui.view">
+            <field name="name">Product Product</field>
+            <field name="model">product.product</field>
+            <field name="inherit_id" ref="product.product_product_tree_view"/>
+            <field name="arch" type="xml">
+                <field name="qty_available" position="after">
+                    <field name="outgoing_qty"/>
+                    <field name="incoming_qty"/>
+                </field>
+            </field>
+        </record>
+    </data>
+</odoo>
\ No newline at end of file
diff --git a/indoteknik_custom/views/product_template.xml b/indoteknik_custom/views/product_template.xml
index 5fcb8b05..558805b1 100755
--- a/indoteknik_custom/views/product_template.xml
+++ b/indoteknik_custom/views/product_template.xml
@@ -53,6 +53,7 @@
                     <field name="usage"/>
                     <field name="specification"/>
                     <field name="material"/>
+                    <field name="virtual_rating"/>
                     <field name="search_rank"/>
                     <field name="solr_flag"/>
                 </field>
diff --git a/indoteknik_custom/views/raja_ongkir.xml b/indoteknik_custom/views/raja_ongkir.xml
new file mode 100644
index 00000000..124a91ae
--- /dev/null
+++ b/indoteknik_custom/views/raja_ongkir.xml
@@ -0,0 +1,179 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <data>
+        <record id="state_raja_ongkir" model="ir.ui.view">
+            <field name="name">State</field>
+            <field name="model">res.country.state</field>
+            <field name="inherit_id" ref="base.view_country_state_tree"/>
+            <field name="arch" type="xml">
+                <field name="country_id" position="after">
+                    <field name="rajaongkir_id"/>
+                </field>
+            </field>
+        </record>
+    </data>
+    <data>
+        <record id="kota_raja_ongkir" model="ir.ui.view">
+            <field name="name">Kota</field>
+            <field name="model">vit.kota</field>
+            <field name="inherit_id" ref="indoteknik_custom.vit_kota_tree"/>
+            <field name="arch" type="xml">
+                <field name="state_id" position="after">
+                    <field name="rajaongkir_id"/>
+                </field>
+            </field>
+        </record>
+    </data>
+
+    <data>
+        <record id="rajaongkir_kurir_tree" model="ir.ui.view">
+            <field name="name">Kurir RajaOngkir</field>
+            <field name="model">rajaongkir.kurir</field>
+            <field name="arch" type="xml">
+                <tree>
+                    <field name="delivery_carrier_id"/>
+                    <field name="name"/>
+                    <field name="image"/>
+                    <field name="publish"/>
+                </tree>
+            </field>
+        </record>
+    </data>
+
+    <record id="rajaongkir_kurir_action" model="ir.actions.act_window">
+        <field name="name">Kurir RajaOngkir</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">rajaongkir.kurir</field>
+        <field name="view_mode">tree,form</field>
+    </record>
+
+    <menuitem
+            id="menu_kurir_rajaongkir"
+            name="Kurir RajaOngkir"
+            parent="delivery.menu_delivery"
+            sequence="150"
+            action="rajaongkir_kurir_action"
+    />
+
+    <record id="rajaongkir_jne" model="rajaongkir.kurir">
+        <field name="name">jne</field>
+        <field name="delivery_carrier_id">51</field>
+        <field name="publish">True</field>
+    </record>
+    <record id="rajaongkir_pos" model="rajaongkir.kurir">
+        <field name="name">pos</field>
+        <field name="delivery_carrier_id">53</field>
+        <field name="publish">True</field>
+    </record>
+    <record id="rajaongkir_tiki" model="rajaongkir.kurir">
+        <field name="name">tiki</field>
+        <field name="delivery_carrier_id">54</field>
+        <field name="publish">True</field>
+    </record>
+    <record id="rajaongkir_rpx" model="rajaongkir.kurir">
+        <field name="name">rpx</field>
+        <field name="delivery_carrier_id">55</field>
+        <field name="publish">True</field>
+    </record>
+    <record id="rajaongkir_pandu" model="rajaongkir.kurir">
+        <field name="name">pandu</field>
+        <field name="delivery_carrier_id">56</field>
+        <field name="publish">True</field>
+    </record>
+    <record id="rajaongkir_wahana" model="rajaongkir.kurir">
+        <field name="name">wahana</field>
+        <field name="delivery_carrier_id">7</field>
+        <field name="publish">True</field>
+    </record>
+    <record id="rajaongkir_sicepat" model="rajaongkir.kurir">
+        <field name="name">sicepat</field>
+        <field name="delivery_carrier_id">27</field>
+        <field name="publish">True</field>
+    </record>
+    <record id="rajaongkir_jnt" model="rajaongkir.kurir">
+        <field name="name">jnt</field>
+        <field name="delivery_carrier_id">57</field>
+        <field name="publish">True</field>
+    </record>
+    <record id="rajaongkir_pahala" model="rajaongkir.kurir">
+        <field name="name">pahala</field>
+        <field name="delivery_carrier_id">58</field>
+        <field name="publish">True</field>
+    </record>
+    <record id="rajaongkir_sap" model="rajaongkir.kurir">
+        <field name="name">sap</field>
+        <field name="delivery_carrier_id">59</field>
+        <field name="publish">True</field>
+    </record>
+    <record id="rajaongkir_jet" model="rajaongkir.kurir">
+        <field name="name">jet</field>
+        <field name="delivery_carrier_id">60</field>
+        <field name="publish">True</field>
+    </record>
+    <record id="rajaongkir_indah" model="rajaongkir.kurir">
+        <field name="name">indah</field>
+        <field name="delivery_carrier_id">61</field>
+        <field name="publish">True</field>
+    </record>
+    <record id="rajaongkir_dse" model="rajaongkir.kurir">
+        <field name="name">dse</field>
+        <field name="delivery_carrier_id">62</field>
+        <field name="publish">True</field>
+    </record>
+    <record id="rajaongkir_slis" model="rajaongkir.kurir">
+        <field name="name">slis</field>
+        <field name="delivery_carrier_id">63</field>
+        <field name="publish">True</field>
+    </record>
+    <record id="rajaongkir_first" model="rajaongkir.kurir">
+        <field name="name">first</field>
+        <field name="delivery_carrier_id">64</field>
+        <field name="publish">True</field>
+    </record>
+    <record id="rajaongkir_ncs" model="rajaongkir.kurir">
+        <field name="name">ncs</field>
+        <field name="delivery_carrier_id">65</field>
+        <field name="publish">True</field>
+    </record>
+    <record id="rajaongkir_star" model="rajaongkir.kurir">
+        <field name="name">star</field>
+        <field name="delivery_carrier_id">66</field>
+        <field name="publish">True</field>
+    </record>
+    <record id="rajaongkir_lion" model="rajaongkir.kurir">
+        <field name="name">lion</field>
+        <field name="delivery_carrier_id">67</field>
+        <field name="publish">True</field>
+    </record>
+    <record id="rajaongkir_idl" model="rajaongkir.kurir">
+        <field name="name">idl</field>
+        <field name="delivery_carrier_id">68</field>
+        <field name="publish">True</field>
+    </record>
+    <record id="rajaongkir_rex" model="rajaongkir.kurir">
+        <field name="name">rex</field>
+        <field name="delivery_carrier_id">69</field>
+        <field name="publish">True</field>
+    </record>
+    <record id="rajaongkir_ide" model="rajaongkir.kurir">
+        <field name="name">ide</field>
+        <field name="delivery_carrier_id">70</field>
+        <field name="publish">True</field>
+    </record>
+    <record id="rajaongkir_sentral" model="rajaongkir.kurir">
+        <field name="name">sentral</field>
+        <field name="delivery_carrier_id">71</field>
+        <field name="publish">True</field>
+    </record>
+    <record id="rajaongkir_anteraja" model="rajaongkir.kurir">
+        <field name="name">anteraja</field>
+        <field name="delivery_carrier_id">72</field>
+        <field name="publish">True</field>
+    </record>
+    <record id="rajaongkir_jtl" model="rajaongkir.kurir">
+        <field name="name">jtl</field>
+        <field name="delivery_carrier_id">73</field>
+        <field name="publish">True</field>
+    </record>
+
+</odoo>
\ No newline at end of file
diff --git a/indoteknik_custom/views/x_banner_banner.xml b/indoteknik_custom/views/x_banner_banner.xml
index a83ae5ab..4f3f1911 100755
--- a/indoteknik_custom/views/x_banner_banner.xml
+++ b/indoteknik_custom/views/x_banner_banner.xml
@@ -30,6 +30,7 @@
                             <field name="x_status_banner"/>
                         </group>
                         <group>
+                            <field name="background_color"/>
                             <field name="x_banner_image" widget="image"/>
                         </group>
                     </group>
diff --git a/indoteknik_custom/views/x_manufactures.xml b/indoteknik_custom/views/x_manufactures.xml
index ce00c980..a88c5d34 100755
--- a/indoteknik_custom/views/x_manufactures.xml
+++ b/indoteknik_custom/views/x_manufactures.xml
@@ -49,6 +49,7 @@
                                 <field name="x_logo_manufacture" widget="image"/>
                                 <field name="image_promotion_1" widget="image" width="80" />
                                 <field name="image_promotion_2" widget="image" width="80" />
+                                <field name="vendor_ids" widget="many2many_tags"/>
                             </group>
                         </group>
                         <notebook>