<hapit>merge

6 files changed, 58 insertions, 211 deletions

diff --git a/indoteknik_custom/views/purchase_order.xml b/indoteknik_custom/views/purchase_order.xml
index ff223125..fedcb4f9 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>
diff --git a/indoteknik_custom/views/refund_sale_order.xml b/indoteknik_custom/views/refund_sale_order.xml
deleted file mode 100644
index 4f791722..00000000
--- a/indoteknik_custom/views/refund_sale_order.xml
+++ /dev/null
@@ -1,199 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<odoo>
-    <!-- Tree View -->
-    <record id="view_refund_sale_order_tree" model="ir.ui.view">
-        <field name="name">refund.sale.order.tree</field>
-        <field name="model">refund.sale.order</field>
-        <field name="arch" type="xml">
-            <tree string="Refund Sales Orders">
-                <field name="name" readonly="1"/>
-                <field name="created_date" readonly="1"/>
-                <field name="partner_id" readonly="1"/>
-                <field name="sale_order_ids" widget="many2many_tags" readonly="1"/>
-                <field name="uang_masuk" readonly="1"/>
-                <field name="ongkir" readonly="1"/>
-                <field name="total_invoice" readonly="1"/>
-                <field name="amount_refund" readonly="1"/>
-                <field name="status"
-                    decoration-info="status == 'draft'" 
-                    decoration-danger="status == 'reject'" 
-                    decoration-success="status == 'refund'" 
-                    decoration-warning="status == 'pengajuan1' or status == 'pengajuan2' or status == 'pengajuan3'"
-                    widget="badge"
-                    readonly="1"/>
-                <field name="status_payment" 
-                    decoration-info="status_payment == 'pending'" 
-                    decoration-danger="status_payment == 'reject'" 
-                    decoration-success="status_payment == 'done'" 
-                    widget="badge"
-                    readonly="1"/>
-                <field name="refund_date" readonly="1"/>
-                <field name="amount_refund_text" readonly="1" optional="hide"/>
-                <field name="invoice_ids" readonly="1" optional="hide"/>
-                <field name="refund_type" readonly="1" optional="hide"/>
-                <field name="user_ids" readonly="1" optional="hide"/>
-            </tree>
-        </field>
-    </record>
-
-    <!-- Form View -->
-    <record id="view_refund_sale_order_form" model="ir.ui.view">
-        <field name="name">refund.sale.order.form</field>
-        <field name="model">refund.sale.order</field>
-        <field name="arch" type="xml">
-            <form string="Refund Sales Order">
-                <header>
-                    <button name="action_ask_approval"
-                            type="object"
-                            string="Ask Approval"
-                            attrs="{'invisible': [('status', '!=', 'draft')]}"/>
-
-                    <button name="action_approve_flow"
-                            type="object"
-                            string="Approve"
-                            class="oe_highlight"
-                            attrs="{'invisible': [('status', 'in', ['refund', 'reject', 'draft'])]}"/>
-                    <button name="action_trigger_cancel"
-                            type="object"
-                            string="Cancel"
-                            attrs="{'invisible': ['|', ('status_payment', '!=', 'pending'), ('status', '=', 'reject')]}" />
-                    <button name="action_confirm_refund"
-                            type="object"
-                            string="Confirm Refund"
-                            class="btn-primary"
-                            attrs="{'invisible': ['|', ('status', 'not in', ['pengajuan3','refund']), ('status_payment', '!=', 'pending')]}"/>
-                    <button name="action_create_journal_refund"
-                            string="Journal Refund"
-                            type="object"
-                            class="oe_highlight"
-                            attrs="{'invisible': ['|', ('status', 'not in', ['pengajuan3','refund']), ('journal_refund_state', '=', 'posted')]}"/>
-
-                    <field name="status"
-                        widget="statusbar"
-                        statusbar_visible="draft,pengajuan1,pengajuan2,pengajuan3,reject"
-                        attrs="{'invisible': [('status', '!=', 'reject')]}" />
-
-                    <field name="status"
-                        widget="statusbar"
-                        statusbar_visible="draft,pengajuan1,pengajuan2,pengajuan3,refund"
-                        attrs="{'invisible': [('status', '=', 'reject')]}" />
-                </header>
-                <sheet>
-                    <div class="oe_button_box" name="button_box">
-                        <button name="action_open_journal_refund"
-                                type="object"
-                                class="oe_stat_button"
-                                icon="fa-book"
-                                width="250px"
-                                attrs="{'invisible': ['|', ('journal_refund_move_id', '=', False), ('journal_refund_state', '!=', 'posted')]}">
-                            <field name="journal_refund_move_id" string="Journal Refund" widget="statinfo"/>
-                        </button>
-                    </div>
-                    <widget name="web_ribbon"
-                            title="PAID"
-                            bg_color="bg-success"
-                            attrs="{'invisible': [('status_payment', '!=', 'done')]}"/>
-
-                    <widget name="web_ribbon"
-                            title="CANCEL"
-                            bg_color="bg-danger"
-                            attrs="{'invisible': [('status_payment', '!=', 'reject')]}"/>
-                    <h1>
-                        <field name="name" readonly="1"/>
-                    </h1>
-                    <group col="2">
-                        <group>
-                            <field name="is_locked" invisible="1"/>
-                            <field name="status_payment" invisible="1"/>
-                            <field name="journal_refund_state" invisible="1"/>
-                            
-                            <field name="partner_id" attrs="{'readonly': [('is_locked', '=', True)]}"/>
-                            <field name="sale_order_ids" widget="many2many_tags" attrs="{'readonly': [('is_locked', '=', True)]}"/>
-                            <field name="invoice_ids" widget="many2many_tags" readonly="1"/>
-                            <field name="invoice_names" widget="html" readonly="1"/>
-                            <field name="so_names" widget="html" readonly="1"/>
-                            <field name="advance_move_names" widget="html" readonly="1"/>
-                            <field name="refund_type" attrs="{'readonly': [('is_locked', '=', True)]}"/>
-                            <field name="note_refund" attrs="{'readonly': [('is_locked', '=', True)]}"/>
-                        </group>
-                        <group>
-                            <field name="uang_masuk" attrs="{'readonly': [('is_locked', '=', True)]}"/>
-                            <field name="total_invoice" attrs="{'readonly': [('is_locked', '=', True)]}"/>
-                            <field name="ongkir" attrs="{'readonly': [('is_locked', '=', True)]}"/>
-                            <field name="amount_refund" attrs="{'readonly': [('is_locked', '=', True)]}"/>
-                            <field name="amount_refund_text" readonly="1"/>
-                            <field name="uang_masuk_type" required="1" attrs="{'readonly': [('is_locked', '=', True)]}"/>
-                            <field name="bukti_uang_masuk_image" widget="image" 
-                                attrs="{'invisible': [('uang_masuk_type', '=', 'pdf')], 'readonly': [('is_locked', '=', True)]}"/>
-                            <field name="bukti_uang_masuk_pdf" widget="pdf_viewer" 
-                                attrs="{'invisible': [('uang_masuk_type', '=', 'image')], 'readonly': [('is_locked', '=', True)]}"/>
-                        </group>
-                    </group>
-
-                    <notebook>
-                        <page string="Produk Line">
-                            <field name="line_ids" attrs="{'readonly': [('is_locked', '=', True)]}">
-                                <tree editable="bottom">
-                                    <field name="product_id"/>
-                                    <field name="quantity"/>
-                                    <field name="reason"/>
-                                </tree>
-                            </field>
-                        </page>
-
-                        <page string="Other Info">
-                            <group col="2">
-                                <group>
-                                    <field name="user_ids" widget="many2many_tags" readonly="1"/>
-                                    <field name="created_date" readonly="1"/>
-                                    <field name="refund_date" attrs="{'readonly': [('status', 'not in', ['pengajuan3','refund'])]}"/>
-                                </group>
-                                <group>
-                                    <field name="bank" attrs="{'readonly': [('is_locked', '=', True)]}"/>
-                                    <field name="account_name" attrs="{'readonly': [('is_locked', '=', True)]}"/>
-                                    <field name="account_no" attrs="{'readonly': [('is_locked', '=', True)]}"/>
-                                </group>
-                            </group>
-                        </page>
-
-                        <page string="Finance Note">
-                            <group col="2">
-                                <group>
-                                    <field name="finance_note" attrs="{'readonly': [('is_locked', '=', True)]}"/>
-                                </group>
-                                <group>
-                                    <field name="bukti_refund_type"  reqiured="1" attrs="{'readonly': [('is_locked', '=', True)]}"/>
-                                    <field name="bukti_transfer_refund_pdf"  widget="pdf_viewer" attrs="{'invisible': [('bukti_refund_type', '=', 'image')]}"/>
-                                    <field name="bukti_transfer_refund_image"  widget="image" attrs="{'invisible': [('bukti_refund_type', '=', 'pdf')]}"/>
-                                </group>
-                            </group>
-                        </page>
-
-                        <page string="Cancel Reason" attrs="{'invisible': [('status', '=', 'refund')]}">
-                            <group>
-                                <field name="reason_reject"/>
-                            </group>
-                        </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>
-    <!-- Action -->
-    <record id="action_refund_sale_order" model="ir.actions.act_window">
-        <field name="name">Refund Sales Order</field>
-        <field name="res_model">refund.sale.order</field>
-        <field name="view_mode">tree,form</field>
-    </record>
-
-    <!-- Menu -->
-    <menuitem id="menu_refund_sale_order"
-              name="Refund"
-              parent="sale.sale_order_menu"
-              sequence="10"
-              action="action_refund_sale_order"/>
-</odoo>
diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml
index c1f1fe61..e8f41ca3 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>
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 a79f8b55..c23995d3 100644
--- a/indoteknik_custom/views/tukar_guling.xml
+++ b/indoteknik_custom/views/tukar_guling.xml
@@ -23,16 +23,18 @@
 			<field name="arch" type="xml">
 				<tree create="1" delete="1" default_order="create_date desc">
 					<field name="name"/>
-					<field name="date"/>
+                    <field name="partner_id" string="Customer"/>
                     <field name="origin" string="SO Number"/>
 					<field name="operations" string="Operations"/>
 					<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'"
 					/>
                     <field name="ba_num" string="Nomor BA"/>
+                    <field name="date"/>
                     <field name="date_logistic" string="Approved Date"/>
 				</tree>
 			</field>
@@ -57,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">
@@ -65,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>
diff --git a/indoteknik_custom/views/tukar_guling_po.xml b/indoteknik_custom/views/tukar_guling_po.xml
index 77feb05f..accf7dbc 100644
--- a/indoteknik_custom/views/tukar_guling_po.xml
+++ b/indoteknik_custom/views/tukar_guling_po.xml
@@ -23,18 +23,19 @@
 			<field name="arch" type="xml">
 				<tree create="1" delete="1" default_order="create_date desc">
 					<field name="name"/>
-					<field name="date"/>
-					<field name="origin" string="PO Number"/>
+                    <field name="vendor_id" string="Customer"/>
+                    <field name="origin" string="SO Number"/>
 					<field name="operations" string="Operations"/>
 					<field name="return_type" string="Return Type"/>
-					<field name="ba_num" string="Nomor BA"/>
-					<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'"
 					/>
-					<field name="date_logistic" string="Approved Date"/>
+                    <field name="ba_num" string="Nomor BA"/>
+                    <field name="date"/>
+                    <field name="date_logistic" string="Approved Date"/>
 				</tree>
 			</field>
 		</record>
@@ -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">