diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index fe8881d4de9..f0dd023bf06 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -893,7 +893,7 @@ class mail_thread(osv.Model):
subscr_ids = subscr_obj.search(cr, uid, ['&', ('res_model', '=', self._name), ('res_id', 'in', ids)], context=context)
return [sub['user_id'][0] for sub in subscr_obj.read(cr, uid, subscr_ids, ['user_id'], context=context)]
- def message_read_subscribers(self, cr, uid, ids, fields=['id', 'name', 'avatar'], context=None):
+ def message_read_subscribers(self, cr, uid, ids, fields=['id', 'name', 'image_small'], context=None):
""" Returns the current document followers as a read result. Used
mainly for Chatter having only one method to call to have
details about users.
diff --git a/addons/mail/res_partner_view.xml b/addons/mail/res_partner_view.xml
index d1e2d881739..8b4d89f89f4 100644
--- a/addons/mail/res_partner_view.xml
+++ b/addons/mail/res_partner_view.xml
@@ -9,7 +9,7 @@
-
diff --git a/addons/purchase/res_config.py b/addons/purchase/res_config.py
index 668b8874607..4acbfaa49c4 100644
--- a/addons/purchase/res_config.py
+++ b/addons/purchase/res_config.py
@@ -43,7 +43,7 @@ class purchase_config_settings(osv.osv_memory):
'group_purchase_delivery_address': fields.boolean("allow a different address for incoming products and invoicings",
implied_group='purchase.group_delivery_invoice_address',
help="Allows you to specify different delivery and invoice addresses on a purchase order."),
- 'module_purchase_analytic_plans': fields.boolean('use multiple analytic accounts on orders',
+ 'module_purchase_analytic_plans': fields.boolean('allow using multiple analytic accounts on the same order',
help ="""Allows the user to maintain several analysis plans. These let you split
lines on a purchase order between several accounts and analytic plans.
This installs the module purchase_analytic_plans."""),
diff --git a/addons/sale/res_config.py b/addons/sale/res_config.py
index eb51b20996c..2749314c0c9 100644
--- a/addons/sale/res_config.py
+++ b/addons/sale/res_config.py
@@ -86,11 +86,11 @@ class sale_configuration(osv.osv_memory):
help="""This adds the 'Margin' on sales order.
This gives the profitability by calculating the difference between the Unit Price and Cost Price.
This installs the module sale_margin."""),
- 'module_sale_journal': fields.boolean("allow batch invoicing through journals",
+ 'module_sale_journal': fields.boolean("allow batch invoicing of delivery orders through journals",
help="""Allows you to categorize your sales and deliveries (picking lists) between different journals,
and perform batch operations on journals.
This installs the module sale_journal."""),
- 'module_analytic_user_function': fields.boolean("assign user roles per contract",
+ 'module_analytic_user_function': fields.boolean("one employee can have different roles per contract",
help="""Allows you to define what is the default function of a specific user on a given account.
This is mostly used when a user encodes his timesheet. The values are retrieved and the fields are auto-filled.
But the possibility to change these values is still available.
diff --git a/addons/sale/res_config_view.xml b/addons/sale/res_config_view.xml
index c827adac4ce..37dcd47b7fd 100644
--- a/addons/sale/res_config_view.xml
+++ b/addons/sale/res_config_view.xml
@@ -60,15 +60,30 @@
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -81,10 +96,6 @@
-
-
-
-
@@ -97,10 +108,6 @@
-
-
-
-
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 34e759307b6..2db531d34dd 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -168,7 +168,7 @@
-
@@ -287,7 +287,7 @@
-
+
-
+
@@ -493,7 +493,7 @@
-
+
@@ -530,7 +530,7 @@
-
+
diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index 80ec4f59d33..321a2498126 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -63,9 +63,10 @@
-
+ -
+ type="action" attrs="{'invisible':[('cost_method','<>','average')]}"
+ class="oe_link"/>
@@ -174,7 +175,7 @@
-
+
@@ -182,7 +183,7 @@
-
![]()
+