pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] hr_payroll_account: Payslip approval crashes without notification if Property accounts are not configured

Browse Source 
lp bug: https://launchpad.net/bugs/718741 fixed

bzr revid: ara@tinyerp.com-20110228090120-lshz23z5g1pgaehx
This commit is contained in:
jvo
2011-02-28 14:31:20 +05:30
committed by ARA (OpenERP)
parent 1bfe6c8df9
commit 70440c85bb
2 changed files with 34 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/hr_payroll_account/hr_payroll_account.py
+13 -3
View File
@@ -64,7 +64,7 @@ class hr_employee(osv.osv):
method=True,
domain="[('type', '=', 'liquidity')]",
view_load=True,
help="Select Bank Account from where Salary Expense will be Paid"),
help="Select Bank Account from where Salary Expense will be Paid,to be used for payslip verification."),
'salary_account':fields.property(
'account.account',
type='many2one',
@@ -295,6 +295,10 @@ class hr_payslip(osv.osv):
self.create_voucher(cr, uid, [slip.id], name, move_id)
name = "To %s account" % (slip.employee_id.name)
if not slip.employee_id.property_bank_account.id:
raise osv.except_osv(_('Warning !'), _('Employee Bank Account is not defined for %s') % slip.employee_id.name)
ded_rec = {
'move_id': move_id,
'name': name,
@@ -426,10 +430,10 @@ class hr_payslip(osv.osv):
partner_id = False
if not slip.employee_id.bank_account_id:
raise osv.except_osv(_('Integrity Error !'), _('Please defined bank account for %s !') % (slip.employee_id.name))
raise osv.except_osv(_('Integrity Error !'), _('Please define bank account for %s !') % (slip.employee_id.name))
if not slip.employee_id.bank_account_id.partner_id:
raise osv.except_osv(_('Integrity Error !'), _('Please defined partner in bank account for %s !') % (slip.employee_id.name))
raise osv.except_osv(_('Integrity Error !'), _('Please define partner in bank account for %s !') % (slip.employee_id.name))
partner = slip.employee_id.bank_account_id.partner_id
partner_id = slip.employee_id.bank_account_id.partner_id.id
@@ -464,6 +468,9 @@ class hr_payslip(osv.osv):
move_id = move_pool.create(cr, uid, move, context=context)
self.create_voucher(cr, uid, [slip.id], slip.name, move_id)
if not slip.employee_id.salary_account.id:
raise osv.except_osv(_('Warning !'), _('Please define Salary Account for %s.') % slip.employee_id.name)
line = {
'move_id':move_id,
'name': "By Basic Salary / " + slip.employee_id.name,
@@ -485,6 +492,9 @@ class hr_payslip(osv.osv):
move_line_id = movel_pool.create(cr, uid, line, context=context)
line_ids += [move_line_id]
if not slip.employee_id.employee_account.id:
raise osv.except_osv(_('Warning !'), _('Please define Employee Payable Account for %s.') % slip.employee_id.name)
line = {
'move_id':move_id,
'name': "To Basic Paysble Salary / " + slip.employee_id.name,
addons/hr_payroll_account/hr_payroll_account_view.xml
+21 -3
View File
@@ -57,7 +57,7 @@
</field>
</record>
<record id="view_hr_payslip_form_inherit_1" model="ir.ui.view">
<field name="name">hr.payslip.form.inherit1</field>
<field name="model">hr.payslip</field>
@@ -166,7 +166,7 @@
</field>
</field>
</record>
<record id="view_hr_payslip_form_inherit" model="ir.ui.view">
<field name="name">hr.payslip.form</field>
<field name="model">hr.payslip</field>
@@ -204,7 +204,7 @@
</page>
</field>
</record>
<record id="view_hr_payslip_form_inherit1" model="ir.ui.view">
<field name="name">hr.payslip.form</field>
<field name="model">hr.payslip</field>
@@ -221,5 +221,23 @@
</notebook>
</field>
</record>
<!-- Adding Account Properties to the Employee form -->
<record id="hr_employee_payroll_property_form" model="ir.ui.view">
<field name="name">hr.employee.payroll.property.form</field>
<field name="model">hr.employee</field>
<field name="inherit_id" ref="hr_contract.hr_hr_employee_view_form2"/>
<field name="arch" type="xml">
<field name="bank_account_id" position="after">
<field name="property_bank_account" string="Employee Bank Account"/>
<field name="salary_account"/>
<field name="employee_account"/>
<field name="analytic_account"/>
</field>
</field>
</record>
</data>
</openerp>