[MERGE]merged rma branch lp:~openerp-dev/openobject-addons/trunk-master-english-terms-kbh-english_terms-rma

bzr revid: kbh@tinyerp.com-20121219105129-yhb2gqarci6x7oqp

addons/account/account.py

@@ -705,7 +705,7 @@ class account_journal(osv.osv):
         'with_last_closing_balance' : fields.boolean('Opening With Last Closing Balance'),
         'name': fields.char('Journal Name', size=64, required=True),
         'code': fields.char('Code', size=5, required=True, help="The code will be displayed on reports."),
-        'type': fields.selection([('sale', 'Sale'),('sale_refund','Sale Refund'), ('purchase', 'Purchase'), ('purchase_refund','Purchase Refund'), ('cash', 'Cash'), ('bank', 'Bank and Cheques'), ('general', 'General'), ('situation', 'Opening/Closing Situation')], 'Type', size=32, required=True,
+        'type': fields.selection([('sale', 'Sale'),('sale_refund','Sale Refund'), ('purchase', 'Purchase'), ('purchase_refund','Purchase Refund'), ('cash', 'Cash'), ('bank', 'Bank and Checks'), ('general', 'General'), ('situation', 'Opening/Closing Situation')], 'Type', size=32, required=True,
                                  help="Select 'Sale' for customer invoices journals."\
                                  " Select 'Purchase' for supplier invoices journals."\
                                  " Select 'Cash' or 'Bank' for journals that are used in customer or supplier payments."\
@@ -715,7 +715,7 @@ class account_journal(osv.osv):
         'account_control_ids': fields.many2many('account.account', 'account_account_type_rel', 'journal_id','account_id', 'Account', domain=[('type','<>','view'), ('type', '<>', 'closed')]),
         'default_credit_account_id': fields.many2one('account.account', 'Default Credit Account', domain="[('type','!=','view')]", help="It acts as a default account for credit amount"),
         'default_debit_account_id': fields.many2one('account.account', 'Default Debit Account', domain="[('type','!=','view')]", help="It acts as a default account for debit amount"),
-        'centralisation': fields.boolean('Centralised Counterpart', help="Check this box to determine that each entry of this journal won't create a new counterpart but will share the same counterpart. This is used in fiscal year closing."),
+        'centralisation': fields.boolean('Centralized Counterpart', help="Check this box to determine that each entry of this journal won't create a new counterpart but will share the same counterpart. This is used in fiscal year closing."),
         'update_posted': fields.boolean('Allow Cancelling Entries', help="Check this box if you want to allow the cancellation the entries related to this journal or of the invoice related to this journal"),
         'group_invoice_lines': fields.boolean('Group Invoice Lines', help="If this box is checked, the system will try to group the accounting lines when generating them from invoices."),
         'sequence_id': fields.many2one('ir.sequence', 'Entry Sequence', help="This field contains the information related to the numbering of the journal entries of this journal.", required=True),

addons/account_check_writing/account.py

@@ -38,7 +38,7 @@ class res_company(osv.osv):
             ('top', 'Check on Top'),
             ('middle', 'Check in middle'),
             ('bottom', 'Check on bottom'),
-            ],"Choose Check layout",
+            ],"Check Layout",
             help="Check on top is compatible with Quicken, QuickBooks and Microsoft Money. Check in middle is compatible with Peachtree, ACCPAC and DacEasy. Check on bottom is compatible with Peachtree, ACCPAC and DacEasy only"  ),
         }
         

addons/event_sale/__openerp__.py

@@ -28,7 +28,7 @@
 Creating registration with sale orders.
 =======================================
 
-This module allows you to automatize and connect your registration creation with
+This module allows you to automate and connect your registration creation with
 your main sale flow and therefore, to enable the invoicing feature of registrations.
 
 It defines a new kind of service products that offers you the possibility to

addons/fleet/fleet.py

@@ -124,7 +124,7 @@ class fleet_vehicle_state(osv.Model):
     _order = 'sequence asc'
     _columns = {
         'name': fields.char('Name', required=True),
-        'sequence': fields.integer('Order', help="Used to order the note stages")
+        'sequence': fields.integer('Sequence', help="Used to order the note stages")
     }
     _sql_constraints = [('fleet_state_name_unique','unique(name)', 'State name already exists')]
 

addons/hr_evaluation/hr_evaluation_view.xml

@@ -379,7 +379,7 @@
             <field name="search_view_id" ref="view_hr_evaluation_interview_search"/>
             <field name="help" type="html">
               <p class="oe_view_nocontent_create">
-                Click to create a new interview request related to a personnal evaluation. 
+                Click to create a new interview request related to a personal evaluation. 
               </p><p>
                 Interview requests are usually generated automatically by
                 OpenERP according to an employee's appraisal plan. Each user

addons/hr_expense/hr_expense_view.xml

@@ -212,7 +212,7 @@
             <field name="search_view_id" ref="product.product_search_form_view"/>
         </record>
 
-        <menuitem id="menu_hr_product" name="Types of Expenses" parent="hr.menu_hr_configuration" action="hr_expense_product"/>
+        <menuitem id="menu_hr_product" name="Expense Categories" parent="hr.menu_hr_configuration" action="hr_expense_product"/>
         <menuitem id="next_id_49" name="Expenses" sequence="15" parent="hr.menu_hr_root"/>
         <menuitem action="expense_all" id="menu_expense_all" name="Expenses" parent="next_id_49"/>
 

addons/hr_holidays/hr_holidays_view.xml

@@ -442,8 +442,8 @@
             <field name="search_view_id" ref="view_hr_holidays_status_search"/>
         </record>
 
+        <menuitem name="Time Off Categories" action="open_view_holiday_status" id="menu_open_view_holiday_status" parent="hr.menu_hr_configuration" sequence="10"/>
         <menuitem sequence="3" id="hr.menu_open_view_attendance_reason_config" parent="hr.menu_hr_configuration" name="Time off"/>
-        <menuitem name="Time off Types" action="open_view_holiday_status" id="menu_open_view_holiday_status" parent="hr.menu_hr_configuration" sequence="10"/>
 
         <!-- Holiday on resource leave -->
         <record id="resource_calendar_leave_form_inherit" model="ir.ui.view">

addons/mail/data/mail_group_data.xml

@@ -16,7 +16,7 @@
             <field name="subtype_id" ref="mail.mt_comment"/>
             <field name="subject">Welcome to OpenERP!</field>
             <field name="body"><![CDATA[<p>Your homepage is a summary of messages you received and key information about documents you follow.</p>
-            <p>The top menu bar contains all applications you installed. You can use the <i>Settings</i> menu to install more applications, activate others features or give access to new users.</p>
+            <p>The top menu bar contains all applications you installed. You can use the <i>Settings</i> menu to install more applications, activate other features or give access to new users.</p>
             <p>To setup your preferences (name, email signature, avatar), click on the top right corner.</p>]]></field>
         </record>
     </data>