From 06d98bcbbc507b8464b35b45e09300a6fc579ce7 Mon Sep 17 00:00:00 2001 From: Hardik Date: Mon, 5 Nov 2012 12:34:08 +0530 Subject: [PATCH 1/7] [IMP]Improvement in different modules bzr revid: hsa@tinyerp.com-20121105070408-jygn8tx77lvkzqnb --- addons/account/account_view.xml | 2 +- addons/hr_evaluation/hr_evaluation_view.xml | 2 +- addons/hr_timesheet_invoice/hr_timesheet_invoice_demo.xml | 2 +- addons/mail/static/src/xml/mail.xml | 4 ++-- addons/sale/res_config.py | 2 +- addons/stock/product_view.xml | 4 ++-- addons/stock/stock_view.xml | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) 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/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..36e3f84c464 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/sale/res_config.py b/addons/sale/res_config.py index 9ff3863bb7b..74dc1466a8c 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 USD 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."""), 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 @@ - + From 0d269dca2ecc3aa88c4e11dd1401627600ef92f8 Mon Sep 17 00:00:00 2001 From: Hardik Date: Mon, 5 Nov 2012 16:17:26 +0530 Subject: [PATCH 2/7] [IMP]tooltip are update bzr revid: hsa@tinyerp.com-20121105104726-5xssl8b7xobisisz --- addons/account/res_config.py | 2 +- addons/mail/static/src/xml/mail.xml | 4 ++-- addons/purchase/res_config.py | 2 +- addons/stock/product_view.xml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/addons/account/res_config.py b/addons/account/res_config.py index 8f525795d1c..371e530c9e4 100644 --- a/addons/account/res_config.py +++ b/addons/account/res_config.py @@ -113,7 +113,7 @@ class account_config_settings(osv.osv_memory): 'default_purchase_tax': fields.many2one('account.tax', 'Default purchase tax', help="This purchase tax will be assigned by default on new products."), 'decimal_precision': fields.integer('Decimal precision on journal entries', - help="""As an example, a decimal precision of 2 will allow journal entries like: 9.99 EUR, whereas a decimal precision of 4 will allow journal entries like: 0.0231 EUR."""), + help="""As an example, a decimal precision of 2 will allow journal entries like: 9.99 USD, whereas a decimal precision of 4 will allow journal entries like: 0.0231 USD."""), 'group_multi_currency': fields.boolean('Allow multi currencies', implied_group='base.group_multi_currency', help="Allows you multi currency environment"), diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml index 36e3f84c464..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..de86cc7a2ed 100644 --- a/addons/purchase/res_config.py +++ b/addons/purchase/res_config.py @@ -36,7 +36,7 @@ class purchase_config_settings(osv.osv_memory): 'group_purchase_pricelist':fields.boolean("Manage pricelist per supplier", implied_group='product.group_purchase_pricelist', help="""Allows to manage different prices based on rules per category of Supplier. - Example: 10% for retailers, promotion of 5 EUR on this product, etc."""), + Example: 10% for retailers, promotion of 5 USD on this product, etc."""), 'group_uom':fields.boolean("Manage different units of measure for products", implied_group='product.group_uom', help="""Allows you to select and maintain different units of measure for products."""), diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml index 594843eff8d..17ede2594df 100644 --- a/addons/stock/product_view.xml +++ b/addons/stock/product_view.xml @@ -41,7 +41,7 @@ - + From d2d2c49910f957bce9ee7c1cb0df26bce48eb973 Mon Sep 17 00:00:00 2001 From: Hardik Date: Mon, 5 Nov 2012 17:33:59 +0530 Subject: [PATCH 3/7] [IMP]Group string name is updated bzr revid: hsa@tinyerp.com-20121105120359-m7r5d2xn3cau83v6 --- addons/stock/product_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml index 17ede2594df..594843eff8d 100644 --- a/addons/stock/product_view.xml +++ b/addons/stock/product_view.xml @@ -41,7 +41,7 @@ - + From 29f6543f37f6ba5b3283d7bc4e49ae7330ce62a2 Mon Sep 17 00:00:00 2001 From: Hardik Date: Mon, 5 Nov 2012 18:45:17 +0530 Subject: [PATCH 4/7] [IMP]Warn is replaced by Notify in openerp bzr revid: hsa@tinyerp.com-20121105131517-ri0ocvl3o26hmuib --- addons/analytic/analytic_view.xml | 2 +- addons/purchase/res_config.py | 2 +- addons/sale/res_config.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/analytic/analytic_view.xml b/addons/analytic/analytic_view.xml index 17371f8609f..4d41831f499 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 notifying by email to renew the contract with the customer.

diff --git a/addons/purchase/res_config.py b/addons/purchase/res_config.py index 19b059d4d5b..38f4002b5a7 100644 --- a/addons/purchase/res_config.py +++ b/addons/purchase/res_config.py @@ -47,7 +47,7 @@ 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. + 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."""), diff --git a/addons/sale/res_config.py b/addons/sale/res_config.py index 9ff3863bb7b..e9ac7934352 100644 --- a/addons/sale/res_config.py +++ b/addons/sale/res_config.py @@ -52,7 +52,7 @@ 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. + 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", From 92cc2f694b5e7a5f338a0ef1030e02193b7c4d9e Mon Sep 17 00:00:00 2001 From: Hardik Date: Tue, 6 Nov 2012 10:48:51 +0530 Subject: [PATCH 5/7] [IMP]Update string warned to notified bzr revid: hsa@tinyerp.com-20121106051851-t3m552k1es3dk7pb --- addons/analytic/analytic_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/analytic/analytic_view.xml b/addons/analytic/analytic_view.xml index 4d41831f499..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 notifying + reached, the account manager is notified by email to renew the contract with the customer.

From d3605367dcc124a91ea3f18d0cd533ca47fc701a Mon Sep 17 00:00:00 2001 From: Hardik Date: Tue, 6 Nov 2012 11:38:29 +0530 Subject: [PATCH 6/7] [IMP]Update tooltip bzr revid: hsa@tinyerp.com-20121106060829-zwt3s9rb84kf8hvl --- addons/purchase/res_config.py | 5 ++--- addons/sale/res_config.py | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/addons/purchase/res_config.py b/addons/purchase/res_config.py index 38f4002b5a7..8720ee796dc 100644 --- a/addons/purchase/res_config.py +++ b/addons/purchase/res_config.py @@ -48,9 +48,8 @@ class purchase_config_settings(osv.osv_memory): 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 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."""), - +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 e9ac7934352..fa2b2f56302 100644 --- a/addons/sale/res_config.py +++ b/addons/sale/res_config.py @@ -53,8 +53,8 @@ class sale_configuration(osv.osv_memory): 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 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."""), +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. From 5a4a17268a2e39e7903c1c1382de8da0e05725f9 Mon Sep 17 00:00:00 2001 From: "Bharat Devnani (OpenERP)" Date: Wed, 7 Nov 2012 12:35:15 +0530 Subject: [PATCH 7/7] [IMP] changed instances of USD to EUR in tooltips bzr revid: bde@tinyerp.com-20121107070515-3d1t4u5fwe1n1vf1 --- addons/account/res_config.py | 2 +- addons/purchase/res_config.py | 2 +- addons/sale/res_config.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/account/res_config.py b/addons/account/res_config.py index 371e530c9e4..8f525795d1c 100644 --- a/addons/account/res_config.py +++ b/addons/account/res_config.py @@ -113,7 +113,7 @@ class account_config_settings(osv.osv_memory): 'default_purchase_tax': fields.many2one('account.tax', 'Default purchase tax', help="This purchase tax will be assigned by default on new products."), 'decimal_precision': fields.integer('Decimal precision on journal entries', - help="""As an example, a decimal precision of 2 will allow journal entries like: 9.99 USD, whereas a decimal precision of 4 will allow journal entries like: 0.0231 USD."""), + help="""As an example, a decimal precision of 2 will allow journal entries like: 9.99 EUR, whereas a decimal precision of 4 will allow journal entries like: 0.0231 EUR."""), 'group_multi_currency': fields.boolean('Allow multi currencies', implied_group='base.group_multi_currency', help="Allows you multi currency environment"), diff --git a/addons/purchase/res_config.py b/addons/purchase/res_config.py index 09a3d082c8a..8720ee796dc 100644 --- a/addons/purchase/res_config.py +++ b/addons/purchase/res_config.py @@ -36,7 +36,7 @@ class purchase_config_settings(osv.osv_memory): 'group_purchase_pricelist':fields.boolean("Manage pricelist per supplier", implied_group='product.group_purchase_pricelist', help="""Allows to manage different prices based on rules per category of Supplier. - Example: 10% for retailers, promotion of 5 USD on this product, etc."""), + Example: 10% for retailers, promotion of 5 EUR on this product, etc."""), 'group_uom':fields.boolean("Manage different units of measure for products", implied_group='product.group_uom', help="""Allows you to select and maintain different units of measure for products."""), diff --git a/addons/sale/res_config.py b/addons/sale/res_config.py index 25aff8119d5..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 USD 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."""),