Bharat Devnani (Open ERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-en-us-police-improvements-bde into
lp:openobject-addons.
Requested reviews:
OpenERP Core Team (openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-en-us-police-improvements-bde/+merge/133015
Hello,
We have improved typo errors, some string formations and correction
according to america.
Thanks & Regards,
Devnani Bharat R.
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-en-us-police-improvements-bde/+merge/133015
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-en-us-police-improvements-bde.
=== modified file 'account/account_view.xml'
--- account/account_view.xml 2012-10-31 14:57:08 +0000
+++ account/account_view.xml 2012-11-06 06:47:21 +0000
@@ -1791,7 +1791,7 @@
<field name="name"/>
<field name="active"/>
</group>
- <field name="note" placeholder="Note fo the invoice..."/>
+ <field name="note" placeholder="Note for the invoice..."/>
<separator string="Computation"/>
<field name="line_ids"/>
</form>
=== modified file 'account/res_config.py'
--- account/res_config.py 2012-10-30 18:17:54 +0000
+++ account/res_config.py 2012-11-06 06:47:21 +0000
@@ -113,7 +113,7 @@
'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"),
=== modified file 'analytic/analytic_view.xml'
--- analytic/analytic_view.xml 2012-11-03 13:35:10 +0000
+++ analytic/analytic_view.xml 2012-11-06 06:47:21 +0000
@@ -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.
</p>
=== modified file 'hr_evaluation/hr_evaluation_view.xml'
--- hr_evaluation/hr_evaluation_view.xml 2012-10-26 09:58:21 +0000
+++ hr_evaluation/hr_evaluation_view.xml 2012-11-06 06:47:21 +0000
@@ -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.
</p>
=== modified file 'hr_timesheet_invoice/hr_timesheet_invoice_demo.xml'
--- hr_timesheet_invoice/hr_timesheet_invoice_demo.xml 2012-06-20 12:03:05 +0000
+++ hr_timesheet_invoice/hr_timesheet_invoice_demo.xml 2012-11-06 06:47:21 +0000
@@ -7,7 +7,7 @@
<field name="factor">50.0</field>
</record>
<record id="timesheet_invoice_factor3" model="hr_timesheet_invoice.factor">
- <field name="name">Gratis</field>
+ <field name="name">Free of charge</field>
<field name="customer_name">Offered developments</field>
<field name="factor">100.0</field>
</record>
=== modified file 'mail/static/src/xml/mail.xml'
--- mail/static/src/xml/mail.xml 2012-10-29 14:45:03 +0000
+++ mail/static/src/xml/mail.xml 2012-11-06 06:47:21 +0000
@@ -197,8 +197,8 @@
<div class="oe_msg_center">
<div class='oe_msg_icons'>
- <span class='oe_read' t-if="widget.show_read_unread_button"><a title="Read" class="oe_e">X</a></span>
- <span class='oe_unread' t-if="widget.show_read_unread_button"><a title="Set back to unread" class="oe_e">v</a></span>
+ <span class='oe_read' t-if="widget.show_read_unread_button"><a title="Mark as read" class="oe_e">X</a></span>
+ <span class='oe_unread' t-if="widget.show_read_unread_button"><a title="Mark as unread" class="oe_e">v</a></span>
<span class='oe_reply' t-if="widget.show_reply_button"><a title="Reply" class="oe_e">(</a></span>
<span t-attf-class="oe_star #{widget.is_favorite?'oe_starred':''}"><a title="Add To Favorites" class="oe_e">7</a></span>
</div>
=== modified file 'purchase/res_config.py'
--- purchase/res_config.py 2012-09-17 10:01:52 +0000
+++ purchase/res_config.py 2012-11-06 06:47:21 +0000
@@ -36,7 +36,7 @@
'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."""),
@@ -47,10 +47,9 @@
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."""),
=== modified file 'sale/res_config.py'
--- sale/res_config.py 2012-10-29 20:56:02 +0000
+++ sale/res_config.py 2012-11-06 06:47:21 +0000
@@ -44,7 +44,7 @@
'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."""),
@@ -52,9 +52,9 @@
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.
=== modified file 'stock/product_view.xml'
--- stock/product_view.xml 2012-11-02 16:26:11 +0000
+++ stock/product_view.xml 2012-11-06 06:47:21 +0000
@@ -41,7 +41,7 @@
<field name="sale_delay" attrs="{'readonly':[('sale_ok','=',False)]}"/>
</group>
<group name="delay" position="after">
- <group name="store" string="Storage Localization">
+ <group name="store" string="Storage Location">
<field name="loc_rack"/>
<field name="loc_row"/>
<field name="loc_case"/>
@@ -103,7 +103,7 @@
</group>
</group>
<group name="status" position="after" version="7.0">
- <group name="store" string="Storage Localization">
+ <group name="store" string="Storage Location">
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
<field name="loc_rack" attrs="{'invisible':[('type','=','service')]}"/>
<field name="loc_row" attrs="{'invisible':[('type','=','service')]}"/>
=== modified file 'stock/stock_view.xml'
--- stock/stock_view.xml 2012-10-30 04:49:18 +0000
+++ stock/stock_view.xml 2012-11-06 06:47:21 +0000
@@ -126,7 +126,7 @@
</group>
</group>
<notebook>
- <page string="General Informations">
+ <page string="General Information">
<field name="inventory_line_id">
<tree string="Products" editable="bottom">
<field domain="[('usage','=','internal')]" name="location_id" groups="stock.group_locations"/>
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
