diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index 095d461ff3b..2dc7f96768f 100644
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -304,7 +304,7 @@ class account_bank_statement(osv.osv):
             'date': st_line.date,
             'ref': st_line.ref,
             'move_id': move_id,
-            'partner_id': partner_id,
+            'partner_id': par_id,
             'account_id': acc_id,
             'credit': credit,
             'debit': debit,
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index e2ff2e67e87..0bf0e9e743b 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -166,7 +166,7 @@
                                         <field name="nb_register" />
                                         <field name="state"/>
                                         <button name="registration_open" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
-                                        <button name="button_reg_close" string="Attented the Event" states="open" type="object" icon="gtk-jump-to"/>
+                                        <button name="button_reg_close" string="Attended the Event" states="open" type="object" icon="gtk-jump-to"/>
                                         <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/>
                                     </tree>
                                     <form string="Registration">
diff --git a/addons/mail/data/mail_group_data.xml b/addons/mail/data/mail_group_data.xml
index 53720926a5c..11d0ee7d04b 100644
--- a/addons/mail/data/mail_group_data.xml
+++ b/addons/mail/data/mail_group_data.xml
@@ -7,7 +7,7 @@
             <field name="description">Discussion about best sales practices and deals.</field>
         </record>
         <record model="mail.group" id="group_all_employees">
-            <field name="name">All Employees</field>
+            <field name="name">Whole Company</field>
             <field name="group_ids" eval="[(4, ref('base.group_user'))]"/>
             <field name="description">Discussion about best sales practices and deals.</field>
         </record>
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index ec66b5692c0..d05893cf778 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -956,9 +956,16 @@
             <field name="model">product.product</field>
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="arch" type="xml">
-                <xpath expr="//field[@name='procure_method']" position="after">
-                    <field name="supply_method" groups="base.group_user"/>
+                <xpath expr="//field[@name='supply_method']" position="attributes">
+                    <attribute name="invisible">False</attribute>
                 </xpath>
+                <group name="procurement_help" position="inside">
+                    <p attrs="{'invisible': [('type','=','service'),('procure_method','&lt;&gt;','make_to_order'),('supply_method','&lt;&gt;','produce')]}">
+                        When you sell this product, OpenERP will trigger <b>a manufacturing
+                        order</b> using the bill of materials assigned to this product.
+                        The delivery order will be ready once the production is done.
+                    </p>
+</group>
             </field>
         </record>
 
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 13474351744..d04e6f17fe8 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -106,11 +106,31 @@
                                 <group name="procurement">
                                     <group>
                                         <field name="procure_method" groups="base.group_user"/>
+                                        <field name="supply_method" groups="base.group_user" invisible="1"/>
                                         <field name="cost_method" groups="product.group_costing_method"/>
                                         <field name="standard_price" attrs="{'readonly':[('cost_method','=','average')]}"/>
                                     </group>
-                                    <group>
-                                        <field name="uom_po_id" groups="product.group_uom"/>
+                                    <group name="procurement_help" class="oe_grey" col="1">
+                                        <p attrs="{'invisible': [('type','&lt;&gt;','service'),('procure_method','&lt;&gt;','make_to_stock')]}">
+                                            When you sell this service, nothing special will be trigered
+                                            to deliver the customer.
+                                        </p>
+                                        <p attrs="{'invisible': [('type','&lt;&gt;','product'),('procure_method','&lt;&gt;','make_to_stock')]}">
+                                            When you sell this product, OpenERP will <b>use the available inventory</b>
+                                            for the delivery order.
+                                            <br/>
+                                            If there are not enough quantities available, the delivery order
+                                            will wait for new products. You should create others rules
+                                            (orderpoints, manual purchase orders) to fulfill the inventory.
+                                        </p>
+                                        <p attrs="{'invisible': [('type','&lt;&gt;','consu'),('procure_method','&lt;&gt;','make_to_stock')]}">
+                                            When you sell this product, a delivery order will be created.
+                                            OpenERP will consider that the <b>required quantities are always
+                                            available</b> as it's a consumable (the stock on hand may become negative).
+                                        </p>
+                                    </group>
+                                    <group groups="product.group_uom">
+                                        <field name="uom_po_id"/>
                                     </group>
                                 </group>
                                 <separator string="Notes for Suppliers"/>
diff --git a/addons/project_mrp/project_mrp_view.xml b/addons/project_mrp/project_mrp_view.xml
index ca1e1f893e7..51de9dd5cf3 100644
--- a/addons/project_mrp/project_mrp_view.xml
+++ b/addons/project_mrp/project_mrp_view.xml
@@ -36,9 +36,16 @@
             <field name="model">product.product</field>
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="arch" type="xml">
-                <xpath expr="//field[@name='procure_method']" position="after">
-                    <field name="supply_method" groups="base.group_user"/>
+                <xpath expr="//field[@name='supply_method']" position="attributes">
+                    <attribute name="invisible">False</attribute>
                 </xpath>
+                <group name="procurement_help" position="inside">
+                    <p attrs="{'invisible': [('type','&lt;&gt;','service'),('procure_method','&lt;&gt;','make_to_order'),('supply_method','&lt;&gt;','produce')]}">
+                        When you sell this service to a customer, <b>a task</b> will be 
+                        created to follow up the job to do. This task will appear
+                        in the project related to the contract of the sale order.
+                    </p>
+                </group>
             </field>
         </record>
     </data>
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 53f27245e7e..796fd1351a9 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -572,6 +572,20 @@
                      <separator string="Suppliers"/>
                      <field name="seller_ids" context="{'uom_id': uom_id}"/>
                 </group>
+                <group name="procurement_help" position="inside">
+                    <p attrs="{'invisible': [('type','&lt;&gt;','service'),('procure_method','&lt;&gt;','make_to_order'),('supply_method','&lt;&gt;','buy')]}">
+                        When you sell this service to a customer, <b>a draft purchase order</b>
+                        will be created in order to subcontract the job 
+                        <i attrs="{'invisible': [('seller_id','=',False)]}">to 
+                        <field name="seller_id" class="oe_inline"/></i>.
+                    </p>
+                    <p attrs="{'invisible': [('type','=','service'),('procure_method','&lt;&gt;','make_to_order'),('supply_method','&lt;&gt;','buy')]}">
+                        When you sell this product, OpenERP will trigger <b>a draft
+                        purchase order</b> to buy the required quantities to the supplier.
+                        The delivery order will be ready after having received the
+                        products.
+                    </p>
+                </group>
             </field>
         </record>
     </data>