[IMP] crm, hr_evaluation, sale_layout: usability imp.

bzr revid: qdp-launchpad@tinyerp.com-20101213135755-hxuvcgadyg522ykd

addons/crm/crm.py

@@ -531,7 +531,7 @@ class crm_case_section(osv.osv):
         'reply_to': fields.char('Reply-To', size=64, help="The email address put in the 'Reply-To' of all emails sent by OpenERP about cases in this sales team"),
         'parent_id': fields.many2one('crm.case.section', 'Parent Team'),
         'child_ids': fields.one2many('crm.case.section', 'parent_id', 'Child Teams'),
-        'resource_calendar_id': fields.many2one('resource.calendar', "Resource's Calendar"),
+        'resource_calendar_id': fields.many2one('resource.calendar', "Working Time"),
         'note': fields.text('Description'),
         'working_hours': fields.float('Working Hours', digits=(16,2 )), 
         'stage_ids': fields.many2many('crm.case.stage', 'section_stage_rel', 'section_id', 'stage_id', 'Stages'),

addons/hr_evaluation/hr_evaluation.py

@@ -34,8 +34,8 @@ class hr_evaluation_plan(osv.osv):
         'name': fields.char("Evaluation Plan", size=64, required=True),
         'company_id': fields.many2one('res.company', 'Company', required=True),
         'phase_ids': fields.one2many('hr_evaluation.plan.phase', 'plan_id', 'Evaluation Phases'),
-        'month_first': fields.integer('Next Evaluation After'),
-        'month_next': fields.integer('After the Date of Start'),
+        'month_first': fields.integer('First Evaluation in (months)', help="This number of months will be used to schedule the first evaluation date of the employee when selecting an evaluation plan. "),
+        'month_next': fields.integer('Periodicity of Evaluations (months)', help="The number of month that depicts the delay between each evaluation of this plan (after the first one)."),
         'active': fields.boolean('Active')
     }
     _defaults = {
@@ -101,7 +101,7 @@ class hr_employee(osv.osv):
     _inherit="hr.employee"
     _columns = {
         'evaluation_plan_id': fields.many2one('hr_evaluation.plan', 'Evaluation Plan'),
-        'evaluation_date': fields.date('Next Evaluation', help="Date of the next evaluation"),
+        'evaluation_date': fields.date('Next Evaluation Date', help="The date of the next evaluation is computed by the evaluation plan's dates (first evaluation + periodicity)."),
     }
 
     def run_employee_evaluation(self, cr, uid, automatic=False, use_new_cursor=False, context=None):

addons/sale_layout/sale_layout.py

@@ -113,7 +113,7 @@ class sale_order_line(osv.osv):
                 ('line', 'Separator Line'),
                 ('break', 'Page Break'),]
             ,'Layout Type', select=True, required=True),
-        'sequence': fields.integer('Sequence Number'),
+        'sequence': fields.integer('Layout Sequence'),
         'price_unit': fields.float('Unit Price', required=True, digits_compute= dp.get_precision('Sale Price'), readonly=True, states={'draft': [('readonly', False)]}),
         'product_uom_qty': fields.float('Quantity (UoM)', digits=(16,2)),
         'product_uom': fields.many2one('product.uom', 'Product UoM'),
@@ -156,4 +156,4 @@ class sale_order(osv.osv):
 
 sale_order()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/sale_layout/sale_layout_view.xml

@@ -4,18 +4,6 @@
              <record id="sale.action_order_line_tree2" model="ir.actions.act_window">
                <field name="domain">[('layout_type','=', 'article')]</field>
              </record>
-		<record model="ir.ui.view" id="view_order_line_form2_inherit_1">
-			<field name="name">sale.order.line.form2.inherit_1</field>
-			<field name="model">sale.order.line</field>
-			<field name="inherit_id" ref="sale.view_order_line_form2"/>
-			<field name="type">form</field>
-			<field name="arch" type="xml">
-				<xpath expr="/form/group/field[@name='name']" position="before">
-					<field name="layout_type" select="1" on_change="onchange_sale_order_line_view(layout_type)" />
-					<field name="sequence"/>
-				</xpath>
-			</field>
-		</record>
 
 		<record model="ir.ui.view" id="view_order_form_inherit_1">
 			<field name="name">sale.order.form.inherit_1</field>