Merged in refactor (pull request #99)

Refactor

4 files changed, 22 insertions, 47 deletions

diff --git a/indoteknik_custom/views/account_financial_report_view.xml b/indoteknik_custom/views/account_financial_report_view.xml
index 7c156599..c524f1c0 100644
--- a/indoteknik_custom/views/account_financial_report_view.xml
+++ b/indoteknik_custom/views/account_financial_report_view.xml
@@ -1,51 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
- 
-    <record id="account_financial_report_view_custom" model="ir.ui.view">
-        <field name="name">Common Report</field>
+
+    <record id="custom_accounting_report_view" model="ir.ui.view">
+        <field name="name">Accounting Report</field>
         <field name="model">accounting.report.xlsx</field>
+        <field name="inherit_id" ref="account_reports_xlsx.accounting_report_view"/>
         <field name="arch" type="xml">
-        <form string="Report Options">
-            <group col="4">
-                <field name="account_report_id" domain="[('parent_id','=',False)]"/>
-                <field name="target_move" widget="radio"/>
-                <field name="enable_filter"/>
-                <field name="debit_credit" attrs="{'invisible': [('enable_filter','=',True)]}"/>
-                <field name="date_from"/>
-                <field name="date_to"/>
-            </group>
-            <group>
-                <notebook tabpos="up" colspan="4">
-                    <page string="Comparison" name="comparison" attrs="{'invisible': [('enable_filter','=',False)]}">
-                        <group>
-                            <field name="label_filter" attrs="{'required': [('enable_filter', '=', True)]}"/>
-                            <field name="filter_cmp"/>
-                        </group>
-                        <group string="Dates" attrs="{'invisible':[('filter_cmp', '!=', 'filter_date')]}">
-                            <field name="date_from_cmp" attrs="{'required':[('filter_cmp', '=', 'filter_date')]}"/>
-                            <field name="date_to_cmp" attrs="{'required':[('filter_cmp', '=', 'filter_date')]}"/>
-                        </group>
-                    </page>
-                </notebook>
-                <field name="company_id" options="{'no_create': True}" groups="base.group_multi_company"/>
-            </group>
-            <footer>
-                <button name="check_report" string="Print" type="object" default_focus="1" class="oe_highlight"/>
-                <button string="Cancel" class="btn btn-secondary" special="cancel" />
-            </footer>
-        </form>
+            <field name="date_to" position="after">
+                <field name="by_month"/>
+            </field>
         </field>
     </record>
 
-    <record id="action_account_report_custom" model="ir.actions.act_window">
-        <field name="name">Financial Reports</field>
-        <field name="res_model">accounting.report.xlsx</field>
-        <field name="type">ir.actions.act_window</field>
-        <field name="view_mode">form</field>
-        <field name="view_id" ref="account_financial_report_view_custom"/>
-        <field name="target">new</field>
-    </record>
-
-    <menuitem id="menu_account_report" name="Financial Report" action="action_account_report_custom" parent="account.menu_finance_reports" sequence="250"/>
-
 </odoo>
diff --git a/indoteknik_custom/views/crm_lead.xml b/indoteknik_custom/views/crm_lead.xml
index 58c3987a..9e4a43f2 100755
--- a/indoteknik_custom/views/crm_lead.xml
+++ b/indoteknik_custom/views/crm_lead.xml
@@ -47,6 +47,9 @@
                 <field name="message_bounce" position="after">
                     <field name="order_id"/>
                 </field>
+                <field name="lang_id" position="after">
+                    <field name="reason"/>
+                </field>
             </field>
         </record>
     </data>
diff --git a/indoteknik_custom/views/mail_template_po.xml b/indoteknik_custom/views/mail_template_po.xml
index 410520b3..02053767 100644
--- a/indoteknik_custom/views/mail_template_po.xml
+++ b/indoteknik_custom/views/mail_template_po.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" ?>
 <odoo>
-    <data noupdate="0">
+    <data>
         <record id="mail_template_po_sync_price" model="mail.template">
             <field name="name">PO: Sync Unit Price Purchase Pricelist</field>
             <field name="model_id" ref="model_purchase_order" />
             <field name="subject">Your PO ${object.name}</field>
             <field name="email_from"></field>
-            <field name="email_to">darren@indoteknik.co.id</field>
+            <field name="email_to">darren@indoteknik.co.id, tyas@indoteknik.com, azkan4elll@gmail.com</field>
             <field name="body_html" type="html">
                 <table border="0" cellpadding="0" cellspacing="0"
                     style="padding-top: 16px; background-color: #F1F1F1; font-family:Verdana, Arial,sans-serif; color: #454748; width: 100%; border-collapse:separate;">
@@ -45,13 +45,13 @@
                                                 <tr>
                                                     <td valign="top" style="font-size: 13px;">
                                                         <div>
-                                                            Dear Stefanus Darren,
+                                                            Dear Stefanus Darren &amp; Tyas K Putra,
                                                             <br/><br/>
                                                             Terdapat PO yang harga Unit Price nya tidak sama dengan yang ada di purchase pricelist nya.
                                                             <br/><br/>
                                                             Berikut adalah rincian PO:
                                                             % for line in object.order_line:
-                                                                % if line.price_vendor != 0 and line.price_unit != line.price_vendor
+                                                                % if line.price_unit != line.price_vendor
                                                                     <ul>
                                                                         <li>Nama Produk: ${line.product_id.name}</li>
                                                                         <li>Harga Unit dalam PO: Rp ${'{:,.2f}'.format(line.price_unit)}</li>
diff --git a/indoteknik_custom/views/product_pricelist.xml b/indoteknik_custom/views/product_pricelist.xml
index 55139a24..34876cc4 100644
--- a/indoteknik_custom/views/product_pricelist.xml
+++ b/indoteknik_custom/views/product_pricelist.xml
@@ -25,4 +25,12 @@
             </page>
         </field>
     </record>
+
+    <record id="product_pricelist_sync_product_solr_ir_actions_server" model="ir.actions.server">
+        <field name="name">Sync Product to SOLR</field>
+        <field name="model_id" ref="product.model_product_pricelist"/>
+        <field name="binding_model_id" ref="product.model_product_pricelist"/>
+        <field name="state">code</field>
+        <field name="code">action = records.update_product_solr_flag()</field>
+    </record>
 </odoo>
\ No newline at end of file