[MERGE] fields are transalted
bzr revid: fp@tinyerp.com-20121112102840-oi7lw9vt352ex4co
This commit is contained in:
commit
93385fc652
|
@ -27,8 +27,9 @@ class analytical_timesheet_employee(osv.osv_memory):
|
||||||
_name = 'hr.analytical.timesheet.employee'
|
_name = 'hr.analytical.timesheet.employee'
|
||||||
_description = 'Print Employee Timesheet & Print My Timesheet'
|
_description = 'Print Employee Timesheet & Print My Timesheet'
|
||||||
_columns = {
|
_columns = {
|
||||||
'month': fields.selection([(x, datetime.date(2000, x, 1).strftime('%B')) for x in range(1, 13)],
|
'month': fields.selection([(1,'January'), (2,'February'), (3,'March'), (4,'April'),
|
||||||
'Month', required=True),
|
(5,'May'), (6,'June'), (7,'July'), (8,'August'), (9,'September'),
|
||||||
|
(10,'October'), (11,'November'), (12,'December')], 'Month', required=True),
|
||||||
'year': fields.integer('Year', required=True),
|
'year': fields.integer('Year', required=True),
|
||||||
'employee_id': fields.many2one('hr.employee', 'Employee', required=True)
|
'employee_id': fields.many2one('hr.employee', 'Employee', required=True)
|
||||||
|
|
||||||
|
|
|
@ -27,8 +27,9 @@ class analytical_timesheet_employees(osv.osv_memory):
|
||||||
_name = 'hr.analytical.timesheet.users'
|
_name = 'hr.analytical.timesheet.users'
|
||||||
_description = 'Print Employees Timesheet'
|
_description = 'Print Employees Timesheet'
|
||||||
_columns = {
|
_columns = {
|
||||||
'month': fields.selection([(x, datetime.date(2000, x, 1).strftime('%B')) for x in range(1, 13)],
|
'month': fields.selection([(1,'January'), (2,'February'), (3,'March'), (4,'April'),
|
||||||
'Month', required=True),
|
(5,'May'), (6,'June'), (7,'July'), (8,'August'), (9,'September'),
|
||||||
|
(10,'October'), (11,'November'), (12,'December')], 'Month', required=True),
|
||||||
'year': fields.integer('Year', required=True),
|
'year': fields.integer('Year', required=True),
|
||||||
'employee_ids': fields.many2many('hr.employee', 'timesheet_employee_rel', 'timesheet_id', 'employee_id', 'employees', required=True)
|
'employee_ids': fields.many2many('hr.employee', 'timesheet_employee_rel', 'timesheet_id', 'employee_id', 'employees', required=True)
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue