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

[MOD] hr_expense : changes in workflow refused to draft. company_id field added in expense object. confirm and refuse button added in tree view 

bzr revid: vir@tinyerp.com-20100217094119-qdh6ingcsc92zrlo
This commit is contained in:
RCH(Open ERP) 2010-02-17 15:11:19 +05:30 committed by Vir (Open ERP)
parent ddfcd40423
commit 5675629db6
4 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/hr/hr_department.py
View File

@ -166,11 +166,11 @@ class res_users(osv.osv):
}
res_users()
#class department(osv.osv):
#class users(osv.osv):
# _inherit = 'res.users'
# _description = "Users"
# _columns = {
# 'context_department_id': fields.many2one('hr.department', 'Departments'),
# }
#department()
#users()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

2
addons/hr_expense/hr_expense.py
View File

@ -69,6 +69,7 @@ class hr_expense_expense(osv.osv):
'invoice_id': fields.many2one('account.invoice', 'Invoice'),
'currency_id': fields.many2one('res.currency', 'Currency', required=True),
'department_id':fields.many2one('hr.department','Department'),
'company_id': fields.many2one('res.company', 'Company', required=True),
'state': fields.selection([
('draft', 'Draft'),
('confirm', 'Waiting confirmation'),
@ -85,6 +86,7 @@ class hr_expense_expense(osv.osv):
'employee_id' : _employee_get,
'user_id' : lambda cr,uid,id,c={}: id,
'currency_id': _get_currency,
'company_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
}
def expense_confirm(self, cr, uid, ids, *args):
#for exp in self.browse(cr, uid, ids):

7
addons/hr_expense/hr_expense_view.xml
View File

@ -34,6 +34,8 @@
<field name="ref"/>
<field name="amount"/>
<field name="state"/>
<button name="confirm" states="draft" string="Confirm" type="workflow" icon="gtk-apply"/>
<button name="refuse" states="confirm,draft,accepted" string="Refuse" type="workflow" icon="gtk-no"/>
</tree>
</field>
</record>
@ -51,6 +53,8 @@
<field name="ref"/>
<field name="amount"/>
<field name="state"/>
<button name="confirm" states="draft" string="Confirm" type="workflow" icon="gtk-apply"/>
<button name="refuse" states="confirm,draft,accepted" string="Refuse" type="workflow" icon="gtk-no"/>
</tree>
</field>
</record>
@ -69,6 +73,7 @@
<field name="amount"/>
<field name="currency_id"/>
<field name="department_id"/>
<field name="company_id"/>
</group>
<notebook colspan="4">
<page string="Expense Sheet">
@ -95,7 +100,7 @@
<button name="cancel" states="cancel" string="Cancel" type="workflow" icon="gtk-cancel"/>
<button name="validate" states="confirm" string="Accept" type="workflow" icon="gtk-ok"/>
<button name="invoice" states="accepted" string="Invoice" type="workflow" icon="gtk-print"/>
<button name="draft" states="confirm" string="Set to Draft" type="workflow" icon="gtk-convert"/>
<button name="draft" states="confirm,cancelled" string="Set to Draft" type="workflow" icon="gtk-convert"/>
<button name="refuse" states="confirm,draft,accepted" string="Refuse" type="workflow" icon="gtk-no"/>
</group>
</page>

25
addons/hr_expense/hr_expense_workflow.xml
View File

@ -1,25 +1,25 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<!-- Roles definition -->
<record id="HR" model="res.roles">
<field name="name">Human Resources - Expenses</field>
</record>
<record id="HR_INV" model="res.roles">
<field name="name">Human Resources - Expenses invoice</field>
</record>
<!-- Workflow definition -->
<record id="wkf_expenses" model="workflow">
<field name="name">hr.wkf.expenses</field>
<field name="osv">hr.expense.expense</field>
<field name="on_create">True</field>
</record>
<record id="act_draft" model="workflow.activity">
<field name="wkf_id" ref="wkf_expenses"/>
<field name="name">draft</field>
@ -51,7 +51,7 @@
<field name="name">refused</field>
<field name="kind">function</field>
<field name="action">expense_canceled()</field>
<field name="flow_stop">True</field>
<!-- <field name="flow_stop">True</field>-->
</record>
<record id="act_invoice" model="workflow.activity">
<field name="wkf_id" ref="wkf_expenses"/>
@ -60,7 +60,7 @@
<field name="subflow_id" ref="account.wkf"/>
<field name="action">action_invoice_create()</field>
</record>
<record id="t1" model="workflow.transition">
<field name="act_from" ref="act_draft"/>
<field name="act_to" ref="act_confirm"/>
@ -89,7 +89,7 @@
<field name="act_to" ref="act_refused"/>
<field name="signal">refuse</field>
</record>
<record id="t6" model="workflow.transition">
<field name="act_from" ref="act_accepted"/>
<field name="act_to" ref="act_refused"/>
@ -118,6 +118,11 @@
<field name="act_to" ref="act_refused"/>
<field name="signal">subflow.cancel</field>
</record>
<record id="t11" model="workflow.transition">
<field name="act_from" ref="act_refused"/>
<field name="act_to" ref="act_draft"/>
<field name="signal">draft</field>
<field name="role_id" ref="HR"/>
</record>
</data>
</openerp>