Merge branch 'production' into feature/add_voucher_pastihemat_productsolr

10 files changed, 327 insertions, 60 deletions

diff --git a/indoteknik_custom/views/account_move_views.xml b/indoteknik_custom/views/account_move_views.xml
index fee94b42..1c70cc7b 100644
--- a/indoteknik_custom/views/account_move_views.xml
+++ b/indoteknik_custom/views/account_move_views.xml
@@ -33,54 +33,67 @@
         </field>
     </record>
 
-<record id="due_extension_form" model="ir.ui.view">
-    <field name="name">due.extension.form</field>
-    <field name="model">due.extension</field>
-    <field name="arch" type="xml">
-        <form create="false">
-            <header>
-                <button name="approve_new_due"
-                    string="Approve"
-                    type="object"
-                />
-                <button name="due_extension_approval"
-                        string="Ask Approval"
-                        type="object"
-                />
-                <button name="due_extension_cancel"
-                        string="Cancel"
+    <record id="due_extension_form" model="ir.ui.view">
+        <field name="name">due.extension.form</field>
+        <field name="model">due.extension</field>
+        <field name="arch" type="xml">
+            <form create="false">
+                <header>
+                    <button name="approve_new_due"
+                        string="Approve"
                         type="object"
-                />
-            </header>
-            <sheet>
-                <group>
+                    />
+                    <button name="due_extension_approval"
+                            string="Ask Approval"
+                            type="object"
+                    />
+                    <button name="due_extension_cancel"
+                            string="Cancel"
+                            type="object"
+                    />
+                </header>
+                <sheet>
                     <group>
-                        <field name="partner_id" readonly="1"/>
-                        <field name="day_extension" attrs="{'readonly': [('is_approve', '=', True)]}"/>    
+                        <group>
+                            <field name="partner_id" readonly="1"/>
+                            <field name="day_extension" attrs="{'readonly': [('is_approve', '=', True)]}"/>    
+                        </group>
+                        <group>
+                            <field name="is_approve" readonly="1"/>
+                            <field name="order_id" readonly="1"/>
+                            <field name="counter" readonly="1"/>
+                            <field name="approval_status" readonly="1"/>
+                        </group>
                     </group>
                     <group>
-                        <field name="is_approve" readonly="1"/>
-                        <field name="order_id" readonly="1"/>
-                        <field name="counter" readonly="1"/>
-                        <field name="approval_status" readonly="1"/>
+                        <field name="description" attrs="{'readonly': [('approval_status', '=', 'approved')]}"/>
                     </group>
-                </group>
-                <group>
-                    <field name="description" attrs="{'readonly': [('approval_status', '=', 'approved')]}"/>
-                </group>
-                <notebook>
-                    <page string="Invoices">
-                        <field name="due_line" attrs="{'readonly': [('is_approve', '=', True)]}"/>    
-                    </page>
-                </notebook>
-            </sheet>
-            <div class="oe_chatter">
-                <field name="message_follower_ids" widget="mail_followers"/>
-                <field name="message_ids" widget="mail_thread"/>
-            </div>
-        </form>
-    </field>
-</record>
+                    <notebook>
+                        <page string="Invoices">
+                            <field name="due_line" attrs="{'readonly': [('is_approve', '=', True)]}"/>    
+                        </page>
+                    </notebook>
+                </sheet>
+                <div class="oe_chatter">
+                    <field name="message_follower_ids" widget="mail_followers"/>
+                    <field name="message_ids" widget="mail_thread"/>
+                </div>
+            </form>
+        </field>
+    </record>
+
+    <record id="due_extension_view_search" model="ir.ui.view">
+        <field name="name">due.extension.search.view</field> <!-- Made the name more descriptive -->
+        <field name="model">due.extension</field>
+        <field name="arch" type="xml">
+            <search string="Search Due Extension">
+                <field name="number"/>
+                <field name="partner_id"/>
+                <field name="invoice_id"/>
+                <field name="order_id"/>
+            </search>
+        </field>
+    </record>    
 
     <record id="due_extension_action" model="ir.actions.act_window">
         <field name="name">Due Extension</field>
diff --git a/indoteknik_custom/views/delivery_carrier.xml b/indoteknik_custom/views/delivery_carrier.xml
index 5b2f2c32..ba01b8f2 100644
--- a/indoteknik_custom/views/delivery_carrier.xml
+++ b/indoteknik_custom/views/delivery_carrier.xml
@@ -9,6 +9,7 @@
                 <field name="company_id" position="after">
                     <field name="pic_name"/>
                     <field name="pic_phone"/>
+                    <field name="address"/>
                 </field>
             </field>
         </record>
diff --git a/indoteknik_custom/views/ir_sequence.xml b/indoteknik_custom/views/ir_sequence.xml
index af07ba38..40ce135c 100644
--- a/indoteknik_custom/views/ir_sequence.xml
+++ b/indoteknik_custom/views/ir_sequence.xml
@@ -20,6 +20,16 @@
             <field name="number_next">1</field>
             <field name="number_increment">1</field>
         </record>
+        
+        <record id="sequence_logbook_bill" model="ir.sequence">
+            <field name="name">Logbook Bill</field>
+            <field name="code">report.logbook.bill</field>
+            <field name="active">TRUE</field>
+            <field name="prefix">LSB/%(year)s/</field>
+            <field name="padding">5</field>
+            <field name="number_next">1</field>
+            <field name="number_increment">1</field>
+        </record>
 
         <record id="sequence_stock_picking_code" model="ir.sequence">
             <field name="name">Stock Picking Code</field>
diff --git a/indoteknik_custom/views/logbook_bill.xml b/indoteknik_custom/views/logbook_bill.xml
new file mode 100644
index 00000000..25f1d704
--- /dev/null
+++ b/indoteknik_custom/views/logbook_bill.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <record id="view_logbook_bill_form" model="ir.ui.view">
+        <field name="name">Logbook Bill</field>
+        <field name="model">logbook.bill</field>
+        <field name="arch" type="xml">
+            <form>
+                <sheet>
+                    <field name="name" invisible="1"/>
+                    <field
+                            name="logbook_bill_line"
+                            mode="tree"
+                    >
+                        <tree editable="bottom">
+                            <control>
+                                <create name="add_logbook_bill_line_control" string="Add a logbook"/>
+                            </control>
+                            <field name="name" required="1"/>
+                            <field name="partner_id" readonly="1"/>
+                            <field name="purchase_id" readonly="1"/>
+                            <field name="invoice"/>
+                            <field name="faktur_pajak"/>
+                            <field name="surat_jalan"/>
+                            <field name="proforma_invoice"/>
+                            <field name="date_approve" readonly="1"/>
+                            <field name="note"/>
+                            <field name="note_finance"/>
+                        </tree>
+                    </field>
+                </sheet>
+                <footer>
+                    <button name="create_logbook_bill" string="Submit" type="object" default_focus="1" class="oe_highlight"/>
+                    <button string="Cancel" class="btn btn-secondary" special="cancel" />
+                </footer>
+            </form>
+        </field>
+    </record>
+
+    <record id="action_logbook_bill" model="ir.actions.act_window">
+        <field name="name">Logbook Bill</field>
+        <field name="res_model">logbook.bill</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="view_mode">form</field>
+        <field name="view_id" ref="view_logbook_bill_form"/>
+        <field name="target">new</field>
+    </record>
+
+    <menuitem
+            action="action_logbook_bill"
+            id="logbook_bill"
+            parent="stock.menu_stock_warehouse_mgmt"
+            name="Logbook Bill"
+            sequence="1"
+    />
+</odoo>
\ No newline at end of file
diff --git a/indoteknik_custom/views/mail_template_efaktur.xml b/indoteknik_custom/views/mail_template_efaktur.xml
new file mode 100644
index 00000000..ca0ea427
--- /dev/null
+++ b/indoteknik_custom/views/mail_template_efaktur.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" ?>
+<odoo>
+    <data>
+        <record id="mail_template_efaktur_document" model="mail.template">
+            <field name="name">Invoice: Send mail efaktur document</field>
+            <field name="model_id" ref="model_account_move" />
+            <field name="subject">Your Invoice ${object.name}</field>
+            <field name="email_from">sales@indoteknik.com</field>
+            <field name="email_to">${object.partner_id.email|safe}</field>
+            <field name="body_html" type="html">
+                <p>Dengan Hormat Bpk/Ibu ${object.partner_id.name},</p>
+                <p>Terlampir Faktur Pajak atas Invoice ${object.name}.</p>
+                <p><strong>Keterangan:</strong></p>
+                <p>Mohon dicek langsung faktur pajak terlampir, terutama informasi nomor NPWP dan alamat NPWP serta nama pembelian barang. Jika ada yang tidak sesuai, mohon segera menginformasikan kepada kami paling lambat 1 (satu) minggu dari tanggal email ini. Revisi faktur pajak tidak dapat kami proses apabila sudah melewati 1 (satu) minggu. Harap maklum.</p>
+                <p>Mohon balas email ini jika sudah menerima, terima kasih.</p>
+                <p>Best Regards,<br />
+                PT. Indoteknik Dotcom Gemilang<br />
+                Jl. Bandengan Utara 85A No. 8-9 Penjaringan.<br />
+                Kec. Penjaringan, Jakarta Utara - DKI Jakarta<br />
+                Telp: 021-2933 8828 / 29 | GSM: 0813 9000 7430 / 31<br />
+                Email: sales@indoteknik.com | Whatsapp: 0812 8080 622</p>
+            </field>
+            <field name="auto_delete" eval="True" />
+        </record>
+    </data>
+</odoo>
diff --git a/indoteknik_custom/views/purchase_order.xml b/indoteknik_custom/views/purchase_order.xml
index 08ff7e84..08ab8691 100755
--- a/indoteknik_custom/views/purchase_order.xml
+++ b/indoteknik_custom/views/purchase_order.xml
@@ -92,6 +92,7 @@
                     <field name="status_paid_cbd"/>
                     <field name="from_apo"/>
                     <field name="approval_edit_line"/>
+                    <field name="logbook_bill_id"/>
                 </field>
 
                 <field name="order_line" position="attributes">
@@ -136,6 +137,8 @@
                     <field name="responsible_ids" widget="many2many_tags" optional="hide"/>
                     <field name="matches_so" widget="many2many_tags" optional="hide"/>
                     <field name="is_create_uangmuka" optional="hide"/>
+                    <field name="logbook_bill_id" optional="hide"/>
+                    <field name="status_printed" optional="hide"/>
                 </field>
             </field>
         </record>
@@ -154,6 +157,8 @@
                     <field name="is_create_uangmuka" optional="hide"/>
                     <field name="responsible_ids" widget="many2many_tags" optional="hide"/>
                     <field name="matches_so" widget="many2many_tags" optional="hide"/>
+                    <field name="logbook_bill_id" optional="hide"/>
+                    <field name="status_printed" optional="hide"/>
                 </field>
             </field>
         </record>
diff --git a/indoteknik_custom/views/purchase_pricelist.xml b/indoteknik_custom/views/purchase_pricelist.xml
index 05a6930b..1ede6854 100755
--- a/indoteknik_custom/views/purchase_pricelist.xml
+++ b/indoteknik_custom/views/purchase_pricelist.xml
@@ -41,12 +41,12 @@
                         </group>
                         <group string="System">
                             <field name="system_price"/>
-                            <field name="taxes_system_id"/>
+                            <field name="taxes_system_id" domain="[('type_tax_use','=','purchase')]"/>
                             <field name="system_last_update"/>
                         </group>
                         <group string="Human">
                             <field name="product_price"/>
-                            <field name="taxes_product_id"/>
+                            <field name="taxes_product_id" domain="[('type_tax_use','=','purchase')]"/>
                             <field name="human_last_update"/>
                         </group>
                     </group>
diff --git a/indoteknik_custom/views/report_logbook_bill.xml b/indoteknik_custom/views/report_logbook_bill.xml
new file mode 100644
index 00000000..fc461400
--- /dev/null
+++ b/indoteknik_custom/views/report_logbook_bill.xml
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <record id="report_logbook_bill_tree" model="ir.ui.view">
+        <field name="name">report.logbook.bill.tree</field>
+        <field name="model">report.logbook.bill</field>
+        <field name="arch" type="xml">
+            <tree create="0" delete="0">
+                <field name="name"/>
+                <field name="approve_by"/>
+                <field name="created_by"/>
+                <field name="date"/>
+                <field name="date_approve"/>
+                <field name="approve_by_finance"/>
+                <field name="state"/>
+                <field name="state_pengajuan"/>
+            </tree>
+        </field>
+    </record>   
+
+    <record id="report_logbook_bill_line_tree" model="ir.ui.view">
+        <field name="name">report.logbook.bill.line.tree</field>
+        <field name="model">report.logbook.bill.line</field>
+        <field name="arch" type="xml">
+            <tree editable="bottom">
+                <field name="name"/>
+                <field name="partner_id"/>
+                <field name="purchase_id"/>
+                <field name="invoice"/>
+                <field name="faktur_pajak"/>
+                <field name="surat_jalan"/>
+                <field name="proforma_invoice"/>
+                <field name="date_approve"/>
+                <field name="grand_total"/>
+                <field name="not_exist"/>
+                <field name="note"/>
+                <field name="note_finance"/>
+            </tree>
+        </field>
+    </record>
+
+    <record id="report_logbook_bill_form" model="ir.ui.view">
+        <field name="name">report.logbook.bill.form</field>
+        <field name="model">report.logbook.bill</field>
+        <field name="arch" type="xml">
+            <form>
+                <header>
+                    <button name="approve"
+                        string="Validate"
+                        type="object"
+                    />
+                </header>
+                <sheet string="Report logbook Bill">
+                        <div class="oe_button_box" name="button_box"/>
+                        <group>
+                            <group>
+                                <field name="name" readonly="1"/>
+                                <field name="date" readonly="1"/>
+                                <field name="date_approve" readonly="1"/>
+                                <field name="state_pengajuan" readonly="1"/>
+                                <field name="pengajuan_by" readonly="1"/>
+                                <field name="date_pengajuan" readonly="1"/>
+                            </group>
+                            <group>
+                                <field name="approve_by_finance" readonly="1"/>
+                                <field name="state" readonly="1"/>
+                                <field name="created_by" readonly="1"/>
+                                <field name="approve_by" readonly="1"/>
+                                <field name="count_line" readonly="1"/>
+                            </group>
+                        </group>
+                        <notebook>
+                            <page string="Line">
+                                <field name="report_logbook_bill_line"/>
+                            </page>
+                        </notebook>
+                    </sheet>
+                    <div class="oe_chatter">
+                        <field name="message_follower_ids" widget="mail_followers"/>
+                        <field name="message_ids" widget="mail_thread"/>
+                    </div>
+            </form>
+        </field>
+    </record>
+
+    <record id="report_logbook_bill_action" model="ir.actions.act_window">
+        <field name="name">Report Logbook Bill</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">report.logbook.bill</field>
+        <field name="view_mode">tree,form</field>
+    </record>
+
+    <menuitem id="menu_report_logbook_bill"
+        name="Report Logbook Bill"
+        action="report_logbook_bill_action"
+        parent="account.menu_finance_reports"
+        sequence="200"/>
+</odoo>
\ No newline at end of file
diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml
index 42a101d0..3eec6d3e 100755
--- a/indoteknik_custom/views/sale_order.xml
+++ b/indoteknik_custom/views/sale_order.xml
@@ -49,10 +49,11 @@
                 </field>
                 <field name="user_id" position="after">
                     <field name="helper_by_id" readonly="1"/>
-                    <!-- <field name="compute_fullfillment"/> -->
+                    <field name="compute_fullfillment"/>
                 </field>
                 <field name="tag_ids" position="after">
                     <field name="eta_date" readonly="1"/>
+                    <field name="flash_sale"/>
                 </field>
                 <field name="analytic_account_id" position="after">
                     <field name="customer_type" required="1"/>
@@ -140,6 +141,7 @@
                     <field name="carrier_id"/>
                     <field name="estimated_arrival_days"/>
                     <field name="picking_iu_id"/>
+                    <field name="note_ekspedisi"/>
                 </field>
                 <field name="carrier_id" position="attributes">
                     <attribute name="attrs">
@@ -187,9 +189,9 @@
                     <page string="Matches PO" name="page_matches_po" invisible="1">
                         <field name="order_sales_match_line" readonly="1"/>
                     </page>
-                    <!-- <page string="Fullfillment" name="page_sale_order_fullfillment">
+                    <page string="Fullfillment" name="page_sale_order_fullfillment">
                         <field name="fullfillment_line" readonly="1"/>
-                    </page> -->
+                    </page>
                 </page>
             </field>
         </record>
@@ -296,7 +298,7 @@
         </record>
     </data>
 
-    <!-- <data>
+    <data>
         <record id="sales_order_fullfillmet_tree" model="ir.ui.view">
             <field name="name">sales.order.fullfillment.tree</field>
             <field name="model">sales.order.fullfillment</field>
@@ -309,7 +311,17 @@
                 </tree>
             </field>
         </record>
-    </data> -->
+    </data>
+
+    <data>
+        <record id="sale_order_multi_create_uangmuka_ir_actions_server" model="ir.actions.server">
+            <field name="name">Uang Muka</field>
+            <field name="model_id" ref="sale.model_sale_order"/>
+            <field name="binding_model_id" ref="sale.model_sale_order"/>
+            <field name="state">code</field>
+            <field name="code">action = records.open_form_multi_create_uang_muka()</field>
+        </record>
+    </data>
 
     <data>
         <record id="mail_template_sale_order_notification_to_salesperson" model="mail.template">
@@ -332,12 +344,6 @@
                                                     <span></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>
@@ -345,10 +351,28 @@
                                 <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 style="padding-bottom: 24px;">Dear ${object.user_id.name},</td></tr>
-
-                                            <tr><td style="padding-bottom: 16px;">Terdapat pesanan ${object.name} dari ${object.partner_id.main_parent_id.name} untuk site ${object.partner_shipping_id.site_id.name | safe} dengan total pembelian ${object.grand_total}</td></tr>
-
+                                            <tr><td style="padding-bottom: 24px;">Dear ${salesperson_name},</td></tr>
+    
+                                            <tr><td style="padding-bottom: 16px;">Terdapat pesanan dari BP ${business_partner} untuk site ${site} dengan total belanja ${sum_total_amount} dari list SO dibawah ini:</td></tr>
+    
+                                            <tr>
+                                                <td>
+                                                    <table border="1" cellpadding="5" cellspacing="0">
+                                                        <thead>
+                                                            <tr>
+                                                                <th>Nama Pesanan</th>
+                                                                <th>Nama Perusahaan Induk</th>
+                                                                <th>Nama Situs</th>
+                                                                <th>Total Pembelian</th>
+                                                            </tr>
+                                                        </thead>
+                                                        <tbody>
+                                                            ${table_content}
+                                                        </tbody>
+                                                    </table>
+                                                </td>
+                                            </tr>
+    
                                             <tr>
                                                 <td style="text-align:center;">
                                                     <hr width="100%"
diff --git a/indoteknik_custom/views/sale_order_multi_uangmuka_penjualan.xml b/indoteknik_custom/views/sale_order_multi_uangmuka_penjualan.xml
new file mode 100644
index 00000000..a72aed87
--- /dev/null
+++ b/indoteknik_custom/views/sale_order_multi_uangmuka_penjualan.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <data>
+        <record id="view_sale_order_multi_create_uangmuka_form" model="ir.ui.view">
+            <field name="name">Sale Order Multi Create Uangmuka</field>
+            <field name="model">sale.order.multi_uangmuka_penjualan</field>
+            <field name="arch" type="xml">
+                <form string="Invoice Sales Order">
+                    <p class="oe_grey">
+                        Pembuatan semi otomatis Uang Muka Penjualan, mohon dicek kembali
+                    </p>
+                    <group>
+                        <field name="pay_amt"/>
+                        <field name="ongkir_amt"/>
+                        <field name="selisih_amt"/>
+                        <field name="account_id" domain="[('name', 'ilike', 'intransit')]"/>
+                        <field name="total_amt" readonly="1"/>
+                    </group>
+                    <footer>
+                        <button name="create_uangmukapenjualanselected" string="Create Uang Muka" type="object" default_focus="1" class="oe_highlight"/>
+                        <button string="Cancel" class="btn btn-secondary" special="cancel" />
+                    </footer>
+                </form>
+            </field>
+        </record>
+
+        <record id="action_sale_order_multi_uangmuka" model="ir.actions.act_window">
+            <field name="name">Sale Order Multi Create Uangmuka</field>
+            <field name="res_model">sale.order.multi_uangmuka_penjualan</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="view_sale_order_multi_create_uangmuka_form"/>
+            <field name="target">new</field>
+        </record>
+    </data>
+</odoo>
\ No newline at end of file