Merged in release (pull request #27)

Release

5 files changed, 118 insertions, 8 deletions

diff --git a/indoteknik_custom/views/dunning_run.xml b/indoteknik_custom/views/dunning_run.xml
index ab01d476..c251b206 100644
--- a/indoteknik_custom/views/dunning_run.xml
+++ b/indoteknik_custom/views/dunning_run.xml
@@ -5,10 +5,14 @@
         <field name="model">dunning.run</field>
         <field name="arch" type="xml">
             <tree>
-                <field name="id"/>
                 <field name="number"/>
                 <field name="dunning_date"/>
                 <field name="partner_id"/>
+                <field name="is_validated" readonly="1"/>
+                <field name="date_kirim_tukar_faktur"/>
+                <field name="resi_tukar_faktur"/>
+                <field name="date_terima_tukar_faktur"/>
+                <field name="shipper_faktur_id"/>
             </tree>
         </field>
     </record>
@@ -39,14 +43,33 @@
                         <div class="oe_button_box" name="button_box"/>
                         <group>
                             <group>
-                                <field name="number"/>
-                                <field name="partner_id"/>
-                                <field name="dunning_date"/>
+                                <div>
                                 <button name="generate_dunning_line"
                                     string="Generate"
                                     type="object"
+                                    class="mr-2 oe_highlight oe_edit_only"
+                                />
+                                <button name="validate_dunning"
+                                    string="Validate"
+                                    type="object"
+                                    class="mr-2 oe_highlight oe_edit_only"
+                                />
+                                <button name="copy_date_faktur"
+                                    string="Copy Date"
+                                    type="object"
                                     class="oe_highlight oe_edit_only"
                                 />
+                                </div>
+                                <field name="number"/>
+                                <field name="partner_id"/>
+                                <field name="dunning_date"/>
+                            </group>
+                            <group>
+                                <field name="is_validated" readonly="1"/>
+                                <field name="date_kirim_tukar_faktur"/>
+                                <field name="resi_tukar_faktur"/>
+                                <field name="date_terima_tukar_faktur"/>
+                                <field name="shipper_faktur_id"/>
                             </group>
                         </group>
                         <notebook>
diff --git a/indoteknik_custom/views/sales_target.xml b/indoteknik_custom/views/sales_target.xml
index 6ccea260..08218913 100644
--- a/indoteknik_custom/views/sales_target.xml
+++ b/indoteknik_custom/views/sales_target.xml
@@ -1,26 +1,39 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <odoo>
     <data>
+        <record id="view_sales_target_filter" model="ir.ui.view">
+            <field name="name">sales.target.list.select</field>
+            <field name="model">sales.target</field>
+            <field name="priority" eval="15"/>
+            <field name="arch" type="xml">
+                <search string="Search Content">
+                    <field name="partner_id"/>
+                    <field name="period"/>
+               </search>
+            </field>
+        </record>
         <record id="sales_target_action" model="ir.actions.act_window">
             <field name="name">Sales Target</field>
             <field name="res_model">sales.target</field>
+            <field name="search_view_id" ref="view_sales_target_filter"/>
             <field name="view_mode">tree,form</field>
         </record>
-
         <record id="sales_target_tree" model="ir.ui.view">
             <field name="name">Sales Target</field>
             <field name="model">sales.target</field>
             <field name="arch" type="xml">
                 <tree>
                     <field name="partner_id"/>
+                    <field name="sales_id"/>
                     <field name="period"/>
                     <field name="omset_last_year"/>
                     <field name="ongoing_omset_total"/>
                     <field name="target"/>
+                    <field name="ach_per_year"/>
+                    <field name="ach_per_month"/>
                 </tree>
             </field>
         </record>
-
         <record id="sales_target_form" model="ir.ui.view">
             <field name="name">Sales Target</field>
             <field name="model">sales.target</field>
@@ -30,12 +43,17 @@
                         <group>
                             <group>
                                 <field name="partner_id"/>
+                                <field name="reference"/>
+                                <field name="sales_id"/>
                                 <field name="period"/>
                                 <field name="omset_last_year"/>
                                 <field name="ongoing_omset_odoo"/>
                                 <field name="ongoing_omset_accurate"/>
                                 <field name="ongoing_omset_adempiere"/>
+                                <field name="ongoing_omset_total"/>
                                 <field name="target"/>
+                                <field name="ach_per_year"/>
+                                <field name="ach_per_month"/>
                             </group>
                         </group>
                     </sheet>
diff --git a/indoteknik_custom/views/stock_vendor.xml b/indoteknik_custom/views/stock_vendor.xml
index ebf63a6a..35931750 100755
--- a/indoteknik_custom/views/stock_vendor.xml
+++ b/indoteknik_custom/views/stock_vendor.xml
@@ -18,6 +18,7 @@
                 <tree>
                     <field name="quantity" widget="badge" decoration-primary="True"/>
                     <field name="product_variant_id"/>
+                    <field name="cache_reset_status"/>
                     <field name="__last_update"/>
                 </tree>
             </field>
@@ -33,6 +34,7 @@
                             <group>
                                 <field name="product_variant_id"/>
                                 <field name="quantity" widget="badge" decoration-primary="True"/>
+                                <field name="cache_reset_status"/>
                                 <field name="__last_update"/>
                             </group>
                             <group></group>
diff --git a/indoteknik_custom/views/website_ads.xml b/indoteknik_custom/views/website_ads.xml
new file mode 100644
index 00000000..b66b0346
--- /dev/null
+++ b/indoteknik_custom/views/website_ads.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <data>
+        <record id="view_website_ads_filter" model="ir.ui.view">
+            <field name="name">website.ads.list.select</field>
+            <field name="model">website.ads</field>
+            <field name="priority" eval="15"/>
+            <field name="arch" type="xml">
+                <search string="Search Content">
+                    <field name="name"/>
+                    <field name="url"/>
+                    <field name="page"/>
+                    <field name="status"/>
+               </search>
+            </field>
+        </record>
+
+        <record id="website_ads_action" model="ir.actions.act_window">
+            <field name="name">Website Ads</field>
+            <field name="res_model">website.ads</field>
+            <field name="search_view_id" ref="view_website_ads_filter"/>
+            <field name="view_mode">tree,form</field>
+        </record>
+
+        <record id="website_ads_tree" model="ir.ui.view">
+            <field name="name">Website Ads</field>
+            <field name="model">website.ads</field>
+            <field name="arch" type="xml">
+                <tree>
+                    <field name="sequence"/>
+                    <field name="name"/>
+                    <field name="image"/>
+                    <field name="url"/>
+                    <field name="page"/>
+                    <field name="status"/>
+                </tree>
+            </field>
+        </record>
+
+        <record id="website_ads_form" model="ir.ui.view">
+            <field name="name">Website Ads</field>
+            <field name="model">website.ads</field>
+            <field name="arch" type="xml">
+                <form>
+                    <sheet>
+                        <group>
+                            <group>
+                                <field name="sequence"/>
+                                <field name="name"/>
+                                <field name="image"/>
+                                <field name="url"/>
+                                <field name="page"/>
+                                <field name="status"/>
+                            </group>
+                        </group>
+                    </sheet>
+                </form>
+            </field>
+        </record>
+
+        <menuitem
+                id="website_ads"
+                name="Website Ads"
+                parent="website_sale.menu_orders"
+                sequence="5"
+                action="website_ads_action"
+        />
+    </data>
+</odoo>
\ No newline at end of file
diff --git a/indoteknik_custom/views/x_manufactures.xml b/indoteknik_custom/views/x_manufactures.xml
index c7cedd9c..e51cb6a7 100755
--- a/indoteknik_custom/views/x_manufactures.xml
+++ b/indoteknik_custom/views/x_manufactures.xml
@@ -43,7 +43,6 @@
                                 <field name="x_manufacture_level"/>
                                 <field name="x_produk_aksesoris_sparepart"/>
                                 <field name="cache_reset_status"/>
-                                <field name="show_as_new_product"/>
                                 <field name="sequence"/>
                             </group>
                             <group>
@@ -64,7 +63,6 @@
                                         <field name="create_date"/>
                                         <field name="solr_flag"/>
                                         <field name="product_rating"/>
-                                        <field name="is_new_product"/>
                                     </tree>
                                 </field>
                             </page>