Merge branch 'release' into staging

4 files changed, 129 insertions, 0 deletions

diff --git a/indoteknik_custom/views/account_move.xml b/indoteknik_custom/views/account_move.xml
index b3e9fb8c..c315bb1c 100644
--- a/indoteknik_custom/views/account_move.xml
+++ b/indoteknik_custom/views/account_move.xml
@@ -6,6 +6,10 @@
             <field name="model">account.move</field>
             <field name="inherit_id" ref="account.view_move_form"/>
             <field name="arch" type="xml">
+                <button name="action_register_payment" position="after">
+                    <button name="indoteknik_custom.action_view_invoice_reklas" string="Reklas"
+                        type="action" class="btn-primary"  attrs="{'invisible': [('state', '!=', 'posted')]}"/>
+                </button>
                 <field name="invoice_user_id" position="after">
                     <field name="date_kirim_tukar_faktur"/>
                     <field name="shipper_faktur_id"/>
diff --git a/indoteknik_custom/views/custom_mail_marketing.xml b/indoteknik_custom/views/custom_mail_marketing.xml
new file mode 100644
index 00000000..d460a41d
--- /dev/null
+++ b/indoteknik_custom/views/custom_mail_marketing.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <record id="custom_mail_marketing_tree" model="ir.ui.view">
+        <field name="name">custom.mail.marketing.tree</field>
+        <field name="model">custom.mail.marketing</field>
+        <field name="arch" type="xml">
+            <tree>
+                <field name="col1_string"/>
+                <field name="col2_string"/>
+                <field name="col3_string"/>
+                <field name="col4_string"/>
+                <field name="col5_string"/>
+                <field name="col6_string"/>
+                <field name="col7_string"/>
+                <field name="col8_string"/>
+                <field name="col9_string"/>
+                <field name="col10_string"/>
+            </tree>
+        </field>
+    </record>
+
+    <record id="custom_mail_marketing_form" model="ir.ui.view">
+        <field name="name">custom.mail.marketing.form</field>
+        <field name="model">custom.mail.marketing</field>
+        <field name="arch" type="xml">
+            <form>
+                <sheet>
+                    <group>
+                        <group>
+                            <field name="col1_string"/>
+                            <field name="col2_string"/>
+                            <field name="col3_string"/>
+                            <field name="col4_string"/>
+                            <field name="col5_string"/>
+                            <field name="col6_string"/>
+                            <field name="col7_string"/>
+                            <field name="col8_string"/>
+                            <field name="col9_string"/>
+                            <field name="col10_string"/>
+                        </group>
+                    </group>
+                </sheet>
+            </form>
+        </field>
+    </record>
+
+    <record id="view_custom_mail_marketing_filter" model="ir.ui.view">
+            <field name="name">custom.mail.marketing.list.select</field>
+            <field name="model">custom.mail.marketing</field>
+            <field name="priority" eval="15"/>
+            <field name="arch" type="xml">
+                <search string="Search Channel">
+                    <field name="col1_string"/>
+                    <field name="col2_string"/>
+                    <field name="col3_string"/>
+                    <field name="col4_string"/>
+                    <field name="col5_string"/>
+                    <field name="col6_string"/>
+                    <field name="col7_string"/>
+                    <field name="col8_string"/>
+                    <field name="col9_string"/>
+                    <field name="col10_string"/>
+               </search>
+            </field>
+        </record>
+
+    <record id="custom_mail_marketing_action" model="ir.actions.act_window">
+        <field name="name">Custom Mail Marketing</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">custom.mail.marketing</field>
+        <field name="search_view_id" ref="view_custom_mail_marketing_filter"/>
+        <field name="view_mode">tree,form</field>
+    </record>
+
+    <menuitem
+            id="menu_custom_mail_marketing"
+            name="Custom Mail Marketing"
+            parent="website_sale.menu_orders"
+            sequence="4"
+            action="custom_mail_marketing_action"
+    />
+</odoo>
\ No newline at end of file
diff --git a/indoteknik_custom/views/invoice_reklas.xml b/indoteknik_custom/views/invoice_reklas.xml
new file mode 100644
index 00000000..e807dca5
--- /dev/null
+++ b/indoteknik_custom/views/invoice_reklas.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+        <record id="view_invoice_reklas" model="ir.ui.view">
+            <field name="name">Invoice Reklas</field>
+            <field name="model">invoice.reklas</field>
+            <field name="arch" type="xml">
+                <form string="Invoice Sales Order">
+                    <p class="oe_grey">
+                        Reklas Uang Muka Penjualan / Pembelian akan terbuat Draft, mohon dicek kembali
+                    </p>
+                    <group>
+                        <field name="reklas_type"/>
+                        <field name="reklas_id"/>
+                        <field name="pay_amt"/>
+                    </group>
+                    <footer>
+                        <button name="create_reklas" id="create_reklas" string="Create Reklas" type="object" required="1"/>
+                    </footer>
+                </form>
+            </field>
+        </record>
+
+        <record id="action_view_invoice_reklas" model="ir.actions.act_window">
+            <field name="name">Create Reklas</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">invoice.reklas</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+
+</odoo>
diff --git a/indoteknik_custom/views/product_pricelist_item.xml b/indoteknik_custom/views/product_pricelist_item.xml
index 94ba9e4f..2b70f1e1 100755
--- a/indoteknik_custom/views/product_pricelist_item.xml
+++ b/indoteknik_custom/views/product_pricelist_item.xml
@@ -33,5 +33,17 @@
                   parent="sale.product_menu_catalog"
                   sequence="2"
                   action="product_pricelist_item_action"/>
+
+        <record id="product_pricelist_item_tree_view_inherit" model="ir.ui.view">
+            <field name="name">product.pricelist.item.tree.view.inherit</field>
+            <field name="model">product.pricelist.item</field>
+            <field name="inherit_id" ref="product.product_pricelist_item_tree_view"/>
+            <field name="arch" type="xml">
+                <field name="company_id" position="after">
+                    <field name="manufacture_id" string="Manufactures"/>
+                </field>
+            </field>
+        </record>
+
     </data>
 </odoo>
\ No newline at end of file