merge

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

diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 48a24be..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>
@@ -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">
@@ -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"/>