push

3 files changed, 28 insertions, 7 deletions

diff --git a/indoteknik_custom/views/ir_sequence.xml b/indoteknik_custom/views/ir_sequence.xml
index dd501d8c..dfb56100 100644
--- a/indoteknik_custom/views/ir_sequence.xml
+++ b/indoteknik_custom/views/ir_sequence.xml
@@ -21,6 +21,16 @@
             <field name="number_increment">1</field>
         </record>
         
+        <record id="sequence_vendor_approval" model="ir.sequence">
+            <field name="name">Vendor Approval</field>
+            <field name="code">vendor.approval</field>
+            <field name="active">TRUE</field>
+            <field name="prefix">VA/%(year)s/</field>
+            <field name="padding">5</field>
+            <field name="number_next">1</field>
+            <field name="number_increment">1</field>
+        </record>
+
         <record id="sequence_approval_unreserve" model="ir.sequence">
             <field name="name">Approval Unreserve</field>
             <field name="code">approval.unreserve</field>
diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml
index f2a57fc7..9a637441 100755
--- a/indoteknik_custom/views/sale_order.xml
+++ b/indoteknik_custom/views/sale_order.xml
@@ -72,6 +72,7 @@
                     <field name="flash_sale"/>
                     <field name="margin_after_delivery_purchase"/>
                     <field name="percent_margin_after_delivery_purchase"/>
+                    <field name="total_weight"/>
                 </field>
                 <field name="analytic_account_id" position="after">
                     <field name="customer_type" required="1"/>
@@ -80,6 +81,7 @@
                     <field name="email" required="1"/>
                     <field name="unreserve_id"/>
                     <field name="due_id" readonly="1"/>
+                    <field name="vendor_approval_id" readonly="1"/>
                     <field name="source_id" domain="[('id', 'in', [32, 59, 60, 61])]" required="1"/>
                     <button name="override_allow_create_invoice"
                             string="Override Create Invoice"
@@ -117,7 +119,7 @@
                 </xpath>
                 <xpath expr="//form/sheet/notebook/page/field[@name='order_line']/tree/field[@name='price_total']" position="after">
                     <field name="vendor_id" attrs="{'readonly': [('parent.approval_status', '=', 'approved')]}" domain="[('parent_id', '=', False)]" options="{'no_create':True}"/>
-                    <field name="vendor_md_id" readonly="1" options="{'no_create':True}"/>
+                    <field name="vendor_md_id" optional="hide"/>
                     <field name="purchase_price" attrs="
                         {
                             'readonly': [
@@ -127,14 +129,15 @@
                             ]
                         }
                     "/>
-                    <field name="purchase_price_md" readonly="1"/>
+                    <field name="purchase_price_md" optional="hide"/>
                     <field name="purchase_tax_id" attrs="{'readonly': [('parent.approval_status', '!=', False)]}" domain="[('type_tax_use','=','purchase')]" options="{'no_create':True}"/>
                     <field name="item_percent_margin"/>
                     <field name="item_margin" optional="hide"/>
+                    <field name="margin_md" optional="hide"/>
                     <field name="note" optional="hide"/>
                     <field name="note_procurement" optional="hide"/>
                     <field name="vendor_subtotal" optional="hide"/>
-                    <field name="weight" optional="hide"/>
+                    <field name="weight" 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/vendor_approval.xml b/indoteknik_custom/views/vendor_approval.xml
index c3f5ee77..605edfbf 100644
--- a/indoteknik_custom/views/vendor_approval.xml
+++ b/indoteknik_custom/views/vendor_approval.xml
@@ -7,8 +7,9 @@
             <field name="arch" type="xml">
                 <tree default_order="create_date desc" create="0">
                     <field name="number"/>
-                    <field name="partner_id"/>
+                    <field name="create_date_so"/>
                     <field name="order_id"/>
+                    <field name="partner_id"/>
                     <field name="state"/>
                 </tree>
             </field>
@@ -20,11 +21,17 @@
             <field name="arch" type="xml">
                 <tree>
                     <field name="product_id"/>
+                    <field name="sales_price"/>
                     <field name="product_uom_qty"/>
+                    <field name="sales_tax_id"/>
+                    <field name="margin_after"/>
                     <field name="vendor_id"/>
                     <field name="vendor_md_id"/>
                     <field name="purchase_price"/>
                     <field name="purchase_price_md"/>
+                    <field name="margin_before"/>
+                    <field name="purchase_tax_id"/>
+                    <field name="percent_margin_difference"/>
                 </tree>
             </field>
         </record>
@@ -38,12 +45,12 @@
                         <button name="action_approve"
                             string="Approve"
                             type="object"
-                            attrs="{'invisible': [('state', '=', 'done')]}"
+                            attrs="{'invisible': [('state', 'not in', ['draft'])]}"
                         />
                         <button name="action_reject"
-                                string="Cancel"
+                                string="Reject"
                                 type="object"
-                                attrs="{'invisible': [('state', '=', 'cancel')]}"
+                                attrs="{'invisible': [('state', 'not in', ['draft'])]}"
                         />
                     </header>
                     <sheet>
@@ -52,6 +59,7 @@
                                 <field name="partner_id" readonly="1"/>
                                 <field name="order_id" readonly="1"/>
                                 <field name="state" readonly="1"/>
+                                <field name="create_date_so" readonly="1"/>
                             </group>
                         </group>
                         <notebook>