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

[IMP] hr_payroll_account: improved code to assign the account(if empty) on salary rules from payslip journal 

bzr revid: mtr@mtr-20110419070204-r3xaby5fl7rl1e80
This commit is contained in:
mtr 2011-04-19 12:32:04 +05:30
parent 566c5c7a8c
commit 148c73acb1
1 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
addons/hr_payroll_account/hr_payroll_account.py
View File

@ -222,17 +222,32 @@ class hr_payslip(osv.osv):
}
def get_payslip_lines(self, cr, uid, contract_ids, payslip_id, context):
journal_obj = self.pool.get('account.journal')
rule_obj = self.pool.get('hr.salary.rule')
contract_obj = self.pool.get('hr.contract')
structure_obj = self.pool.get('hr.payroll.structure')
vals_account = {}
result = super(hr_payslip, self).get_payslip_lines(cr, uid, contract_ids, payslip_id, context)
structure_ids = self.pool.get('hr.contract').get_all_structures(cr, uid, contract_ids, context=context)
structure_ids = contract_obj.get_all_structures(cr, uid, contract_ids, context=context)
#get the rules of the structure and thier children
rule_ids = self.pool.get('hr.payroll.structure').get_all_rules(cr, uid, structure_ids, context=context)
#run the rules by sequence
rule_ids = structure_obj.get_all_rules(cr, uid, structure_ids, context=context)
sorted_rule_ids = [id for id, sequence in sorted(rule_ids, key=lambda x:x[1])]
for rule in self.pool.get('hr.salary.rule').browse(cr, uid, sorted_rule_ids, context=context):
journal_id = [record.journal_id.id for record in self.browse(cr, uid, [payslip_id], context=context)]
for jou in journal_obj.browse(cr ,uid, journal_id, context=context):
credit_account = jou.default_credit_account_id.id
debit_account = jou.default_debit_account_id.id
for rule in rule_obj.browse(cr, uid, sorted_rule_ids, context=context):
if not rule.account_debit.id:
vals_account['account_debit'] = debit_account
if not rule.account_credit.id:
vals_account['account_credit'] = credit_account
rule_obj.write(cr, uid, [rule.id], vals_account)
for value in result:
if value['salary_rule_id'] == rule.id:
value['account_id'] = rule.account_debit.id,
if not rule.account_debit.id:
value['account_id'] = debit_account
else:
value['account_id'] = rule.account_debit.id
return result
def create_voucher(self, cr, uid, ids, name, voucher, sequence=5):