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

5 files changed, 299 insertions, 120 deletions

diff --git a/indoteknik_custom/views/account_financial_report_view.xml b/indoteknik_custom/views/account_financial_report_view.xml
new file mode 100644
index 00000000..7c156599
--- /dev/null
+++ b/indoteknik_custom/views/account_financial_report_view.xml
@@ -0,0 +1,51 @@
+<?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>
+        <field name="model">accounting.report.xlsx</field>
+        <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>
+    </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/account_report_general_ledger_view.xml b/indoteknik_custom/views/account_report_general_ledger_view.xml
new file mode 100644
index 00000000..61c0ffff
--- /dev/null
+++ b/indoteknik_custom/views/account_report_general_ledger_view.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo> 
+    <record id="account_report_export_ledger_custom_view" model="ir.ui.view">
+        <field name="name">Export Ledger</field>
+        <field name="model">account.report.general.ledger.xlsx</field>
+        <field name="arch" type="xml">
+        <form string="Report Options">
+            <field name="company_id" invisible="1"/>
+            <group col="4">
+                <field name="target_move" widget="radio"/>
+                <field name="sortby" widget="radio"/>
+                <field name="display_account" widget="radio"/>
+                <field name="initial_balance"/>
+                <field name="date_from"/>
+                <field name="date_to"/>
+            </group>
+            <group>
+                <field name="journal_ids" widget="many2many_tags"/>
+            </group>
+            <footer>
+                <button name="check_report_ledger" string="Print" type="object" default_focus="1" class="oe_highlight"/>
+                <button string="Cancel" class="btn btn-default" special="cancel" />
+            </footer>
+        </form>
+        </field>
+    </record>
+
+    <record id="action_account_report_export_ledger_custom_menu" model="ir.actions.act_window">
+        <field name="name">export_ledger</field>
+        <field name="res_model">account.report.general.ledger.xlsx</field>
+        <field name="view_mode">form</field>
+        <field name="view_id" ref="account_report_export_ledger_custom_view"/>
+        <field name="target">new</field>
+    </record>
+
+<menuitem id="menu_export_ledger_custom" name="General Ledger Export" action="action_account_report_export_ledger_custom_menu" parent="account.menu_finance_reports" sequence="250"/>
+</odoo>
\ No newline at end of file
diff --git a/indoteknik_custom/views/mail_template_po.xml b/indoteknik_custom/views/mail_template_po.xml
new file mode 100644
index 00000000..410520b3
--- /dev/null
+++ b/indoteknik_custom/views/mail_template_po.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" ?>
+<odoo>
+    <data noupdate="0">
+        <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="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;">
+                    <tr> 
+                        <td align="center">
+                            <table border="0" cellpadding="0" cellspacing="0" width="590"
+                                style="padding: 16px; background-color: white; color: #454748; border-collapse:separate;">
+                                <tbody>
+                                    <!-- HEADER -->
+                                    <tr>
+                                        <td align="center" style="min-width: 590px;">
+                                            <table border="0" cellpadding="0" cellspacing="0" width="590"
+                                                style="min-width: 590px; background-color: white; padding: 0px 8px 0px 8px; border-collapse:separate;">
+                                                <tr>
+                                                    <td valign="middle">
+                                                        <span style="font-size: 10px;">PO</span><br />
+                                                        <span style="font-size: 20px; font-weight: bold;">
+                                                            ${object.name}
+                                                        </span>
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <td colspan="2" style="text-align:center;">
+                                                        <hr width="100%"
+                                                            style="background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0; margin: 16px 0px 16px 0px;" />
+                                                    </td>
+                                                </tr>
+                                            </table>
+                                        </td>
+                                    </tr>
+                                    <!-- CONTENT -->
+                                    <tr>
+                                        <td align="center" style="min-width: 590px;">
+                                            <table border="0" cellpadding="0" cellspacing="0" width="590"
+                                                style="min-width: 590px; background-color: white; padding: 0px 8px 0px 8px; border-collapse:separate;">
+                                                <tr>
+                                                    <td valign="top" style="font-size: 13px;">
+                                                        <div>
+                                                            Dear Stefanus Darren,
+                                                            <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
+                                                                    <ul>
+                                                                        <li>Nama Produk: ${line.product_id.name}</li>
+                                                                        <li>Harga Unit dalam PO: Rp ${'{:,.2f}'.format(line.price_unit)}</li>
+                                                                        <li>Harga Unit dalam Purchase Pricelist: Rp ${'{:,.2f}'.format(line.price_vendor)}</li>
+                                                                    </ul>
+                                                                % endif
+                                                            % endfor
+                                                            Silahkan periksa dan lakukan koreksi jika diperlukan.
+                                                            <br/><br/>
+                                                            Terima kasih.
+                                                        </div>
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <td style="text-align:center;">
+                                                        <hr width="100%"
+                                                            style="background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0; margin: 16px 0px 16px 0px;" />
+                                                    </td>
+                                                </tr>
+                                            </table>
+                                        </td>
+                                    </tr>
+                                </tbody>
+                            </table>
+                        </td>
+                    </tr>
+                </table>
+            </field>
+            <field name="auto_delete" eval="True" />
+        </record>
+    </data>
+</odoo>
\ No newline at end of file
diff --git a/indoteknik_custom/views/purchase_order.xml b/indoteknik_custom/views/purchase_order.xml
index 2f8590f3..7d436c46 100755
--- a/indoteknik_custom/views/purchase_order.xml
+++ b/indoteknik_custom/views/purchase_order.xml
@@ -56,6 +56,9 @@
                     <field name="qty_available_store"/>
                     <field name="suggest"/>
                 </field>
+                <field name="price_unit" position="after">
+                    <field name="price_vendor" attrs="{'readonly': 1}" optional="hide"/>
+                </field>
                 <page name="purchase_delivery_invoice" position="after">
                     <page name="purchase_vendor_bills" string="Vendor Bills" groups="indoteknik_custom.technical_administrator">
                         <group>
diff --git a/indoteknik_custom/views/raja_ongkir.xml b/indoteknik_custom/views/raja_ongkir.xml
index 9e24a889..8888366b 100644
--- a/indoteknik_custom/views/raja_ongkir.xml
+++ b/indoteknik_custom/views/raja_ongkir.xml
@@ -68,125 +68,127 @@
             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>
+    <data noupdate="1">
+        <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>
+    </data>
 
 </odoo>
\ No newline at end of file