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

[IMP] hr_expense: now propose to open the account.move in form view thanks to a button in the expense form view 

bzr revid: qdp-launchpad@openerp.com-20130306163931-609cgn16xmcr0wot
This commit is contained in:
Quentin (OpenERP) 2013-03-06 17:39:31 +01:00
parent 9446f1d291
commit fd54f58ccb
2 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
addons/hr_expense/hr_expense.py
View File

@ -145,6 +145,9 @@ class hr_expense_expense(osv.osv):
def expense_canceled(self, cr, uid, ids, context=None):
return self.write(cr, uid, ids, {'state': 'cancelled'}, context=context)
def action_receipt_create(self, cr, uid, ids, context=None):
raise osv.except_osv(_('Error!'), _('Deprecated function used'))
def account_move_get(self, cr, uid, expense_id, context=None):
'''
This method prepare the creation of the account move related to the given expense.
@ -354,28 +357,26 @@ class hr_expense_expense(osv.osv):
#'taxes':line.invoice_line_tax_id,
}
def action_receipt_create(self, cr, uid, ids, context=None):
raise osv.except_osv(_('Error!'), _('Deprecated function used'))
def action_view_receipt(self, cr, uid, ids, context=None):
raise osv.except_osv(_('Error!'), _('Deprecated function used'))
def action_view_move(self, cr, uid, ids, context=None):
'''
This function returns an action that display existing receipt of given expense ids.
This function returns an action that display existing account.move of given expense ids.
'''
assert len(ids) == 1, 'This option should only be used for a single id at a time'
voucher_id = self.browse(cr, uid, ids[0], context=context).voucher_id.id
res = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'account_voucher', 'view_purchase_receipt_form')
try:
dummy, view_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'account', 'view_move_form')
except:
view_id = False
result = {
'name': _('Expense Receipt'),
'name': _('Expense Account Move'),
'view_type': 'form',
'view_mode': 'form',
'view_id': res and res[1] or False,
'res_model': 'account.voucher',
'view_id': view_id,
'res_model': 'account.move',
'type': 'ir.actions.act_window',
'nodestroy': True,
'target': 'current',
'res_id': voucher_id,
'res_id': account_move_id,
}
return result

2
addons/hr_expense/hr_expense_view.xml
View File

@ -67,7 +67,7 @@
<button name="refuse" states="confirm,accepted" string="Refuse" type="workflow" groups="base.group_hr_user" />
<button name="draft" states="confirm,cancelled" string="Set to Draft" type="workflow" groups="base.group_hr_user" />
<button name="done" states="accepted" string="Generate Accounting Entries" type="workflow" groups="account.group_account_invoice" class="oe_highlight"/>
<button name="action_view_receipt" states="done" string="Open Receipt" type="object"/>
<button name="action_view_move" states="done" string="Open Account Item" type="object" groups="account.group_account_invoice"/>
<field name="state" widget="statusbar" statusbar_visible="draft,confirm,accepted,done" statusbar_colors='{"confirm":"blue","cancelled":"red"}'/>
</header>
<sheet>