diff --git a/addons/crm/crm.py b/addons/crm/crm.py index d54f82af52c..0d9c1281b9f 100644 --- a/addons/crm/crm.py +++ b/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'), diff --git a/addons/hr_evaluation/hr_evaluation.py b/addons/hr_evaluation/hr_evaluation.py index 32478f515a0..7ffb40e1c8d 100644 --- a/addons/hr_evaluation/hr_evaluation.py +++ b/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): diff --git a/addons/sale_layout/sale_layout.py b/addons/sale_layout/sale_layout.py index 90192615f1a..632940ac81b 100755 --- a/addons/sale_layout/sale_layout.py +++ b/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: \ No newline at end of file +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/sale_layout/sale_layout_view.xml b/addons/sale_layout/sale_layout_view.xml index 3eac7eb1f3f..af901928037 100755 --- a/addons/sale_layout/sale_layout_view.xml +++ b/addons/sale_layout/sale_layout_view.xml @@ -4,18 +4,6 @@ [('layout_type','=', 'article')] - - sale.order.line.form2.inherit_1 - sale.order.line - - form - - - - - - - sale.order.form.inherit_1