<hafid> merging odoo-backup

1 files changed, 71 insertions, 11 deletions

diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml
index 0fabf279..c1f1fe61 100755
--- a/indoteknik_custom/views/sale_order.xml
+++ b/indoteknik_custom/views/sale_order.xml
@@ -35,7 +35,32 @@
                             string="UangMuka"
                             type="action" attrs="{'invisible': [('approval_status', '!=', 'approved')]}"/>
                 </button>
-                <field name="payment_term_id" position="after">
+                <!-- <xpath expr="//header" position="inside">
+                    <button name="button_refund"
+                        type="object"
+                        string="Refund"
+                        class="btn-primary"
+                        attrs="{'invisible': ['|', ('state', 'not in', ['sale', 'done']), ('has_refund', '=', True)]}" />
+                </xpath> -->
+                <div class="oe_button_box" name="button_box">
+                    <field name="advance_payment_move_ids" invisible="1"/>
+                    <button name="action_open_advance_payment_moves"
+                            type="object"
+                            class="oe_stat_button"
+                            icon="fa-book"
+                            attrs="{'invisible': [('advance_payment_move_ids', '=', [])]}">
+                        <field name="advance_payment_move_count" widget="statinfo" string="Journals"/>
+                    </button>
+
+                    <!-- <button type="object"
+                            name="action_view_related_refunds"
+                            class="oe_stat_button"
+                            icon="fa-refresh"
+                            attrs="{'invisible': [('refund_count', '=', 0)]}">
+                        <field name="refund_count" widget="statinfo" string="Refund"/>
+                    </button> -->
+                </div>
+                    <field name="payment_term_id" position="after">
                     <field name="create_uid" invisible="1"/>
                     <field name="create_date" invisible="1"/>
                     <field name="shipping_cost_covered"
@@ -103,10 +128,10 @@
                     <field name="compute_fullfillment" invisible="1" />
                 </field>
                 <field name="tag_ids" position="after">
-                    <field name="eta_date_start"/>
+                    <!-- <field name="eta_date_start"/> -->
                     <t t-esc="' to '"/>
-                    <field name="eta_date" readonly="1"/>
-                    <field name="expected_ready_to_ship"/>
+                    <!-- <field name="eta_date" readonly="1"/> -->
+                    <!-- <field name="expected_ready_to_ship"/> -->
                      <field name="ready_to_ship_status_detail"/>
                     <field name="flash_sale"/>
                     <field name="margin_after_delivery_purchase"/>
@@ -134,15 +159,29 @@
                     <field name="real_invoice_id"/>
                     <field name="approval_status"/>
                     <field name="sales_tax_id"
-                           domain="[('type_tax_use','=','sale'), ('active', '=', True)]" required="1"/>
-                    <field name="carrier_id" required="1"/>
-                    <field name="delivery_service_type" readonly="1"/>
-                    <field name="shipping_option_id"/>
+                        domain="[('type_tax_use','=','sale'), ('active', '=', True)]" required="1" />
+                    <field name="select_shipping_option"/>
+                    <field name="carrier_id" required="1" domain="[]" />
+                    <field name="delivery_service_type" readonly="1" />
+                    <field name="shipping_option_id" />
                 </field>
                 <field name="medium_id" position="after">
                     <field name="date_doc_kirim" readonly="1"/>
                     <field name="notification" readonly="1"/>
                 </field>
+                <xpath expr="//page[@name='other_information']/group/group[@name='sale_reporting']" position="after">
+                    <group string="ETA">
+                        <field name="et_products"/>
+                        <field name="eta_date_reserved"/>
+                        <field name="expected_ready_to_ship"/>
+                        <field name="eta_date_start"/>
+                        <field name="eta_date" readonly="1"/>
+                        <!-- <field name="has_refund" readonly="1"/> -->
+                    </group>
+                    <group string="Return Doc">
+                        <field name="ccm_id" readonly="1"/>
+                    </group>
+                </xpath>
                 <xpath expr="//form/sheet/notebook/page/field[@name='order_line']"
                        position="attributes">
                     <attribute name="attrs">
@@ -208,6 +247,11 @@
                         <label for="item_percent_margin"/>
                         <field name="item_percent_margin"/>
                     </div>
+                    <div name="item_percent_margin_before" groups="base.group_no_one"
+                         attrs="{'invisible': [('display_type', '!=', False)]}">
+                        <label for="item_percent_margin_before"/>
+                        <field name="item_percent_margin_before"/>
+                    </div>
                 </div>
                 <div name="invoice_lines" position="before">
                     <div name="price_subtotal" groups="base.group_no_one"
@@ -239,6 +283,7 @@
                            attrs="{'readonly': [('parent.approval_status', '!=', False)]}"
                            domain="[('type_tax_use','=','purchase')]" options="{'no_create':True}"/>
                     <field name="item_percent_margin"/>
+                    <field name="item_percent_margin_before"/>
                     <field name="item_margin" optional="hide"/>
                     <field name="margin_md" optional="hide"/>
                     <field name="note" optional="hide"/>
@@ -296,10 +341,14 @@
                     <field name="picking_iu_id"/>
                     <field name="note_ekspedisi"/>
                 </field>
+                <field name="select_shipping_option" position="attributes">
+                    <attribute name="attrs">
+                        {'readonly': [('state', 'in', ['cancel', 'done'])]}
+                    </attribute>
+                </field>
                 <field name="carrier_id" position="attributes">
                     <attribute name="attrs">
-                        {'readonly': [('approval_status', '=', 'approved'), ('state', 'not in',
-                                                                             ['cancel', 'draft'])]}
+                        {'readonly': [('state', 'in', ['cancel', 'done'])]}
                     </attribute>
                 </field>
                 <field name="payment_term_id" position="attributes">
@@ -403,7 +452,7 @@
                 <field name="state" position="after">
                     <field name="approval_status"/>
                     <field name="client_order_ref"/>
-                    <field name="notes"/>
+                    <field name="notes" optional="hide"/>
                     <field name="payment_type" optional="hide"/>
                     <field name="payment_status" optional="hide"/>
                     <field name="pareto_status" optional="hide"/>
@@ -428,6 +477,7 @@
                     <field name="payment_type" optional="hide"/>
                     <field name="payment_status" optional="hide"/>
                     <field name="pareto_status" optional="hide"/>
+                    <field name="notes" optional="hide"/>
                 </field>
             </field>
         </record>
@@ -611,6 +661,16 @@
         </record>
     </data>
 
+    <!-- <data>
+        <record id="sale_order_multi_create_refund_ir_actions_server" model="ir.actions.server">
+            <field name="name">Refund</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_refund()</field>
+        </record>
+    </data> -->
+
     <data>
         <record id="mail_template_sale_order_notification_to_salesperson" model="mail.template">
             <field name="name">Sale Order: Notification to Salesperson</field>