odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[MERGE]:merged timetracking changes. 

bzr revid: apa@tinyerp.com-20120913102648-dom11isset01lj4w
This commit is contained in:
Amit Patel 2012-09-13 15:56:48 +05:30
parent d4e50ffbd6 651b5c2cdc
commit e7cb7fd18f
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
addons/hr_timesheet/hr_timesheet.py
View File

@ -141,7 +141,10 @@ class hr_analytic_timesheet(osv.osv):
emp = emp_obj.browse(cr, uid, emp_id[0], context=context)
if emp.journal_id:
return emp.journal_id.id
return False
else :
raise osv.except_osv(_('Warning!'), _('No \'Analytic Journal\' is defined for \'%s\'. \nDefine an \'Analytic Journal\' for the employee under : Human Resource > Employee > HR Settings.')%(emp.name))
if not emp_id :
raise osv.except_osv(_('Warning!'), _('Please create an employee for this user, using the menu: Human Resources > Employees.'))
_defaults = {

2
addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
View File

@ -46,7 +46,7 @@
<field name="arch" type="xml">
<form string="Timesheet" version="7.0">
<header>
<button name="button_confirm" states="draft" string="Submited to Manager" type="object" class="oe_highlight"/>
<button name="button_confirm" states="draft" string="Submit to Manager" type="object" class="oe_highlight"/>
<button name="done" states="confirm" string="Approve" type="workflow" groups="base.group_hr_user" class="oe_highlight"/>
<button name="action_set_to_draft" states="done" string="Set to Draft" type="object" />
<button name="cancel" states="confirm" string="Refuse" type="workflow" groups="base.group_hr_user" />

2
addons/hr_timesheet_sheet/i18n/hr_timesheet_sheet.pot
View File

@ -976,7 +976,7 @@ msgstr ""
#. module: hr_timesheet_sheet
#: view:hr_timesheet_sheet.sheet:0
msgid "Submited to Manager"
msgid "Submit to Manager"
msgstr ""
#. module: hr_timesheet_sheet