merge

[odoo/odoo.git] / addons / purchase / purchase_view.xml

diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 0d509aa..f75ee28 100644 (file)
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <menuitem icon="terp-purchase" id="menu_purchase_root" name="Purchase Management"/>
+        <menuitem icon="terp-purchase" id="menu_purchase_root" name="Purchase Management"
+            groups="group_purchase_user"/>
 
        <record model="ir.ui.view" id="purchase_order_calendar">
             <field name="name">purchase.order.calendar</field>
@@ -16,17 +17,17 @@
                 </calendar>
             </field>
         </record>
-               <record model="ir.ui.view" id="view_purchase_order_graph">
-                       <field name="name">purchase.order.graph</field>
-                       <field name="model">purchase.order</field>
-                       <field name="type">graph</field>
-                       <field name="arch" type="xml">
-                               <graph string="Purchase Order" type="bar">
-                                       <field name="partner_id"/>
-                                       <field name="amount_total" operator="+"/>
-                               </graph>
-                       </field>
-               </record>
+        <record model="ir.ui.view" id="view_purchase_order_graph">
+            <field name="name">purchase.order.graph</field>
+            <field name="model">purchase.order</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph string="Purchase Order" type="bar">
+                    <field name="partner_id"/>
+                    <field name="amount_total" operator="+"/>
+                </graph>
+            </field>
+        </record>
 
         <record id="purchase_order_form" model="ir.ui.view">
             <field name="name">purchase.order.form</field>
@@ -50,7 +51,7 @@
                             <field domain="[('type','=','purchase')]" name="pricelist_id"/>
                             <field name="partner_ref" select="2"/>
                             <newline/>
-                            <field colspan="4" name="order_line" nolabel="1" widget="one2many_list"/>
+                            <field colspan="4" name="order_line" nolabel="1"/>
                             <group col="7" colspan="4">
                                 <field name="amount_untaxed" sum="Untaxed amount"/>
                                 <field name="amount_tax"/>
@@ -63,11 +64,11 @@
                                 <button name="purchase_appbuyer" states="wait_auth" string="Approve Purchase"/>
                                 <button name="purchase_approve" states="confirmed" string="Approved by Supplier"/>
                                 <button name="purchase_cancel" states="draft,confirmed,wait_auth" string="Cancel Purchase Order"/>
+                                <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object"/>
+                                <button name="action_cancel" states="approved" string="Cancel Purchase Order" type="object"/>
 
-                                <button name="purchase_cancel" states="approved" string="Cancel Purchase Order"/>
-
-                                <button name="shipping_ok" states="except_shipping" string="Shipping Done"/>
-                                <button name="invoice_ok" states="except_invoice" string="Invoice Done"/>
+                                <button name="picking_ok" states="except_picking" string="Manually Corrected"/>
+                                <button name="invoice_ok" states="except_invoice" string="Manually Corrected"/>
                             </group>
                         </page>
                         <page string="Delivery &amp; Invoices">
@@ -169,9 +170,9 @@
                 <form string="Purchase Order Line">
                     <notebook>
                         <page string="Order Line">
+                            <field colspan="4" context="partner_id=parent.partner_id,quantity=product_qty,pricelist=parent.pricelist_id,uom=product_uom,warehouse=parent.warehouse_id" name="product_id" on_change="product_id_change(parent.pricelist_id,product_id,product_qty,product_uom,parent.partner_id, parent.date_order)"/>
                             <field name="product_qty"/>
                             <field name="product_uom" on_change="product_uom_change(parent.pricelist_id,product_id,product_qty,product_uom,parent.partner_id, parent.date_order)"/>
-                            <field colspan="4" context="partner_id=parent.partner_id,quantity=product_qty,pricelist=parent.pricelist_id,uom=product_uom,warehouse=parent.warehouse_id" name="product_id" on_change="product_id_change(parent.pricelist_id,product_id,product_qty,product_uom,parent.partner_id, parent.date_order)"/>
                             <field colspan="4" name="name"/>
                             <field name="date_planned"/>
                             <field name="price_unit"/>
@@ -195,7 +196,6 @@
                 <tree colors="red:date_planned&lt;=current_date" string="Purchase Order Line">
                     <field name="date_planned"/>
                     <field name="name"/>
-                    <field name="product_id"/>
                     <field name="product_qty"/>
                     <field name="product_uom"/>
                     <field name="price_unit"/>