Merge branch 'odoo-backup' of https://bitbucket.org/altafixco/indoteknik-addons into pum-v2

13 files changed, 141 insertions, 27 deletions

diff --git a/indoteknik_custom/views/account_move.xml b/indoteknik_custom/views/account_move.xml
index 9b1c791b..e5d1cf8a 100644
--- a/indoteknik_custom/views/account_move.xml
+++ b/indoteknik_custom/views/account_move.xml
@@ -29,6 +29,8 @@
                 </field>
                 <field name="payment_reference" position="after">
                     <field name="date_completed" readonly="1" attrs="{'invisible': [('move_type', '!=', 'out_invoice')]}"/>
+                    <field name="payment_date" readonly="1" attrs="{'invisible': [('move_type', '!=', 'out_invoice'), ('payment_date', '=', False)]}"/>
+                    <field name="partial_payment" readonly="1" attrs="{'invisible': [('move_type', '!=', 'out_invoice'), ('payment_state', '!=', 'partial')]}"/>
                     <field name="reklas_id" attrs="{'invisible': [('move_type', '!=', 'out_invoice')]}"/>
                 </field>
                 <field name="invoice_date" position="after">
diff --git a/indoteknik_custom/views/account_move_views.xml b/indoteknik_custom/views/account_move_views.xml
index da25636e..0fd7c9cd 100644
--- a/indoteknik_custom/views/account_move_views.xml
+++ b/indoteknik_custom/views/account_move_views.xml
@@ -47,15 +47,20 @@
                         <button name="approve_new_due"
                             string="Approve"
                             type="object"
+                            attrs="{'readonly': [('approval_status', 'in', ('approved'))]}"
                         />
                         <button name="due_extension_approval"
                                 string="Ask Approval"
                                 type="object"
+                                attrs="{'readonly': [('approval_status', 'in', ('approved'))]}"
                         />
                         <button name="due_extension_cancel"
                                 string="Cancel"
                                 type="object"
+                                attrs="{'readonly': [('approval_status', 'in', ('approved'))]}"
                         />
+                        <field name="approval_status" widget="statusbar"
+                        statusbar_visible="pengajuan,approved"/>
                     </header>
                     <sheet>
                         <group>
@@ -67,7 +72,6 @@
                             <group>
                                 <field name="is_approve" readonly="1"/>
                                 <field name="counter" readonly="1"/>
-                                <field name="approval_status" readonly="1"/>
                                 <field name="approve_by" readonly="1"/>
                                 <field name="date_approve" readonly="1"/>
                             </group>
diff --git a/indoteknik_custom/views/approval_payment_term.xml b/indoteknik_custom/views/approval_payment_term.xml
index cc9db914..f7c24737 100644
--- a/indoteknik_custom/views/approval_payment_term.xml
+++ b/indoteknik_custom/views/approval_payment_term.xml
@@ -59,7 +59,8 @@
                         </group>
                         <group>
                             <field name="reason"/>
-                            <field name="reason_reject" attrs="{'invisible': [('state', '!=', 'rejected')]}"/>
+                            <field name="reason_reject" invisible="1"/>
+                            <field name="reject_reason" attrs="{'invisible': [('state', '!=', 'rejected')]}"/>
                             <field name="approve_date" readonly="1"/>
                             <field name="approve_sales_manager" readonly="1"/>
                             <field name="approve_finance" readonly="1"/>
diff --git a/indoteknik_custom/views/mail_template_invoice_reminder.xml b/indoteknik_custom/views/mail_template_invoice_reminder.xml
index 21055eb0..8450be28 100644
--- a/indoteknik_custom/views/mail_template_invoice_reminder.xml
+++ b/indoteknik_custom/views/mail_template_invoice_reminder.xml
@@ -6,29 +6,32 @@
       <field name="model_id" ref="account.model_account_move"/>
       <field name="subject">Reminder Invoice Due - ${object.name}</field>
       <field name="email_from">finance@indoteknik.co.id</field>
-      <field name="email_to">andrifebriyadiputra@gmail.com</field>
+      <field name="email_to"></field>
       <field name="body_html" type="html">
         <div>
           <p><b>Dear ${object.name},</b></p>
 
-          <p>Berikut adalah daftar invoice Anda yang mendekati atau telah jatuh tempo:</p>
+          <p>${days_to_due_message}</p>
 
-          <table border="1" cellpadding="4" cellspacing="0" style="border-collapse: collapse; width: 100%; font-size: 12px">
+          <table border="1" cellpadding="4" cellspacing="0" style="border-collapse: collapse; font-size: 12px">
             <thead>
               <tr style="background-color: #f2f2f2;" align="left">
+                <th>Customer</th>
+                <th>No. PO</th>
                 <th>Invoice Number</th>
-                <th>Tanggal Invoice</th>
-                <th>Jatuh Tempo</th>
-                <th>Sisa Hari</th>
-                <th>Total</th>
-                <th>Referensi</th>
+                <th>Invoice Date</th>
+                <th>Due Date</th>
+                <th>Amount</th>
+                <th>Term</th>
+                <th>Days To Due</th>
               </tr>
             </thead>
             <tbody>
             </tbody>
           </table>
 
-          <p>Mohon bantuan dan kerjasamanya agar tetap bisa bekerjasama dengan baik</p>
+          <p>${closing_message}</p>
+          <br/>
           <p>Terima Kasih.</p>
                 <br/>
                 <br/>
@@ -42,6 +45,7 @@
                     <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>
 
         </div>
       </field>
diff --git a/indoteknik_custom/views/purchase_order.xml b/indoteknik_custom/views/purchase_order.xml
index ff223125..15cdc788 100755
--- a/indoteknik_custom/views/purchase_order.xml
+++ b/indoteknik_custom/views/purchase_order.xml
@@ -75,11 +75,13 @@
                 </field>
                 <field name="partner_id" position="after">
                     <field name="purchase_order_count"/>
+                    <field name="complete_bu_in_count" invisible="1"/>
                 </field>
                 <field name="incoterm_id" position="after">
                     <field name="amount_total_without_service"/>
                     <field name="delivery_amt"/>
                     <field name="approve_by"/>
+                    <field name="reason_change_date_planned"/>
                 </field>
                 <field name="currency_id" position="after">
                     <field name="summary_qty_po"/>
@@ -106,9 +108,16 @@
                 <field name="product_id" position="attributes">
                     <attribute name="options">{'no_create': True}</attribute>
                 </field>
-                <field name="date_planned" position="attributes">
-                    <attribute name="invisible">1</attribute>
-                </field>
+                <xpath expr="//field[@name='date_planned']" position="replace">
+                    <field name="date_planned" readonly="1"/>
+                </xpath>                
+                <xpath expr="//field[@name='date_planned']" position="after">
+                    <button name="action_open_change_date_wizard"
+                            type="object"
+                            string="Change Receipt Date"
+                            class="btn-primary"
+                            attrs="{'invisible': ['|', ('state', '=', 'cancel'), ('complete_bu_in_count', '=', 0)]}"/>
+                </xpath>                               
                 <field name="product_qty" position="before">
                     <field name="is_edit_product_qty" readonly="1" optional="hide"/>
                     <field name="qty_onhand" readonly="1" optional="hide"/>
@@ -225,6 +234,34 @@
     </data>
 
     <data>
+        <record id="view_change_date_planned_wizard_form" model="ir.ui.view">
+            <field name="name">change.date.planned.wizard.form</field>
+            <field name="model">change.date.planned.wizard</field>
+            <field name="arch" type="xml">
+                <form string="Change Date Planned">
+                    <group>
+                        <field name="purchase_id" readonly="1"/>
+                        <field name="old_date_planned" readonly="1"/>
+                        <field name="date_changed" invisible="1"/>
+                        <field name="new_date_planned"/>
+                        <field name="reason"
+                                attrs="{
+                                    'invisible': ['|', ('old_date_planned', '=', False), ('date_changed', '=', False)],
+                                    'required': [('date_changed', '=', True)]
+                                }"/>
+                    </group>
+                    
+                    <footer>
+                        <button name="confirm_change" type="object" string="Confirm" class="btn-primary"/>
+                        <button string="Cancel" class="btn-secondary" special="cancel"/>
+                    </footer>
+                </form>
+            </field>
+        </record>
+    </data>
+    
+
+    <data>
         <record id="rfq_order_tree_view_inherit" model="ir.ui.view">
             <field name="name">Purchase</field>
             <field name="model">purchase.order</field>
@@ -391,4 +428,24 @@
             <field name="code">action = records.open_form_multi_cancel()</field>
         </record>
     </data>
+    <data>
+        <record id="action_update_receipt_date_po" model="ir.actions.server">
+            <field name="name">Update Receipt Date</field>
+            <field name="model_id" ref="purchase.model_purchase_order"/>
+            <field name="binding_model_id" ref="purchase.model_purchase_order"/>
+            <field name="state">code</field>
+            <field name="binding_view_types">list</field>
+            <field name="code">
+                action = {
+                    'type': 'ir.actions.act_window',
+                    'res_model': 'purchase.order.update.date.wizard',
+                    'view_mode': 'form',
+                    'target': 'new',
+                    'context': {
+                        'active_ids': env.context.get('active_ids', []),
+                    },
+                }
+            </field>
+        </record>
+    </data>
 </odoo>
\ No newline at end of file
diff --git a/indoteknik_custom/views/purchasing_job.xml b/indoteknik_custom/views/purchasing_job.xml
index e3866d84..2466e7be 100644
--- a/indoteknik_custom/views/purchasing_job.xml
+++ b/indoteknik_custom/views/purchasing_job.xml
@@ -17,7 +17,7 @@
                 <field name="status_apo" invisible="1"/>
                 <field name="action"/>
                 <field name="note"/>
-                <field name="date_po"/>
+                <field name="date_po" optional="hide"/>
                 <field name="so_number"/>
                 <field name="check_pj" invisible="1"/>
                 <button name="action_open_job_detail"
diff --git a/indoteknik_custom/views/res_partner.xml b/indoteknik_custom/views/res_partner.xml
index a030a75c..b081f6f2 100644
--- a/indoteknik_custom/views/res_partner.xml
+++ b/indoteknik_custom/views/res_partner.xml
@@ -102,6 +102,9 @@
                                 />
                     </div>
                 </xpath>
+                <xpath expr="//field[@name='child_ids']/form//field[@name='mobile']" position="after">
+                    <field name="reminder_invoices"/>
+                </xpath>
                 <xpath expr="//field[@name='property_payment_term_id']" position="attributes">
                     <attribute name="readonly">0</attribute>
                 </xpath>
@@ -217,7 +220,7 @@
                         <group string="Aging Info">
                             <field name="avg_aging" readonly="1"/>
                             <field name="payment_difficulty" attrs="{'readonly': [('parent_id', '!=', False)]}" />
-                            <field name="payment_history_url" readonly="1" />
+                            <field name="payment_history_url" readonly="1" widget="url"/>
                         </group>
                     </page>
                 </notebook>
diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml
index c1f1fe61..868bce7b 100755
--- a/indoteknik_custom/views/sale_order.xml
+++ b/indoteknik_custom/views/sale_order.xml
@@ -172,6 +172,7 @@
                 <xpath expr="//page[@name='other_information']/group/group[@name='sale_reporting']" position="after">
                     <group string="ETA">
                         <field name="et_products"/>
+                        <field name="reason_change_date_planned" readonly="1"/>
                         <field name="eta_date_reserved"/>
                         <field name="expected_ready_to_ship"/>
                         <field name="eta_date_start"/>
@@ -290,6 +291,7 @@
                     <field name="note_procurement" optional="hide"/>
                     <field name="vendor_subtotal" optional="hide"/>
                     <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"/>
                     <field name="order_promotion_id" string="Promotion" readonly="1" optional="hide"/>
                 </xpath>
@@ -353,8 +355,9 @@
                 </field>
                 <field name="payment_term_id" position="attributes">
                     <attribute name="attrs">
-                        {'readonly': [('approval_status', '=', 'approved'), ('state', 'not in',
-                                                                             ['cancel', 'draft'])]}
+                        {'readonly': ['|', ('approval_status', 'in', ['pengajuan1', 'pengajuan2', 'approved']),
+                        ('state', 'not in',
+                        ['cancel', 'draft'])]}
                     </attribute>
                 </field>
 
diff --git a/indoteknik_custom/views/stock_picking.xml b/indoteknik_custom/views/stock_picking.xml
index f9200dfa..b3f0ce9f 100644
--- a/indoteknik_custom/views/stock_picking.xml
+++ b/indoteknik_custom/views/stock_picking.xml
@@ -129,6 +129,9 @@
                 <field name="date_done" position="after">
                     <field name="arrival_time"/>
                 </field>
+                <field name="scheduled_date" position="attributes">
+                    <attribute name="readonly">1</attribute>
+                </field>
                 <field name="origin" position="after">
 <!--                    <field name="show_state_approve_md" invisible="1" optional="hide"/>-->
                     <field name="state_approve_md" widget="badge"/>
@@ -165,6 +168,7 @@
                     <field name="approval_receipt_status"/>
                     <field name="approval_return_status"/>
                     <field name="so_lama"/>
+                    <field name="reason_change_date_planned" readonly="1"/>
                 </field>
                 <field name="product_id" position="before">
                     <field name="line_no" attrs="{'readonly': 1}" optional="hide"/>
diff --git a/indoteknik_custom/views/tukar_guling.xml b/indoteknik_custom/views/tukar_guling.xml
index fa3db0d2..a8d8b7b7 100644
--- a/indoteknik_custom/views/tukar_guling.xml
+++ b/indoteknik_custom/views/tukar_guling.xml
@@ -21,7 +21,7 @@
 			<field name="name">pengajuan.tukar.guling.tree</field>
 			<field name="model">tukar.guling</field>
 			<field name="arch" type="xml">
-				<tree create="1" delete="1" default_order="create_date desc">
+				<tree create="0" delete="1" default_order="create_date desc">
 					<field name="name"/>
                     <field name="partner_id" string="Customer"/>
                     <field name="origin" string="SO Number"/>
@@ -29,6 +29,7 @@
 					<field name="return_type" string="Return Type"/>
 					<field name="state" widget="badge"
 						   decoration-info="state in ('draft', 'approval_sales', 'approval_finance','approval_logistic')"
+                           decoration-warning="state == 'approved'"
 						   decoration-success="state == 'done'"
 						   decoration-muted="state == 'cancel'"
 					/>
@@ -58,7 +59,7 @@
                                 class="btn-secondary"
                                 attrs="{'invisible': [('state', '!=', 'cancel')]}"/>
                         <field name="state" widget="statusbar" readonly="1"
-                               statusbar_visible="draft,approval_sales,approval_logistic,approval_finance,done"/>
+                               statusbar_visible="draft,approval_sales,approval_logistic,approval_finance,approved,done"/>
                     </header>
                     <sheet>
                         <div class="oe_button_box">
@@ -66,7 +67,7 @@
                                     type="object"
                                     class="oe_stat_button"
                                     icon="fa-truck"
-                                    attrs="{'invisible': [('picking_ids', '=', False), ('state', 'in', ['draft', 'approval_sales', 'approval_logistic', 'approval_finance'])]}">
+                                    attrs="{'invisible': [('picking_ids', '=', False), ('state', 'in', ['draft', 'approval_sales', 'approval_logistic', 'approval_finance', 'approved', 'done', 'cancel'])]}">
                                 <field name="picking_ids" widget="statinfo" string="Delivery"/>
                             </button>
                         </div>
@@ -82,9 +83,13 @@
                                 <field name="return_type" attrs="{'readonly': [('state', 'not in', 'draft')]}"/>
                                 <field name="operations"
                                        attrs="{'readonly': [('state', 'not in', 'draft')]}"/>
-                                <field name="origin" readonly="1"/>
+<!--                                <field name="origin" readonly="1"/>-->
+                                <field name="origin_so" readonly="1"/>
+                                <field name="is_has_invoice" readonly="1"/>
+                                <field name="invoice_id" readonly="1" widget="many2many_tags"/>
                             </group>
                             <group>
+                                <field name="val_inv_opt" attrs="{'invisible': [('is_has_invoice', '=', False)]}"/>
                                 <field name="ba_num" string="Nomor BA"/>
                                 <field name="notes"/>
                                 <field name="date_sales" readonly="1"/>
diff --git a/indoteknik_custom/views/tukar_guling_po.xml b/indoteknik_custom/views/tukar_guling_po.xml
index 26c0a0d4..d0ae9e96 100644
--- a/indoteknik_custom/views/tukar_guling_po.xml
+++ b/indoteknik_custom/views/tukar_guling_po.xml
@@ -24,11 +24,12 @@
 				<tree create="1" delete="1" default_order="create_date desc">
 					<field name="name"/>
                     <field name="vendor_id" string="Customer"/>
-                    <field name="origin" string="SO Number"/>
+                    <field name="origin" string="PO Number"/>
 					<field name="operations" string="Operations"/>
 					<field name="return_type" string="Return Type"/>
 					<field name="state" widget="badge"
 						   decoration-info="state in ('draft', 'approval_purchase', 'approval_finance','approval_logistic')"
+						   decoration-warning="state == 'approved'"
 						   decoration-success="state == 'done'"
 						   decoration-muted="state == 'cancel'"
 					/>
@@ -60,7 +61,7 @@
 								attrs="{'invisible': [('state', '!=', 'cancel')]}"
 								confirm="Are you sure you want to reset this record to draft?"/>
 						<field name="state" widget="statusbar" readonly="1"
-							   statusbar_visible="draft,approval_purchase,approval_logistic,approval_finance,done"/>
+							   statusbar_visible="draft,approval_purchase,approval_logistic,approval_finance,approved,done"/>
 					</header>
 					<sheet>
 						<div class="oe_button_box">
@@ -88,10 +89,14 @@
 									   attrs="{
            'required': [('return_type', 'in', ['revisi_po', 'tukar_guling'])]
        }"/>
-								<field name="origin" readonly="1"/>
-								<!--								<field name="origin_so" readonly="1"/>-->
+<!--								<field name="origin" readonly="1"/>-->
+								<field name="origin_po" readonly="1"/>
+								<field name="is_has_bill" readonly="1"/>
+<!--								<field name="bill_id" readonly="1" />-->
+								<field name="bill_id" readonly="1" widget="many2many_tags"/>
 							</group>
 							<group>
+								<field name="val_bil_opt" attrs="{'invisible': [('is_has_bill', '=', False)]}"/>
 								<field name="ba_num" string="Nomor BA"/>
 								<field name="notes"/>
 								<field name="date_purchase" readonly="1"/>
diff --git a/indoteknik_custom/views/update_date_planned_po_wizard_view.xml b/indoteknik_custom/views/update_date_planned_po_wizard_view.xml
new file mode 100644
index 00000000..6b3ab991
--- /dev/null
+++ b/indoteknik_custom/views/update_date_planned_po_wizard_view.xml
@@ -0,0 +1,25 @@
+<odoo>
+    <record id="view_update_date_planned_po_wizard_form" model="ir.ui.view">
+      <field name="name">purchase.order.update.date.wizard.form</field>
+      <field name="model">purchase.order.update.date.wizard</field>
+      <field name="arch" type="xml">
+        <form string="Update Receipt Date">
+          <group>
+            <field name="date_planned"/>
+          </group>
+          <footer>
+            <button string="Apply" type="object" name="action_update_date" class="btn-primary"/>
+            <button string="Cancel" special="cancel"/>
+          </footer>
+        </form>
+      </field>
+    </record>
+  
+    <record id="action_update_date_planned_po_wizard" model="ir.actions.act_window">
+      <field name="name">Update Receipt Date</field>
+      <field name="res_model">purchase.order.update.date.wizard</field>
+      <field name="view_mode">form</field>
+      <field name="target">new</field>
+    </record>
+  </odoo>
+  
\ No newline at end of file
diff --git a/indoteknik_custom/views/user_company_request.xml b/indoteknik_custom/views/user_company_request.xml
index 88d04c64..5f296cb0 100644
--- a/indoteknik_custom/views/user_company_request.xml
+++ b/indoteknik_custom/views/user_company_request.xml
@@ -31,7 +31,8 @@
                         <group>
                             <field name="user_id" readonly="1"/>
                             <field name="similar_company_ids" invisible="1"/>
-                            <field name="user_company_id" domain="[('id', 'in', similar_company_ids)]"/>
+<!--                            <field name="user_company_id" domain="[('id', 'in', similar_company_ids)]"/>-->
+                            <field name="user_company_id" />
                             <field name="user_input" readonly="1"/>
                             <field
                                 name="is_approve"