Merge branch 'release' of bitbucket.org:altafixco/indoteknik-addons into release

3 files changed, 154 insertions, 0 deletions

diff --git a/indoteknik_custom/views/procurement_monitoring_detail.xml b/indoteknik_custom/views/procurement_monitoring_detail.xml
index b3785d14..8f3827c1 100644
--- a/indoteknik_custom/views/procurement_monitoring_detail.xml
+++ b/indoteknik_custom/views/procurement_monitoring_detail.xml
@@ -14,6 +14,7 @@
                 <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"
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
index 4eb19b02..124a91ae 100644
--- a/indoteknik_custom/views/raja_ongkir.xml
+++ b/indoteknik_custom/views/raja_ongkir.xml
@@ -24,4 +24,156 @@
             </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