Hardik Ansodariya (OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/6.0-opw-383711-han into
lp:openobject-addons/6.0.
Requested reviews:
Naresh(OpenERP) (nch-openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/6.0-opw-383711-han/+merge/93765
Hello,
I have fixed the issue of "Not permitted to pay payroll" by introducing
category_id field in hr.expense.expense object.
Kindly review it.
Thanks
Hardik
--
https://code.launchpad.net/~openerp-dev/openobject-addons/6.0-opw-383711-han/+merge/93765
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/6.0-opw-383711-han.
=== modified file 'hr_payroll_account/__openerp__.py'
--- hr_payroll_account/__openerp__.py 2011-01-17 10:26:16 +0000
+++ hr_payroll_account/__openerp__.py 2012-02-20 05:44:18 +0000
@@ -31,9 +31,9 @@
'author':'OpenERP SA',
'website':'http://www.openerp.com',
'depends': [
+ 'hr_expense',
'hr_payroll',
'account',
- 'hr_expense'
],
'init_xml': [
],
=== modified file 'hr_payroll_account/hr_payroll_account.py'
--- hr_payroll_account/hr_payroll_account.py 2011-09-29 11:43:50 +0000
+++ hr_payroll_account/hr_payroll_account.py 2012-02-20 05:44:18 +0000
@@ -202,6 +202,13 @@
}
hr_holidays_status()
+class hr_expense_expense(osv.osv):
+ _inherit = "hr.expense.expense"
+ _columns = {
+ 'category_id':fields.many2one('hr.allounce.deduction.categoty', 'Category'),
+ }
+hr_expense_expense()
+
class hr_payslip(osv.osv):
'''
Pay Slip
@@ -635,7 +642,7 @@
'category_id':exp.category_id.id,
'amount':exp.amount,
'slip_id':slip.id,
- 'account_id':acc
+ 'account_id':acc.id
}
payslip_pool.create(cr, uid, exp_res, context=context)
=== modified file 'hr_payroll_account/hr_payroll_account_view.xml'
--- hr_payroll_account/hr_payroll_account_view.xml 2011-08-30 12:41:34 +0000
+++ hr_payroll_account/hr_payroll_account_view.xml 2012-02-20 05:44:18 +0000
@@ -113,6 +113,18 @@
</field>
</record>
+ <record model="ir.ui.view" id="view_hr_expense_expense_inherit_form">
+ <field name="name">hr.expense.expense.inherit.form</field>
+ <field name="model">hr.expense.expense</field>
+ <field name="inherit_id" ref="hr_expense.view_expenses_form"/>
+ <field name="type">form</field>
+ <field name="arch" type="xml">
+ <field name="department_id" position="after">
+ <field name="category_id" required="1"/>
+ </field>
+ </field>
+ </record>
+
<record model="ir.ui.view" id="hr_contibution_register_inherit_tree">
<field name="name">hr.contibution.register.inherit.tree</field>
<field name="model">hr.contibution.register</field>
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
