From 93056efe991e4113c6094bba0a381547ed700524 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Wed, 24 Oct 2012 15:15:18 +0200
Subject: [PATCH] [FIX] misc useability fixes

bzr revid: fp@tinyerp.com-20121024131518-jdyd4stnwozzkr8f
---
 addons/base_calendar/crm_meeting_view.xml | 7 +------
 addons/crm/crm_phonecall_view.xml         | 2 +-
 addons/mrp/mrp_view.xml                   | 6 +++---
 addons/purchase/purchase.py               | 9 +++++----
 addons/purchase/purchase_view.xml         | 4 ++--
 5 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/addons/base_calendar/crm_meeting_view.xml b/addons/base_calendar/crm_meeting_view.xml
index 9dd37afa3d6..e468460e8e3 100644
--- a/addons/base_calendar/crm_meeting_view.xml
+++ b/addons/base_calendar/crm_meeting_view.xml
@@ -170,12 +170,7 @@
                             </group>
                         </group>
                     </page>
-                    <!--
-                        Temporarily removing invitation feature as the implementation
-                        was not clean. Invitation should be trigerred automatically
-                        based on partner_ids.
-                    -->
-                    <page string="Invitations">
+                    <page string="Invitations" groups="base.group_no_one">
                         <field name="attendee_ids" widget="one2many" mode="tree">
                             <tree string="Invitation details" editable="top">
                                 <field name="partner_id"/>
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index b6e2f09de68..21b0d295476 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -125,7 +125,7 @@
                     </div>
                     <div class="oe_title">
                         <div class="oe_edit_only">
-                            <label for="name" string="Title"/>
+                            <label for="name"/>
                         </div>
                         <h1><field name="name" required="1"/></h1>
                         <div class="oe_edit_only">
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 9e35377986a..1e8cf56b96c 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -620,10 +620,10 @@
                 <form string="Manufacturing Orders" version="7.0">
                 <header>
                     <button name="button_confirm" states="draft" string="Confirm Production" class="oe_highlight"/>
-                    <button name="button_produce" states="ready" string="Start Production" class="oe_highlight"/>
-                    <button name="%(act_mrp_product_produce)d" states="in_production" string="Produce" type="action" class="oe_highlight"/>
-                    <button name="force_production" states="confirmed" string="Force Reservation" type="object" class="oe_highlight"/>
+                    <button name="%(act_mrp_product_produce)d" states="confirmed,ready,in_production" string="Produce" type="action" class="oe_highlight"/>
+                    <button name="force_production" states="confirmed" string="Force Reservation" type="object"/>
                     <button name="force_production" states="picking_except" string="Force Reservation" type="object"/>
+                    <button name="button_produce" states="confirmed,ready" string="Mark as Started"/>
                     <button name="button_recreate" states="picking_except" string="Recreate Picking"/>
                     <button name="button_cancel" states="draft,ready,in_production,picking_except" string="Cancel"/>
                     <button name="action_cancel" type="object" states="confirmed" string="Cancel"/>
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index db6ed8b80be..c0e6458377a 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -152,9 +152,10 @@ class purchase_order(osv.osv):
     _columns = {
         'name': fields.char('Order Reference', size=64, required=True, select=True, help="Unique number of the purchase order, computed automatically when the purchase order is created."),
         'origin': fields.char('Source Document', size=64,
-            help="Reference of the document that generated this purchase order request."
+            help="Reference of the document that generated this purchase order request; a sale order or an internal procurement request."
         ),
-        'partner_ref': fields.char('Supplier Reference', states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)],'done':[('readonly',True)]}, size=64),
+        'partner_ref': fields.char('Supplier Reference', states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)],'done':[('readonly',True)]}, size=64,
+            help="Reference of the sale order or quotation sent by your supplier. It's mainly used to do the matching when you receive the products as this reference is usually written on the delivery order sent by your supplier."),
         'date_order':fields.date('Order Date', required=True, states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)]}, select=True, help="Date on which this document has been created."),
         'date_approve':fields.date('Date Approved', readonly=1, select=True, help="Date on which purchase order has been approved"),
         'partner_id':fields.many2one('res.partner', 'Supplier', required=True, states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)],'done':[('readonly',True)]}, change_default=True),
@@ -889,10 +890,10 @@ class purchase_order_line(osv.osv):
         account_tax = self.pool.get('account.tax')
 
         # - check for the presence of partner_id and pricelist_id
-        if not pricelist_id:
-            raise osv.except_osv(_('No Pricelist !'), _('Select a price list for a supplier in the purchase form to choose a product.'))
         if not partner_id:
             raise osv.except_osv(_('No Partner!'), _('Select a partner in purchase order to choose a product.'))
+        if not pricelist_id:
+            raise osv.except_osv(_('No Pricelist !'), _('Select a price list in the purchase order form before choosing a product.'))
 
         # - determine name and notes based on product in partner lang.
         lang = res_partner.browse(cr, uid, partner_id).lang
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 1ec1cd452c9..a1341f66c50 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -198,7 +198,7 @@
             <field name="arch" type="xml">
                 <form string="Purchase Order" version="7.0">
                 <header>
-                    <button name="wkf_send_rfq" states="draft" string="Send RFQ" type="object" context="{'send_rfq':True}" class="oe_highlight"/>
+                    <button name="wkf_send_rfq" states="draft" string="Send Request for Quotation" type="object" context="{'send_rfq':True}" class="oe_highlight"/>
                     <button name="purchase_confirm" states="draft" string="Confirm Order"/>
                     <button name="purchase_confirm" states="sent" string="Confirm Order" class="oe_highlight"/>
                     <button name="wkf_send_rfq" states="confirmed" string="Resend Purchase Order" type="object" class="oe_highlight"/>
@@ -262,7 +262,7 @@
                             </group>
                             <div class="oe_clear"/>
                             <label for="notes"/>
-                            <field name="notes"/>
+                            <field name="notes" class="oe_inline"/>
                         </page>
                         <page string="Reception &amp; Invoicing">
                             <group>