<hafid> fix conflict merge

12 files changed, 126 insertions, 37 deletions

diff --git a/indoteknik_custom/views/account_move.xml b/indoteknik_custom/views/account_move.xml
index 667a6b3e..1b477c6d 100644
--- a/indoteknik_custom/views/account_move.xml
+++ b/indoteknik_custom/views/account_move.xml
@@ -68,6 +68,14 @@
                     <field name="nomor_kwitansi"/>
                     <field name="down_payment"/>
                 </field>
+                <field name="website_id" position="after">
+                    <field name="customer_promise_date"/>
+                    <button name="action_sync_promise_date"
+                        string="Sync Janji Bayar ke Invoice Lain"
+                        type="object"
+                        class="btn-primary"
+                        help="Sync Janji Bayar Customer ke Invoices dengan jumlah Due Date yang sama"/>
+                </field>
                 <field name="to_check" position="after">
                     <field name="already_paid"/>
                     <field name="so_shipping_paid_by"/>
@@ -195,5 +203,37 @@
             <field name="state">code</field>
             <field name="code">action = records.export_faktur_to_xml()</field>
         </record>
+
+        <record id="view_sync_promise_date_wizard_form" model="ir.ui.view">
+            <field name="name">sync.promise.date.wizard.form</field>
+            <field name="model">sync.promise.date.wizard</field>
+            <field name="arch" type="xml">
+                <form string="Sync Janji Bayar">
+                    <group>
+                        <field name="invoice_id" readonly="1"/>
+                        <field name="promise_date" readonly="1"/>
+                    </group>
+                    <field name="line_ids">
+                        <tree create="false" delete="false" editable="bottom">
+                            <field name="sync_check"/>
+                            <field name="invoice_name" readonly="1"/>
+                            <field name="invoice_date_due" readonly="1"/>
+                            <field name="invoice_day_to_due" readonly="1"/>
+                            <field name="new_invoice_day_to_due" readonly="1"/>
+                            <field name="date_terima_tukar_faktur" readonly="1"/>
+                            <field name="amount_total" readonly="1"/>
+                        </tree>
+                    </field>
+
+                    <button name="action_check_all" string="Check All" type="object" class="btn-secondary"/>
+                    <button name="action_uncheck_all" string="Uncheck All" type="object" class="btn-secondary"/>
+                    
+                    <footer>
+                        <button name="action_confirm" string="Konfirmasi Sync" type="object" class="btn-primary"/>
+                        <button string="Batal" class="btn-secondary" special="cancel"/>
+                    </footer>
+                </form>
+            </field>
+        </record>
     </data>
 </odoo>
\ No newline at end of file
diff --git a/indoteknik_custom/views/account_move_views.xml b/indoteknik_custom/views/account_move_views.xml
index 0fd7c9cd..7c1f8913 100644
--- a/indoteknik_custom/views/account_move_views.xml
+++ b/indoteknik_custom/views/account_move_views.xml
@@ -33,7 +33,7 @@
                     <field name="efaktur_id"/>
                     <field name="reference"/>
                     <field name="total_amt"/>
-                    <field name="open_amt"/>
+                    <field name="open_amt" sum="Grand Total Open Amount"/>
                 </tree>
             </field>
         </record>
@@ -68,6 +68,7 @@
                                 <field name="partner_id" readonly="1"/>
                                 <field name="day_extension" attrs="{'readonly': [('is_approve', '=', True)]}"/>    
                                 <field name="order_id" readonly="1"/>
+                                <field name="amount_total" readonly="1"/>
                             </group>
                             <group>
                                 <field name="is_approve" readonly="1"/>
diff --git a/indoteknik_custom/views/approval_payment_term.xml b/indoteknik_custom/views/approval_payment_term.xml
index f7c24737..5c130f3f 100644
--- a/indoteknik_custom/views/approval_payment_term.xml
+++ b/indoteknik_custom/views/approval_payment_term.xml
@@ -86,6 +86,17 @@
         <field name="view_mode">tree,form</field>
     </record>
 
+    <record id="approval_payment_term_search" model="ir.ui.view">
+        <field name="name">approval.payment.term.search</field>
+        <field name="model">approval.payment.term</field>
+        <field name="arch" type="xml">
+            <search>
+                <field name="number" string="Document Number"/>
+                <field name="partner_id" string="Partner"/>
+            </search>
+        </field>
+    </record>
+
     <menuitem id="menu_approval_payment_term" name="Approval Payment Term"
         parent="account.menu_finance_receivables"
         action="approval_payment_term_action" 
diff --git a/indoteknik_custom/views/assets.xml b/indoteknik_custom/views/assets.xml
new file mode 100644
index 00000000..4475004e
--- /dev/null
+++ b/indoteknik_custom/views/assets.xml
@@ -0,0 +1,7 @@
+<odoo>
+    <template id="indoteknik_assets_backend" inherit_id="web.assets_backend" name="Indoteknik Custom Backend Assets">
+        <xpath expr="." position="inside">
+            <script type="text/javascript" src="/indoteknik_custom/static/src/js/check_product_barcode.js"/>
+        </xpath>
+    </template>
+</odoo>
diff --git a/indoteknik_custom/views/customer_commision.xml b/indoteknik_custom/views/customer_commision.xml
index 514e6284..7c72d86a 100644
--- a/indoteknik_custom/views/customer_commision.xml
+++ b/indoteknik_custom/views/customer_commision.xml
@@ -164,6 +164,7 @@
         <field name="priority" eval="15"/>
         <field name="arch" type="xml">
             <search string="Search Customer Commision">
+                <field name="number" string="Document Number"/>
                 <field name="partner_ids"/>
                 <group expand="0" string="Group By">
                     <filter string="Partner" name="group_partner"
diff --git a/indoteknik_custom/views/dunning_run.xml b/indoteknik_custom/views/dunning_run.xml
index 2117a7bb..210f7917 100644
--- a/indoteknik_custom/views/dunning_run.xml
+++ b/indoteknik_custom/views/dunning_run.xml
@@ -29,7 +29,7 @@
                 <field name="date_invoice"/>
                 <field name="efaktur_id"/>
                 <field name="reference"/>
-                <field name="total_amt"/>
+                <field name="total_amt" sum="Grand Total Amount"/>
                 <field name="open_amt"/>
                 <field name="due_date"/>
             </tree>
diff --git a/indoteknik_custom/views/mail_template_invoice_reminder.xml b/indoteknik_custom/views/mail_template_invoice_reminder.xml
index 8450be28..13c02a08 100644
--- a/indoteknik_custom/views/mail_template_invoice_reminder.xml
+++ b/indoteknik_custom/views/mail_template_invoice_reminder.xml
@@ -8,45 +8,50 @@
       <field name="email_from">finance@indoteknik.co.id</field>
       <field name="email_to"></field>
       <field name="body_html" type="html">
-        <div>
+        <div style="font-family:Arial, sans-serif; font-size:13px; color:#333;">
           <p><b>Dear ${object.name},</b></p>
 
           <p>${days_to_due_message}</p>
 
-          <table border="1" cellpadding="4" cellspacing="0" style="border-collapse: collapse; font-size: 12px">
+          <table cellpadding="6" cellspacing="0" width="100%" 
+                 style="border-collapse:collapse; font-size:12px; border:1px solid #ddd;">
             <thead>
-              <tr style="background-color: #f2f2f2;" align="left">
-                <th>Customer</th>
-                <th>No. PO</th>
-                <th>Invoice Number</th>
-                <th>Invoice Date</th>
-                <th>Due Date</th>
-                <th>Amount</th>
-                <th>Term</th>
-                <th>Days To Due</th>
+              <tr style="background-color:#f2f2f2; text-align:left;">
+                <th style="border:1px solid #ddd;">Customer</th>
+                <th style="border:1px solid #ddd;">No. PO</th>
+                <th style="border:1px solid #ddd;">Invoice Number</th>
+                <th style="border:1px solid #ddd;">Invoice Date</th>
+                <th style="border:1px solid #ddd;">Due Date</th>
+                <th style="border:1px solid #ddd;">Amount</th>
+                <th style="border:1px solid #ddd;">Term</th>
+                <th style="border:1px solid #ddd;">Days To Due</th>
               </tr>
             </thead>
             <tbody>
+              <!-- baris invoice akan diinject dari Python -->
             </tbody>
           </table>
 
           <p>${closing_message}</p>
+          ${limit_info_html}
           <br/>
           <p>Terima Kasih.</p>
-                <br/>
-                <br/>
-                <p><b>Best Regards,
-                    <br/>
-                    <br/>
-                    Widya R.<br/>
-                    Dept. Finance<br/>
-                    PT. INDOTEKNIK DOTCOM GEMILANG<br/>
-                    <img src="https://erp.indoteknik.com/api/image/ir.attachment/datas/2135765" alt="Indoteknik" style="max-width: 18%; height: auto;"></img><br/>
-                    <a href="https://wa.me/6285716970374" target="_blank">+62-857-1697-0374</a> | 
-                    <a href="mailto:finance@indoteknik.co.id">finance@indoteknik.co.id</a>
-                    </b></p>
-                    <p><i>Email ini dikirim secara otomatis. Abaikan jika pembayaran telah dilakukan.</i></p>
-
+          <br/><br/>
+          <p>
+            <b>
+              Best Regards,<br/><br/>
+              Widya R.<br/>
+              Dept. Finance<br/>
+              PT. INDOTEKNIK DOTCOM GEMILANG<br/>
+              <img src="https://erp.indoteknik.com/api/image/ir.attachment/datas/2135765" 
+                   alt="Indoteknik" style="max-width:18%; height:auto;"/><br/>
+              <a href="https://wa.me/6285716970374" target="_blank">+62-857-1697-0374</a> | 
+              <a href="mailto:finance@indoteknik.co.id">finance@indoteknik.co.id</a>
+            </b>
+          </p>
+          <p style="font-size:11px; color:#777;">
+            <i>Email ini dikirim secara otomatis. Abaikan jika pembayaran telah dilakukan.</i>
+          </p>
         </div>
       </field>
       <field name="auto_delete" eval="True"/>
diff --git a/indoteknik_custom/views/product_template.xml b/indoteknik_custom/views/product_template.xml
index 8f9d1190..177449f4 100755
--- a/indoteknik_custom/views/product_template.xml
+++ b/indoteknik_custom/views/product_template.xml
@@ -66,6 +66,7 @@
             <field name="model">image.carousel</field>
             <field name="arch" type="xml">
                 <tree editable="bottom">
+                    <field name="sequence" widget="handle"/>
                     <field name="image" widget="image" width="80"/>
                 </tree>
             </field>
diff --git a/indoteknik_custom/views/purchase_order.xml b/indoteknik_custom/views/purchase_order.xml
index 15cdc788..821f3295 100755
--- a/indoteknik_custom/views/purchase_order.xml
+++ b/indoteknik_custom/views/purchase_order.xml
@@ -14,6 +14,16 @@
                             attrs="{'invisible': ['|', ('sale_order_id', '=', False), ('state', 'not in', ['draft'])]}"
                     />
                 </div>
+                <xpath expr="//button[@name='action_view_invoice']" position="after">
+                <button type="object"
+                        name="action_view_related_bu"
+                        class="oe_stat_button"
+                        icon="fa-truck"                
+                        attrs="{'invisible': [('state', 'in', ['draft', 'sent'])]}">
+                        <field name="bu_related_count" widget="statinfo" string="BU Related"/>
+                    </button>
+                    <field name="picking_count" invisible="1"/>
+                </xpath>
                 <xpath expr="//button[@name='action_view_invoice']" position="before">
                     <field name="is_cab_visible" invisible="1"/>
                     <button type="object"
@@ -21,21 +31,19 @@
                         class="oe_stat_button"
                         icon="fa-book"
                         attrs="{'invisible': [('is_cab_visible', '=', False)]}"
-                        style="width: 200px;">
+                        >
                         <field name="move_id" widget="statinfo" string="Journal Uang Muka"/>
                         <span class="o_stat_text">
                             <t t-esc="record.move_id.name"/>
                         </span>
                     </button>
-                    <button type="object"
-                            name="action_view_related_bu"
-                            class="oe_stat_button"
-                            icon="fa-truck"
-                            style="width: 200px;"
-                            attrs="{'invisible': [('state', 'in', ['draft', 'sent'])]}">
-                        <field name="bu_related_count" widget="statinfo" string="BU Related"/>
+                    <button name="action_view_bills"
+                            type="object"
+                            icon="fa-pencil-square-o"
+                            attrs="{'invisible': [
+                                ('bills_related_count', '=', 0)]}">
+                        <field string="Bills DP &amp; Pelunasan" name="bills_related_count" widget="statinfo"/>
                     </button>
-                    <field name="picking_count" invisible="1"/>
                 </xpath>
                 <button id="draft_confirm" position="after">
                     <button name="po_approve"
diff --git a/indoteknik_custom/views/res_partner.xml b/indoteknik_custom/views/res_partner.xml
index b081f6f2..ca1a36de 100644
--- a/indoteknik_custom/views/res_partner.xml
+++ b/indoteknik_custom/views/res_partner.xml
@@ -87,6 +87,7 @@
                     <field name="use_so_approval" attrs="{'invisible': [('parent_id', '!=', False), ('company_type', '!=', 'company')]}" />
                     <field name="use_only_ready_stock" attrs="{'invisible': [('parent_id', '!=', False), ('company_type', '!=', 'company')]}" />
                     <field name="web_role" attrs="{'invisible': ['|', ('parent_id', '=', False), ('company_type', '=', 'company')]}" />
+                    <field name="reminder_invoices" attrs="{'invisible': ['|', ('parent_id', '=', False), ('company_type', '=', 'company')]}"/>
                 </field>
                 <xpath expr="//field[@name='child_ids']/form//field[@name='name']" position="before">
                     <field name="parent_id" invisible="1" />
@@ -215,6 +216,10 @@
                             <field name="dokumen_laporan_keuangan"  />
                             <field name="dokumen_ktp_dirut"  />
                         </group>
+                        <group string="Reminder Invoices" attrs="{'invisible': [('parent_id', '!=', False), ('company_type', '!=', 'company')]}">
+                            <field name="dont_send_reminder_inv_parent"/>
+                            <field name="dont_send_reminder_inv_all" />
+                        </group>
                     </page>
                     <page string="Aging Info">
                         <group string="Aging Info">
diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml
index 8f8e4288..156c48d7 100755
--- a/indoteknik_custom/views/sale_order.xml
+++ b/indoteknik_custom/views/sale_order.xml
@@ -288,6 +288,9 @@
                     <field name="note" optional="hide"/>
                     <field name="note_procurement" optional="hide"/>
                     <field name="vendor_subtotal" optional="hide"/>
+                    <field name="unreserved_percent" widget="percentpie" string="Unreserved"/>
+                    <field name="reserved_percent" widget="percentpie" string="Reserved"/>
+                    <field name="delivered_percent" widget="percentpie" string="Delivered"/>
                     <field name="weight" optional="hide"/>
                     <field name="is_has_disc" string="Flash Sale Item?" readonly="1" optional="hide"/>
                     <field name="amount_voucher_disc" string="Voucher" readonly="1" optional="hide"/>
@@ -475,6 +478,13 @@
                     <field name="date_kirim_ril"/>
                     <field name="date_driver_departure"/>
                     <field name="date_driver_arrival"/>
+                    <field name="payment_state_custom" widget="badge" 
+                    decoration-danger="payment_state_custom == 'unpaid'" 
+                    decoration-success="payment_state_custom == 'paid'"
+                    decoration-warning="payment_state_custom == 'partial'" optional="hide"/>
+                    <field name="unreserved_percent" widget="percentpie" string="Unreserved" optional="hide"/>
+                    <field name="reserved_percent" widget="percentpie" string="Reserved" optional="hide"/>
+                    <field name="delivered_percent" widget="percentpie" string="Delivered" optional="hide"/>
                     <field name="payment_type" optional="hide"/>
                     <field name="payment_status" optional="hide"/>
                     <field name="pareto_status" optional="hide"/>
diff --git a/indoteknik_custom/views/user_pengajuan_tempo.xml b/indoteknik_custom/views/user_pengajuan_tempo.xml
index f9dca4ca..ad35d7fa 100644
--- a/indoteknik_custom/views/user_pengajuan_tempo.xml
+++ b/indoteknik_custom/views/user_pengajuan_tempo.xml
@@ -271,7 +271,7 @@
             <field name="subject">Pengajuan Tempo Harus di Periksa!</field>
             <field name="email_from">"Indoteknik.com" &lt;noreply@indoteknik.com&gt;</field>
             <field name="reply_to">sales@indoteknik.com</field>
-            <field name="email_to">finance@indoteknik.co.id, stephan@indoteknik.co.id, sapiabon768@gmail.com</field>
+            <field name="email_to">finance@indoteknik.co.id, stephan@indoteknik.co.id</field>
 <!--            <field name="email_to">sapiabon768@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:Inter, Helvetica, Verdana, Arial,sans-serif; line-height: 24px; color: #454748; width: 100%; border-collapse:separate;">