diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index 19128b42d6e..1c7c268e905 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -1791,7 +1791,7 @@ - + diff --git a/addons/analytic/analytic_view.xml b/addons/analytic/analytic_view.xml index 17371f8609f..1277d25de71 100644 --- a/addons/analytic/analytic_view.xml +++ b/addons/analytic/analytic_view.xml @@ -40,7 +40,7 @@ Once the end date of the contract is passed or the maximum number of service units (e.g. support contract) is - reached, the account manager is warned + reached, the account manager is notified by email to renew the contract with the customer.

diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml index 697ed6bacea..e0978847acb 100644 --- a/addons/hr_evaluation/hr_evaluation_view.xml +++ b/addons/hr_evaluation/hr_evaluation_view.xml @@ -266,7 +266,7 @@ Each employee may be assigned an Appraisal Plan. Such a plan defines the frequency and the way you manage your periodic personnel evaluation. You will be able to define steps and - attach interviews to each step. OpenERP manages all kind of + attach interviews to each step. OpenERP manages all kinds of evaluations: bottom-up, top-down, self-evaluation and final evaluation by the manager.

diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_demo.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_demo.xml index cc531fc8f10..0ebe16ad49f 100644 --- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_demo.xml +++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_demo.xml @@ -7,7 +7,7 @@ 50.0 - Gratis + Free of charge Offered developments 100.0 diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml index caa85cd3deb..bfd0e4cd10f 100644 --- a/addons/mail/static/src/xml/mail.xml +++ b/addons/mail/static/src/xml/mail.xml @@ -197,8 +197,8 @@
- X - v + X + v ( 7
diff --git a/addons/purchase/res_config.py b/addons/purchase/res_config.py index 19b059d4d5b..8720ee796dc 100644 --- a/addons/purchase/res_config.py +++ b/addons/purchase/res_config.py @@ -47,10 +47,9 @@ class purchase_config_settings(osv.osv_memory): implied_group='purchase.group_delivery_invoice_address', help="Allows you to specify different delivery and invoice addresses on a purchase order."), 'module_warning': fields.boolean("Alerts by products or supplier", - help="""Allow to configure warnings on products and trigger them when a user wants to purchase a given product or a given supplier. - Example: Product: this product is deprecated, do not purchase more than 5. - Supplier: don't forget to ask for an express delivery."""), - + help="""Allow to configure notification on products and trigger them when a user wants to purchase a given product or a given supplier. +Example: Product: this product is deprecated, do not purchase more than 5. + Supplier: don't forget to ask for an express delivery."""), 'module_purchase_double_validation': fields.boolean("Force two levels of approvals", help="""Provide a double validation mechanism for purchases exceeding minimum amount. This installs the module purchase_double_validation."""), diff --git a/addons/sale/res_config.py b/addons/sale/res_config.py index 9ff3863bb7b..d8e9d0fef6f 100644 --- a/addons/sale/res_config.py +++ b/addons/sale/res_config.py @@ -44,7 +44,7 @@ class sale_configuration(osv.osv_memory): 'group_sale_pricelist':fields.boolean("Use pricelists to adapt your price per customers", implied_group='product.group_sale_pricelist', help="""Allows to manage different prices based on rules per category of customers. - Example: 10% for retailers, promotion of 5 EUR on this product, etc."""), +Example: 10% for retailers, promotion of 5 EUR on this product, etc."""), 'group_uom':fields.boolean("Allow using different units of measures", implied_group='product.group_uom', help="""Allows you to select and maintain different units of measure for products."""), @@ -52,9 +52,9 @@ class sale_configuration(osv.osv_memory): implied_group='sale.group_discount_per_so_line', help="Allows you to apply some discount per sale order line."), 'module_warning': fields.boolean("Allow configuring alerts by customer or products", - help="""Allow to configure warnings on products and trigger them when a user wants to sale a given product or a given customer. - Example: Product: this product is deprecated, do not purchase more than 5. - Supplier: don't forget to ask for an express delivery."""), + help="""Allow to configure notification on products and trigger them when a user wants to sale a given product or a given customer. +Example: Product: this product is deprecated, do not purchase more than 5. + Supplier: don't forget to ask for an express delivery."""), 'module_sale_margin': fields.boolean("Display margins on sales orders", help="""This adds the 'Margin' on sales order. This gives the profitability by calculating the difference between the Unit Price and Cost Price. diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml index 250fe5245e7..594843eff8d 100644 --- a/addons/stock/product_view.xml +++ b/addons/stock/product_view.xml @@ -41,7 +41,7 @@ - + @@ -103,7 +103,7 @@ - + diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml index c63c385967e..9c2a672caf7 100644 --- a/addons/stock/stock_view.xml +++ b/addons/stock/stock_view.xml @@ -126,7 +126,7 @@ - +