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

[IMP]hr_expense:code improved 

bzr revid: kbh@tinyerp.com-20121121084139-2phwt6sxbgt0sp5r
This commit is contained in:
Khushboo Bhatt (Open ERP) 2012-11-21 14:11:39 +05:30
parent 17ecd10a35
commit f42cee3e94
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
addons/hr_expense/hr_expense.py
View File

@ -123,19 +123,19 @@ class hr_expense_expense(osv.osv):
company_id = employee.company_id.id
return {'value': {'department_id': department_id, 'company_id': company_id}}
def expense_confirm(self, cr, uid, ids, *args):
def expense_confirm(self, cr, uid, ids, context=None):
for expense in self.browse(cr, uid, ids):
if expense.employee_id and expense.employee_id.parent_id.user_id:
self.message_subscribe_users(cr, uid, [expense.id], user_ids=[expense.employee_id.parent_id.user_id.id])
self.expense_toapprove_notificate(cr, uid, ids)
self.expense_toapprove_notificate(cr, uid, ids, context=context)
self.write(cr, uid, ids, {
'state':'confirm',
'date_confirm': time.strftime('%Y-%m-%d')
})
return True
def expense_accept(self, cr, uid, ids, *args):
self.expense_approve_notificate(cr, uid, ids)
def expense_accept(self, cr, uid, ids, context=None):
self.expense_approve_notificate(cr, uid, ids, context=context)
self.write(cr, uid, ids, {
'state':'accepted',
'date_valid':time.strftime('%Y-%m-%d'),
@ -143,8 +143,8 @@ class hr_expense_expense(osv.osv):
})
return True
def expense_canceled(self, cr, uid, ids, *args):
self.expense_refuse_notificate(cr, uid, ids)
def expense_canceled(self, cr, uid, ids, context=None):
self.expense_refuse_notificate(cr, uid, ids , context=context)
self.write(cr, uid, ids, {'state':'cancelled'})
return True
@ -240,12 +240,12 @@ class hr_expense_expense(osv.osv):
def expense_toapprove_notificate(self, cr, uid, ids, context=None):
for obj in self.browse(cr, uid, ids):
self.message_post(cr, uid, [obj.id],
_("Request <b>to approve</b>"), subtype="hr_expense.mt_expense_approve", context=context)
_("The request is <b>waiting for Approval</b>"), subtype="hr_expense.mt_expense_approve", context=context)
def expense_approve_notificate(self, cr, uid, ids, context=None):
for obj in self.browse(cr, uid, ids):
self.message_post(cr, uid, [obj.id],
_("Request <b>approved</b>"), subtype="hr_expense.mt_expense_approved", context=context)
_("The request has been <b>approved</b>"), subtype="hr_expense.mt_expense_approved", context=context)
def expense_refuse_notificate(self, cr, uid, ids, context=None):
for obj in self.browse(cr, uid, ids):

2
addons/project_issue_sheet/project_issue_sheet_view.xml
View File

@ -23,7 +23,7 @@
<tree editable="top" string="Timesheets">
<field name="name"/>
<field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)" widget="float_time"/>
<field name="account_id" invisible="0" domain="[('partner_id', '=', parent.partner_id)]" on_change="on_change_account_id(account_id)"/>
<field name="account_id" invisible="0" attrs="{'invisible': [('parent.sale_journal_id','=',False)]}" domain="[('partner_id', '=', parent.partner_id)]" on_change="on_change_account_id(account_id)"/>
<field name="date"/>
<field name="user_id"/>
<field invisible="1" name="journal_id"/>