[IMP] useability improvmeents misc

bzr revid: fp@fp-laptop-20101010173239-4563xgh24q2jt0lt

5 files changed, 53 insertions, 37 deletions

diff --git a/addons/purchase/__openerp__.py b/addons/purchase/__openerp__.py
index 7af6dbceff0..58b049e130e 100644
--- a/addons/purchase/__openerp__.py
+++ b/addons/purchase/__openerp__.py
@@ -46,8 +46,8 @@
         'wizard/purchase_order_group_view.xml',
         'wizard/purchase_installer.xml',
         'wizard/purchase_line_invoice_view.xml',
-        'purchase_view.xml',
         'purchase_report.xml',
+        'purchase_view.xml',
         'stock_view.xml',
         'partner_view.xml',
         'process/purchase_process.xml',
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 1cf357f227c..a9996202b20 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -35,19 +35,32 @@
             action="base.action_partner_supplier_form" sequence="1"/>
 
           <!--Inventory control-->
-      <menuitem id="menu_procurement_management_inventory" name="Inventory Control"
+      <menuitem id="menu_procurement_management_inventory" name="Receive Products"
             parent="base.menu_purchase_root" sequence="4"/>
       <menuitem action="stock.action_picking_tree4" id="menu_action_picking_tree4" parent="menu_procurement_management_inventory"
-            name="Incoming Shipments" sequence="9"/>
+            name="Incoming Shipments" sequence="9"
+	    groups="base.group_extended"/>
       <menuitem action="stock.action_reception_picking_move" id="menu_action_picking_tree_in_move"
             parent="menu_procurement_management_inventory" sequence="11"/>
 
      <!--Invoice control-->
      <menuitem id="menu_procurement_management_invoice" name="Invoice Control"
           parent="base.menu_purchase_root" sequence="6"/>
+
+    <record id="action_invoice_pending" model="ir.actions.act_window">
+        <field name="res_model">account.invoice</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form,calendar,graph</field>
+        <field eval="False" name="view_id"/>
+        <field name="domain">[('type','=','in_invoice')]</field>
+        <field name="context">{'type':'in_invoice', 'journal_type': 'purchase', 'search_default_draft': 1}</field>
+        <field name="search_view_id" ref="account.view_account_invoice_filter"/>
+            <field name="help">This is the list of supplier invoice you are waiting for. You can select invoices and validate them once you have received the invoice and checked his data.</field>
+    </record>
+
      <menuitem name="Supplier Invoices to Receive"
           id="menu_procurement_management_pending_invoice"
-          action="account.action_invoice_tree_pending_invoice"
+          action="action_invoice_pending"
           parent="menu_procurement_management_invoice"
           sequence="13"/>
 
@@ -100,13 +113,13 @@
                     </group>
                     <notebook colspan="4">
                         <page string="Purchase Order">
-                            <field name="partner_id" on_change="onchange_partner_id(partner_id)" domain="[('supplier','=', 1)]"/>
+                            <field name="partner_id" on_change="onchange_partner_id(partner_id)" context="{'search_default_supplier':1}"/>
                             <field name="partner_address_id"/>
                             <field domain="[('type','=','purchase')]" name="pricelist_id" groups="base.group_extended"/>
                             <field name="origin" groups="base.group_extended"/>
                             <newline/>
                             <field colspan="4" name="order_line" nolabel="1" mode="tree,form">
-                                <tree colors="red:date_planned&lt;=current_date;black:date_planned&gt;current_date" string="Purchase Order Lines">
+                                <tree string="Purchase Order Lines">
                                     <field name="date_planned"/>
                                     <field name="name"/>
                                     <field name="product_qty"/>
@@ -124,15 +137,16 @@
                             </group>
                             <group col="11" colspan="4">
                                 <field name="state" readonly="1"/>
-                                <button name="purchase_confirm" states="draft" string="Confirm Purchase Order" icon="gtk-apply"/>
-                                <button name="purchase_appbuyer" states="wait_auth" string="Approve Purchase" icon="gtk-ok"/>
-                                <button name="purchase_approve" states="confirmed" string="Approved by Supplier" icon="gtk-ok"/>
-                                <button name="purchase_cancel" states="draft,confirmed,wait_auth" string="Cancel Purchase Order" icon="gtk-cancel"/>
+                                <button name="purchase_cancel" states="draft,confirmed,wait_auth" string="Cancel" icon="gtk-cancel"/>
                                 <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/>
                                 <button name="action_cancel" states="approved,except_picking,except_invoice" string="Cancel Purchase Order" type="object" icon="gtk-cancel"/>
-
                                 <button name="picking_ok" states="except_picking" string="Manually Corrected" icon="gtk-convert"/>
                                 <button name="invoice_ok" states="except_invoice" string="Manually Corrected" icon="gtk-convert"/>
+                                <button name="purchase_confirm" states="draft" string="Confirm Purchase Order" icon="gtk-go-forward"/>
+                                <button name="purchase_appbuyer" states="wait_auth" string="Approve Purchase" icon="gtk-ok"/>
+                                <button name="purchase_approve" states="confirmed" string="Approved by Supplier" icon="gtk-go-forward"/>
+				<button name="%(report_purchase_order)d" string="Print" states="approved" type="action" icon="gtk-print"/>
+
                             </group>
                         </page>
                         <page string="Delivery &amp; Invoices" groups="base.group_extended">
@@ -200,7 +214,7 @@
             <field name="model">purchase.order</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree colors="grey:state in ('approved','done');blue:state in ('wait','confirmed');red:state in ('except_invoice','except_picking')" string="Purchase Order">
+                <tree colors="grey:state=='cancel';blue:state in ('wait','confirmed');red:state in ('except_invoice','except_picking')" string="Purchase Order">
                     <field name="name" string="Reference"/>
                     <field name="date_order" string="Order Date"/>
                     <field name="partner_id"/>
@@ -222,7 +236,7 @@
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">purchase.order</field>
             <field name="view_type">form</field>
-            <field name="context">{'search_default_draft': 1,'search_default_create_uid':uid}</field>
+            <field name="context">{'search_default_draft': 1}</field>
             <field name="view_mode">tree,form,graph,calendar</field>
             <field name="search_view_id" ref="view_purchase_order_filter"/>
             <field name="help">With the Requests for quotation menu you can create new quotations, review existing one and confirm them to order once the supplier offer is approved.</field>
@@ -287,7 +301,7 @@
             <field name="model">purchase.order.line</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree colors="red:date_planned&lt;=current_date;black:date_planned&gt;current_date" string="Purchase Order Lines">
+                <tree string="Purchase Order Lines">
                     <field name="order_id"/>
                     <field name="name"/>
                     <field name="date_planned" widget="date" width="135"/>
@@ -367,14 +381,14 @@
         <act_window
             context="{'search_default_partner_id': [active_id]}"
             id="act_res_partner_2_purchase_order"
-            name="Purchase orders"
+            name="Purchase Orders"
             res_model="purchase.order"
             src_model="res.partner"/>
 
         <act_window
             context="{'search_default_product_id': [active_id]}"
             id="action_purchase_line_product_tree"
-            name="Product purchases"
+            name="Purchases"
             res_model="purchase.order.line"
             src_model="product.product"
             groups="base.group_extended"/>
@@ -406,7 +420,7 @@
             id="menu_purchase_line_order_draft"
             groups="base.group_extended"
             parent="menu_procurement_management_invoice"
-            sequence="12"/>
+            sequence="72"/>
 
         <!--
             Procurements
diff --git a/addons/purchase/purchase_workflow.xml b/addons/purchase/purchase_workflow.xml
index 3ab41d7e6bf..aea6fa2b2ac 100644
--- a/addons/purchase/purchase_workflow.xml
+++ b/addons/purchase/purchase_workflow.xml
@@ -103,7 +103,7 @@
         <record id="trans_confirmed_router" model="workflow.transition">
             <field name="act_from" ref="act_confirmed"/>
             <field name="act_to" ref="act_router"/>
-            <field name="signal">purchase_approve</field>
+            <!-- <field name="signal">purchase_approve</field> removed from simplification/useability -->
         </record>
         <record id="trans_router_picking" model="workflow.transition">
             <field name="act_from" ref="act_router"/>
diff --git a/addons/purchase/stock_view.xml b/addons/purchase/stock_view.xml
index 2b741536d3b..d5a645b4b98 100644
--- a/addons/purchase/stock_view.xml
+++ b/addons/purchase/stock_view.xml
@@ -17,8 +17,9 @@
         <act_window
             domain="[('purchase_id', '=', active_id)]"
             id="act_purchase_order_2_stock_picking"
-            name="Picking"
+            name="Receptions"
             res_model="stock.picking"
+	    groups="base.group_extended"
             src_model="purchase.order"
             context="{'contact_display': 'partner'}" />
        
diff --git a/addons/purchase/wizard/purchase_order_group_view.xml b/addons/purchase/wizard/purchase_order_group_view.xml
index cec987bc5ea..fe04af1a32b 100644
--- a/addons/purchase/wizard/purchase_order_group_view.xml
+++ b/addons/purchase/wizard/purchase_order_group_view.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-    	<record id="view_purchase_order_group" model="ir.ui.view">
+        <record id="view_purchase_order_group" model="ir.ui.view">
             <field name="name">Merger Purchase Orders</field>
             <field name="model">purchase.order.group</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                <form string="Merge orders">
-        			<separator string="Are you sure you want to merge these orders ?" colspan="4"/>
-       				<newline/>
-    				<label string="
+                    <separator string="Are you sure you want to merge these orders ?" colspan="4"/>
+                       <newline/>
+                    <label string="
 Please note that: &#13; &#13;  
 Orders will only be merged if: &#13;  
 * Purchase Orders are in draft &#13;  
@@ -17,23 +17,24 @@ Orders will only be merged if: &#13;
 * Purchase Orders are have same stock location, same pricelist &#13; &#13;   
 Lines will only be merged if: &#13;  
 * Order lines are exactly the same except for the product,quantity and unit &#13;
-" colspan="4"/>				
-				    <newline/>    				
-        			<separator string="" colspan="4" />
-					<button special="cancel" string="Cancel" icon="gtk-cancel"/>
-            	    <button name="merge_orders" string="Merge orders" type="object" icon="gtk-convert"/>
-    			</form>
+" colspan="4"/>                
+                    <newline/>                    
+                    <separator string="" colspan="4" />
+                    <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                    <button name="merge_orders" string="Merge orders" type="object" icon="gtk-convert"/>
+                </form>
             </field>
-		</record>
+        </record>
 
-         <act_window name="Merge Purchase orders"		    
-		    res_model="purchase.order.group"
-		    src_model="purchase.order"
-		    view_mode="form"
-		    target="new"        
+        <act_window name="Merge Purchase orders"            
+            res_model="purchase.order.group"
+            src_model="purchase.order"
+            view_mode="form"
+            target="new"        
             key2="client_action_multi"    
-		    id="action_view_purchase_order_group"/>	
-		    			
+            groups="base.group_extended"
+            id="action_view_purchase_order_group"/>    
+                        
     </data>
 </openerp>