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

[IMP] hr_payroll_account: removed fields from contribution.register and salary.rule 

bzr revid: mtr@mtr-20110516103231-vzmxbdy11zyhs52y
This commit is contained in:
mtr 2011-05-16 16:02:31 +05:30
parent 7499c98d42
commit 0bff771eda
2 changed files with 28 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
addons/hr_payroll_account/hr_payroll_account.py
View File

@ -33,7 +33,6 @@ class contrib_register(osv.osv):
_description = 'Contribution Register'
_columns = {
'account_id': fields.many2one('account.account', 'Account'),
'analytic_account_id':fields.many2one('account.analytic.account', 'Analytic Account'),
}
contrib_register()
@ -109,40 +108,34 @@ class hr_payslip(osv.osv):
'narration': name
}
for line in slip.line_ids:
if line.salary_rule_id.accounting_select != 'none':
amt = slip.credit_note and -line.total or line.total
partner_id = False
name = line.name
debit_account_id = line.salary_rule_id.account_debit.id
credit_account_id = line.salary_rule_id.account_credit.id
if line.salary_rule_id.accounting_select == 'third_party':
if line.salary_rule_id.register_id:
credit_account_id = line.salary_rule_id.register_id.account_id.id
else:
partner_id = slip.employee_id.partner_id.id
debit_line = (0,0,{
'name': line.name,
'account_id': debit_account_id,
'debit': amt > 0.0 and amt or 0.0,
'credit': amt < 0.0 and -amt or 0.0,
'date': timenow,
'journal_id': slip.journal_id.id,
'period_id': period_id,
})
credit_line = (0,0,{
'date': timenow,
'journal_id': slip.journal_id.id,
'period_id': period_id,
'name': name,
'partner_id': partner_id,
'account_id': credit_account_id,
'debit': amt < 0.0 and -amt or 0.0,
'credit': amt > 0.0 and amt or 0.0,
})
if debit_account_id:
line_ids.append(debit_line)
if credit_account_id:
line_ids.append(credit_line)
amt = slip.credit_note and -line.total or line.total
partner_id = False
name = line.name
debit_account_id = line.salary_rule_id.account_debit.id
credit_account_id = line.salary_rule_id.account_credit.id
debit_line = (0,0,{
'name': line.name,
'account_id': debit_account_id,
'debit': amt > 0.0 and amt or 0.0,
'credit': amt < 0.0 and -amt or 0.0,
'date': timenow,
'journal_id': slip.journal_id.id,
'period_id': period_id,
})
credit_line = (0,0,{
'date': timenow,
'journal_id': slip.journal_id.id,
'period_id': period_id,
'name': name,
'partner_id': partner_id,
'account_id': credit_account_id,
'debit': amt < 0.0 and -amt or 0.0,
'credit': amt > 0.0 and amt or 0.0,
})
if debit_account_id:
line_ids.append(debit_line)
if credit_account_id:
line_ids.append(credit_line)
move.update({'line_id': line_ids})
move_id = move_pool.create(cr, uid, move, context=context)
self.write(cr, uid, [slip.id], {'move_id': move_id}, context=context)
@ -381,7 +374,6 @@ hr_payslip()
class hr_salary_rule(osv.osv):
_inherit = 'hr.salary.rule'
_columns = {
'accounting_select':fields.selection([('none', 'No Accounting Entries'), ('third_party', 'To Employee or contribution Register'), ('yes','Regular Entries')], 'Accounting Entries Option'),
'analytic_account_id':fields.many2one('account.analytic.account', 'Analytic Account'),
'account_tax_id':fields.many2one('account.tax.code', 'Tax Code'),
'account_debit': fields.many2one('account.account', 'Debit Account'),

2
addons/hr_payroll_account/hr_payroll_account_view.xml
View File

@ -26,7 +26,6 @@
<field name="arch" type="xml">
<xpath expr="/form/notebook" position="before">
<newline/>
<field name="account_id" />
<field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
</xpath>
</field>
@ -41,7 +40,6 @@
<field name="arch" type="xml">
<xpath expr="/form/notebook/page[@string='Child Rules']" position="after">
<page string="Accounting">
<field name="accounting_select" />
<field name="account_debit" />
<field name="account_credit"/>
<field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>