[IMP] hr_payroll_account: cleaning of views and implementation of compute_sheet method
bzr revid: qdp-launchpad@openerp.com-20110512110121-mqo8bv40fc54wdp3
This commit is contained in:
Quentin (OpenERP)
@@ -38,6 +38,14 @@ class contrib_register(osv.osv):
|
||||
}
|
||||
contrib_register()
|
||||
|
||||
#class account_move_line(osv.osv):
|
||||
#
|
||||
# _inherit = 'account.move.line'
|
||||
# _columns = {
|
||||
# 'slip_id': fields.many2one('hr.payslip', 'Payslip'),
|
||||
# }
|
||||
#account_move_line()
|
||||
|
||||
class hr_payslip(osv.osv):
|
||||
'''
|
||||
Pay Slip
|
||||
@@ -47,10 +55,11 @@ class hr_payslip(osv.osv):
|
||||
|
||||
_columns = {
|
||||
'period_id': fields.many2one('account.period', 'Force Period',states={'draft': [('readonly', False)]}, readonly=True, domain=[('state','<>','done')], help="Keep empty to use the period of the validation(Payslip) date."),
|
||||
'journal_id': fields.many2one('account.journal', 'Expense Journal',states={'draft': [('readonly', False)]}, readonly=True),
|
||||
'journal_id': fields.many2one('account.journal', 'Expense Journal',states={'draft': [('readonly', False)]}, readonly=True, required=True),
|
||||
#TOCHECK: should we have a link to account.move or account.move.line?
|
||||
#'move_line_ids':fields.many2many('account.move.line', 'payslip_lines_rel', 'slip_id', 'line_id', 'Accounting Lines', readonly=True),
|
||||
'account_move_ids': fields.many2many('account.move', 'payslip_move_rel', 'slip_id', 'move_id', 'Accounting Entries', readonly=True),
|
||||
'move_id': fields.many2one('account.move', 'Accounting Entry', readonly=True),
|
||||
#'move_line_ids':fields.one2many('account.move.line', 'slip_id', 'Accounting Lines', readonly=True),
|
||||
#'account_move_ids': fields.many2many('account.move', 'payslip_move_rel', 'slip_id', 'move_id', 'Accounting Entries', readonly=True),
|
||||
}
|
||||
|
||||
def onchange_contract_id(self, cr, uid, ids, date_from, date_to, employee_id=False, contract_id=False, context=None):
|
||||
@@ -60,62 +69,17 @@ class hr_payslip(osv.osv):
|
||||
res['value'].update({'journal_id': journal_id})
|
||||
return res
|
||||
|
||||
#FIXME: we need to overwrite a smaller code
|
||||
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 = contract_obj.get_all_structures(cr, uid, contract_ids, context=context)
|
||||
#get the rules of the structure and thier children
|
||||
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])]
|
||||
#Fetching Debit/Credit account of the payslip journal.
|
||||
journal = self.browse(cr, uid, payslip_id, context=context).journal_id
|
||||
credit_account = journal.default_credit_account_id and journal.default_credit_account_id.id or False
|
||||
debit_account = journal.default_debit_account_id and journal.default_debit_account_id.id or False
|
||||
# Assigning above fetched Debit/Credit account on salary rules if not specified
|
||||
for rule in rule_obj.browse(cr, uid, sorted_rule_ids, context=context):
|
||||
if not rule.account_debit.id:
|
||||
rule_obj.write(cr, uid, [rule.id], {'account_debit': debit_account})
|
||||
if not rule.account_credit.id:
|
||||
rule_obj.write(cr, uid, [rule.id], {'account_credit': credit_account})
|
||||
#Assigning Debit/Credit account on payslip lines
|
||||
for value in result:
|
||||
if value['salary_rule_id'] == rule.id:
|
||||
if rule.category_id.name == 'Deduction':
|
||||
if not rule.account_debit.id:
|
||||
value['account_id'] = debit_account
|
||||
else:
|
||||
value['account_id'] = rule.account_debit.id
|
||||
elif rule.category_id.name == 'Allowance':
|
||||
if not rule.account_credit.id:
|
||||
value['account_id'] = credit_account
|
||||
else:
|
||||
value['account_id'] = rule.account_credit.id
|
||||
else:
|
||||
emp_account_id = self.browse(cr, uid, payslip_id, context=context).employee_id.employee_account.id
|
||||
value['account_id'] = emp_account_id
|
||||
if rule.analytic_account_id:
|
||||
value['analytic_account_id'] = rule.analytic_account_id.id
|
||||
return result
|
||||
|
||||
#TODO: to correct
|
||||
def cancel_sheet(self, cr, uid, ids, context=None):
|
||||
move_pool = self.pool.get('account.move')
|
||||
slip_move = self.pool.get('hr.payslip.account.move')
|
||||
move_ids = []
|
||||
move_to_cancel = []
|
||||
for slip in self.browse(cr, uid, ids, context=context):
|
||||
for line in slip.move_ids:
|
||||
move_ids.append(line.id)
|
||||
if line.move_id:
|
||||
if line.move_id.state == 'posted':
|
||||
move_pool.button_cancel(cr, uid [line.move_id.id], context)
|
||||
move_pool.unlink(cr, uid, [line.move_id.id], context=context)
|
||||
slip_move.unlink(cr, uid, move_ids, context=context)
|
||||
return self.write(cr, uid, ids, {'state':'cancel'}, context=context)
|
||||
move_ids.append(slip.move_id.id)
|
||||
if slip.move_id.state == 'posted':
|
||||
move_to_cancel.append(slip.move_id.id)
|
||||
move_pool.button_cancel(cr, uid, move_to_cancel, context=context)
|
||||
move_pool.unlink(cr, uid, move_ids, context=context)
|
||||
return super(hr_payslip, self).cancel_sheet(cr, uid, ids, context=context)
|
||||
|
||||
#TODO: to correct
|
||||
def process_sheet(self, cr, uid, ids, context=None):
|
||||
@@ -126,10 +90,6 @@ class hr_payslip(osv.osv):
|
||||
period_pool = self.pool.get('account.period')
|
||||
|
||||
for slip in self.browse(cr, uid, ids, context=context):
|
||||
if not slip.bank_journal_id or not slip.journal_id:
|
||||
# Call super method to process sheet if journal_id or bank_journal_id are not specified.
|
||||
super(hr_payslip, self).process_sheet(cr, uid, [slip.id], context=context)
|
||||
continue
|
||||
line_ids = []
|
||||
partner = False
|
||||
partner_id = False
|
||||
@@ -137,310 +97,276 @@ class hr_payslip(osv.osv):
|
||||
|
||||
partner = slip.employee_id.bank_account_id.partner_id
|
||||
partner_id = partner.id
|
||||
|
||||
for line in slip.line_ids:
|
||||
if line.category_id.name == 'Net':
|
||||
amt = line.total
|
||||
|
||||
fiscal_year_ids = fiscalyear_pool.search(cr, uid, [], context=context)
|
||||
if not fiscal_year_ids:
|
||||
raise osv.except_osv(_('Warning !'), _('Please define fiscal year for perticular contract'))
|
||||
fiscal_year_objs = fiscalyear_pool.read(cr, uid, fiscal_year_ids, ['date_start','date_stop'], context=context)
|
||||
year_exist = False
|
||||
for fiscal_year in fiscal_year_objs:
|
||||
if ((fiscal_year['date_start'] <= slip.date_from) and (fiscal_year['date_stop'] >= slip.date_to)):
|
||||
year_exist = True
|
||||
if not year_exist:
|
||||
raise osv.except_osv(_('Warning !'), _('Fiscal Year is not defined for slip date %s') % slip.date)
|
||||
search_periods = period_pool.search(cr, uid, [('date_start','<=',slip.date_from),('date_stop','>=',slip.date_to)], context=context)
|
||||
if not search_periods:
|
||||
raise osv.except_osv(_('Warning !'), _('Period is not defined for slip date %s') % slip.date)
|
||||
period_id = search_periods[0]
|
||||
name = 'Payment of Salary to %s' % (slip.employee_id.name)
|
||||
move = {
|
||||
'journal_id': slip.bank_journal_id.id,
|
||||
'period_id': period_id,
|
||||
'date': slip.date_from,
|
||||
'type':'bank_pay_voucher',
|
||||
'ref':slip.number,
|
||||
'narration': name
|
||||
}
|
||||
move_id = move_pool.create(cr, uid, move, context=context)
|
||||
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,
|
||||
'date': slip.date_from,
|
||||
'account_id': slip.employee_id.property_bank_account.id,
|
||||
'debit': 0.0,
|
||||
'credit': amt,
|
||||
'journal_id': slip.journal_id.id,
|
||||
'period_id': period_id,
|
||||
'ref': slip.number
|
||||
}
|
||||
line_ids += [movel_pool.create(cr, uid, ded_rec, context=context)]
|
||||
name = "By %s account" % (slip.employee_id.property_bank_account.name)
|
||||
cre_rec = {
|
||||
'move_id': move_id,
|
||||
'name': name,
|
||||
'partner_id': partner_id,
|
||||
'date': slip.date_from,
|
||||
'account_id': partner.property_account_payable.id,
|
||||
'debit': amt,
|
||||
'credit': 0.0,
|
||||
'journal_id': slip.journal_id.id,
|
||||
'period_id': period_id,
|
||||
'ref': slip.number
|
||||
}
|
||||
line_ids += [movel_pool.create(cr, uid, cre_rec, context=context)]
|
||||
|
||||
|
||||
rec = {
|
||||
'state':'done',
|
||||
'move_payment_ids':[(6, 0, line_ids)],
|
||||
'paid':True,
|
||||
'account_move_ids': [(4, move_id)],
|
||||
}
|
||||
self.write(cr, uid, [slip.id], rec, context=context)
|
||||
for exp_id in exp_ids:
|
||||
self.write(cr, uid, [slip.id], {'move_line_ids':[(4, exp_id)]}, context=context)
|
||||
|
||||
return True
|
||||
|
||||
#TODO: to clean
|
||||
def account_check_sheet(self, cr, uid, ids, context=None):
|
||||
return self.write(cr, uid, ids, {'state':'accont_check'}, context=context)
|
||||
#TODO: to clean
|
||||
|
||||
def hr_check_sheet(self, cr, uid, ids, context=None):
|
||||
return self.write(cr, uid, ids, {'state':'hr_check'}, context=context)
|
||||
|
||||
#TODO: to clean
|
||||
def verify_sheet(self, cr, uid, ids, context=None):
|
||||
move_pool = self.pool.get('account.move')
|
||||
movel_pool = self.pool.get('account.move.line')
|
||||
exp_pool = self.pool.get('hr.expense.expense')
|
||||
fiscalyear_pool = self.pool.get('account.fiscalyear')
|
||||
period_pool = self.pool.get('account.period')
|
||||
property_pool = self.pool.get('ir.property')
|
||||
payslip_pool = self.pool.get('hr.payslip.line')
|
||||
|
||||
for slip in self.browse(cr, uid, ids, context=context):
|
||||
for line in slip.line_ids:
|
||||
if line.category_id.name == 'Basic':
|
||||
basic_amt = line.total
|
||||
if not slip.journal_id:
|
||||
# Call super method to verify sheet if journal_id is not specified.
|
||||
super(hr_payslip, self).verify_sheet(cr, uid, [slip.id], context=context)
|
||||
continue
|
||||
total_deduct = 0.0
|
||||
|
||||
line_ids = []
|
||||
move_ids = []
|
||||
partner = False
|
||||
partner_id = False
|
||||
|
||||
if not slip.employee_id.bank_account_id:
|
||||
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 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
|
||||
|
||||
period_id = False
|
||||
|
||||
if slip.period_id:
|
||||
period_id = slip.period_id.id
|
||||
else:
|
||||
fiscal_year_ids = fiscalyear_pool.search(cr, uid, [], context=context)
|
||||
if not fiscal_year_ids:
|
||||
raise osv.except_osv(_('Warning !'), _('Please define fiscal year for perticular contract'))
|
||||
fiscal_year_objs = fiscalyear_pool.read(cr, uid, fiscal_year_ids, ['date_start','date_stop'], context=context)
|
||||
year_exist = False
|
||||
for fiscal_year in fiscal_year_objs:
|
||||
if ((fiscal_year['date_start'] <= slip.date_from) and (fiscal_year['date_stop'] >= slip.date_to)):
|
||||
year_exist = True
|
||||
if not year_exist:
|
||||
raise osv.except_osv(_('Warning !'), _('Fiscal Year is not defined for slip date %s') % slip.date)
|
||||
search_periods = period_pool.search(cr,uid,[('date_start','=',slip.date_from),('date_stop','=',slip.date_to)], context=context)
|
||||
if not slip.period_id:
|
||||
search_periods = period_pool.search(cr, uid, [('date_start','<=',slip.date_from),('date_stop','>=',slip.date_to)], context=context)
|
||||
if not search_periods:
|
||||
raise osv.except_osv(_('Warning !'), _('Period is not defined for slip date %s') % slip.date)
|
||||
period_id = search_periods[0]
|
||||
else:
|
||||
period_id = slip.period_id.id
|
||||
|
||||
name = _('Payslip of %s') % (slip.employee_id.name)
|
||||
move = {
|
||||
'journal_id': slip.journal_id.id,
|
||||
'period_id': period_id,
|
||||
'date': slip.date_from,
|
||||
'date': timenow,
|
||||
'ref':slip.number,
|
||||
'narration': slip.name
|
||||
'narration': name
|
||||
}
|
||||
move_id = move_pool.create(cr, uid, move, context=context)
|
||||
move_ids += [move_id]
|
||||
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,
|
||||
'date': slip.date_from,
|
||||
'account_id': slip.employee_id.salary_account.id,
|
||||
'debit': basic_amt,
|
||||
'credit': 0.0,
|
||||
'journal_id': slip.journal_id.id,
|
||||
'period_id': period_id,
|
||||
'analytic_account_id': False,
|
||||
'ref':slip.number
|
||||
}
|
||||
#Setting Analysis Account for Basic Salary
|
||||
if slip.employee_id.analytic_account:
|
||||
line['analytic_account_id'] = slip.employee_id.analytic_account.id
|
||||
|
||||
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 Payble Salary / " + slip.employee_id.name,
|
||||
'partner_id': partner_id,
|
||||
'date': slip.date_from,
|
||||
'account_id': slip.employee_id.employee_account.id,
|
||||
'debit': 0.0,
|
||||
'credit': basic_amt,
|
||||
'journal_id': slip.journal_id.id,
|
||||
'period_id': period_id,
|
||||
'ref':slip.number
|
||||
}
|
||||
line_ids += [movel_pool.create(cr, uid, line, context=context)]
|
||||
for line in slip.line_ids:
|
||||
if line.name == 'Net' or line.name == 'Gross' or line.name == 'Basic':
|
||||
continue
|
||||
name = "[%s] - %s / %s" % (line.code, line.name, slip.employee_id.name)
|
||||
amount = line.total
|
||||
rec = {
|
||||
'move_id': move_id,
|
||||
'name': name,
|
||||
'date': slip.date_from,
|
||||
'account_id': line.account_id.id,
|
||||
'debit': 0.0,
|
||||
'credit': 0.0,
|
||||
'journal_id': slip.journal_id.id,
|
||||
'period_id': period_id,
|
||||
'analytic_account_id': False,
|
||||
'ref': slip.number,
|
||||
'quantity': 1
|
||||
}
|
||||
|
||||
#Setting Analysis Account for Salary Slip Lines
|
||||
if line.analytic_account_id:
|
||||
rec['analytic_account_id'] = line.analytic_account_id.id
|
||||
if line.category_id.name == 'Allowance' :
|
||||
rec['debit'] = amount
|
||||
if not partner.property_account_payable:
|
||||
raise osv.except_osv(_('Integrity Error !'), _('Please Configure Partners Payable Account!!'))
|
||||
ded_rec = {
|
||||
'move_id': move_id,
|
||||
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.debit_account_id.id
|
||||
credit_account_id = line.salary_rule_id.credit_account_id.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,
|
||||
})
|
||||
credit_line = (0,0,{
|
||||
'name': name,
|
||||
'partner_id': partner_id,
|
||||
'date': slip.date_from,
|
||||
'account_id': partner.property_account_payable.id,
|
||||
'debit': 0.0,
|
||||
'quantity': 1,
|
||||
'credit': amount,
|
||||
'journal_id': slip.journal_id.id,
|
||||
'period_id': period_id,
|
||||
'ref': slip.number
|
||||
}
|
||||
line_ids += [movel_pool.create(cr, uid, ded_rec, context=context)]
|
||||
elif line.category_id.name == 'Deduction':
|
||||
if not partner.property_account_receivable:
|
||||
raise osv.except_osv(_('Integrity Error !'), _('Please Configure Partners Receivable Account!!'))
|
||||
amount = -(amount)
|
||||
rec['credit'] = amount
|
||||
total_deduct += amount
|
||||
ded_rec = {
|
||||
'move_id': move_id,
|
||||
'name': name,
|
||||
'partner_id': partner_id,
|
||||
'date': slip.date_from,
|
||||
'quantity': 1,
|
||||
'account_id': partner.property_account_receivable.id,
|
||||
'debit': amount,
|
||||
'credit': 0.0,
|
||||
'journal_id': slip.journal_id.id,
|
||||
'period_id': period_id,
|
||||
'ref': slip.number
|
||||
}
|
||||
line_ids += [movel_pool.create(cr, uid, ded_rec, context=context)]
|
||||
line_ids += [movel_pool.create(cr, uid, rec, context=context)]
|
||||
adj_move_id = False
|
||||
if total_deduct > 0:
|
||||
move = {
|
||||
'journal_id': slip.journal_id.id,
|
||||
'period_id': period_id,
|
||||
'date': slip.date_from,
|
||||
'ref':slip.number,
|
||||
'narration': 'Adjustment: %s' % (slip.name)
|
||||
}
|
||||
adj_move_id = move_pool.create(cr, uid, move, context=context)
|
||||
move_ids += [adj_move_id]
|
||||
name = "Adjustment Entry - %s" % (slip.employee_id.name)
|
||||
self.create_voucher(cr, uid, [slip.id], name, adj_move_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_ids': line_ids})
|
||||
move_id = move_pool.create(cr, uid, move, context=context)
|
||||
self.write(cr, uid, [slip.id], {'move_id': move_id}, context=context)
|
||||
return super(hr_payslip, self).process_sheet(cr, uid, [slip.id], context=context)
|
||||
|
||||
ded_rec = {
|
||||
'move_id': adj_move_id,
|
||||
'name': name,
|
||||
'partner_id': partner_id,
|
||||
'date': slip.date_from,
|
||||
'account_id': partner.property_account_receivable.id,
|
||||
'debit': 0.0,
|
||||
'quantity': 1,
|
||||
'credit': total_deduct,
|
||||
'journal_id': slip.journal_id.id,
|
||||
'period_id': period_id,
|
||||
'ref': slip.number
|
||||
}
|
||||
line_ids += [movel_pool.create(cr, uid, ded_rec, context=context)]
|
||||
cre_rec = {
|
||||
'move_id': adj_move_id,
|
||||
'name': name,
|
||||
'partner_id': partner_id,
|
||||
'date': slip.date_from,
|
||||
'account_id': partner.property_account_payable.id,
|
||||
'debit': total_deduct,
|
||||
'quantity': 1,
|
||||
'credit': 0.0,
|
||||
'journal_id': slip.journal_id.id,
|
||||
'period_id': period_id,
|
||||
'ref': slip.number
|
||||
}
|
||||
line_ids += [movel_pool.create(cr, uid, cre_rec, context=context)]
|
||||
|
||||
rec = {
|
||||
'state':'confirm',
|
||||
'move_line_ids':[(6, 0,line_ids)],
|
||||
'account_move_ids':[(6, 0, move_ids)]
|
||||
}
|
||||
if not slip.period_id:
|
||||
rec['period_id'] = period_id
|
||||
|
||||
exp_ids = exp_pool.search(cr, uid, [('date_valid','>=',slip.date_from), ('date_valid','<=',slip.date_to), ('state','=','invoiced')], context=context)
|
||||
self.write(cr, uid, [slip.id], rec, context=context)
|
||||
return True
|
||||
|
||||
hr_payslip()
|
||||
#TODO: to clean: the verofying doesn't do anything in the accounting..
|
||||
# def verify_sheet(self, cr, uid, ids, context=None):
|
||||
# move_pool = self.pool.get('account.move')
|
||||
# movel_pool = self.pool.get('account.move.line')
|
||||
# exp_pool = self.pool.get('hr.expense.expense')
|
||||
# fiscalyear_pool = self.pool.get('account.fiscalyear')
|
||||
# period_pool = self.pool.get('account.period')
|
||||
# property_pool = self.pool.get('ir.property')
|
||||
# payslip_pool = self.pool.get('hr.payslip.line')
|
||||
#
|
||||
# for slip in self.browse(cr, uid, ids, context=context):
|
||||
# for line in slip.line_ids:
|
||||
# if line.category_id.name == 'Basic':
|
||||
# basic_amt = line.total
|
||||
# if not slip.journal_id:
|
||||
# # Call super method to verify sheet if journal_id is not specified.
|
||||
# super(hr_payslip, self).verify_sheet(cr, uid, [slip.id], context=context)
|
||||
# continue
|
||||
# total_deduct = 0.0
|
||||
#
|
||||
# line_ids = []
|
||||
# move_ids = []
|
||||
# partner = False
|
||||
# partner_id = False
|
||||
#
|
||||
# if not slip.employee_id.bank_account_id:
|
||||
# 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 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
|
||||
#
|
||||
# period_id = False
|
||||
#
|
||||
# if slip.period_id:
|
||||
# period_id = slip.period_id.id
|
||||
# else:
|
||||
# fiscal_year_ids = fiscalyear_pool.search(cr, uid, [], context=context)
|
||||
# if not fiscal_year_ids:
|
||||
# raise osv.except_osv(_('Warning !'), _('Please define fiscal year for perticular contract'))
|
||||
# fiscal_year_objs = fiscalyear_pool.read(cr, uid, fiscal_year_ids, ['date_start','date_stop'], context=context)
|
||||
# year_exist = False
|
||||
# for fiscal_year in fiscal_year_objs:
|
||||
# if ((fiscal_year['date_start'] <= slip.date_from) and (fiscal_year['date_stop'] >= slip.date_to)):
|
||||
# year_exist = True
|
||||
# if not year_exist:
|
||||
# raise osv.except_osv(_('Warning !'), _('Fiscal Year is not defined for slip date %s') % slip.date)
|
||||
# search_periods = period_pool.search(cr,uid,[('date_start','=',slip.date_from),('date_stop','=',slip.date_to)], context=context)
|
||||
# if not search_periods:
|
||||
# raise osv.except_osv(_('Warning !'), _('Period is not defined for slip date %s') % slip.date)
|
||||
# period_id = search_periods[0]
|
||||
#
|
||||
# move = {
|
||||
# 'journal_id': slip.journal_id.id,
|
||||
# 'period_id': period_id,
|
||||
# 'date': slip.date_from,
|
||||
# 'ref':slip.number,
|
||||
# 'narration': slip.name
|
||||
# }
|
||||
# move_id = move_pool.create(cr, uid, move, context=context)
|
||||
# move_ids += [move_id]
|
||||
# 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,
|
||||
# 'date': slip.date_from,
|
||||
# 'account_id': slip.employee_id.salary_account.id,
|
||||
# 'debit': basic_amt,
|
||||
# 'credit': 0.0,
|
||||
# 'journal_id': slip.journal_id.id,
|
||||
# 'period_id': period_id,
|
||||
# 'analytic_account_id': False,
|
||||
# 'ref':slip.number
|
||||
# }
|
||||
# #Setting Analysis Account for Basic Salary
|
||||
# if slip.employee_id.analytic_account:
|
||||
# line['analytic_account_id'] = slip.employee_id.analytic_account.id
|
||||
#
|
||||
# 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 Payble Salary / " + slip.employee_id.name,
|
||||
# 'partner_id': partner_id,
|
||||
# 'date': slip.date_from,
|
||||
# 'account_id': slip.employee_id.employee_account.id,
|
||||
# 'debit': 0.0,
|
||||
# 'credit': basic_amt,
|
||||
# 'journal_id': slip.journal_id.id,
|
||||
# 'period_id': period_id,
|
||||
# 'ref':slip.number
|
||||
# }
|
||||
# line_ids += [movel_pool.create(cr, uid, line, context=context)]
|
||||
# for line in slip.line_ids:
|
||||
# if line.name == 'Net' or line.name == 'Gross' or line.name == 'Basic':
|
||||
# continue
|
||||
# name = "[%s] - %s / %s" % (line.code, line.name, slip.employee_id.name)
|
||||
# amount = line.total
|
||||
# rec = {
|
||||
# 'move_id': move_id,
|
||||
# 'name': name,
|
||||
# 'date': slip.date_from,
|
||||
# 'account_id': line.account_id.id,
|
||||
# 'debit': 0.0,
|
||||
# 'credit': 0.0,
|
||||
# 'journal_id': slip.journal_id.id,
|
||||
# 'period_id': period_id,
|
||||
# 'analytic_account_id': False,
|
||||
# 'ref': slip.number,
|
||||
# 'quantity': 1
|
||||
# }
|
||||
#
|
||||
# #Setting Analysis Account for Salary Slip Lines
|
||||
# if line.analytic_account_id:
|
||||
# rec['analytic_account_id'] = line.analytic_account_id.id
|
||||
# if line.category_id.name == 'Allowance' :
|
||||
# rec['debit'] = amount
|
||||
# if not partner.property_account_payable:
|
||||
# raise osv.except_osv(_('Integrity Error !'), _('Please Configure Partners Payable Account!!'))
|
||||
# ded_rec = {
|
||||
# 'move_id': move_id,
|
||||
# 'name': name,
|
||||
# 'partner_id': partner_id,
|
||||
# 'date': slip.date_from,
|
||||
# 'account_id': partner.property_account_payable.id,
|
||||
# 'debit': 0.0,
|
||||
# 'quantity': 1,
|
||||
# 'credit': amount,
|
||||
# 'journal_id': slip.journal_id.id,
|
||||
# 'period_id': period_id,
|
||||
# 'ref': slip.number
|
||||
# }
|
||||
# line_ids += [movel_pool.create(cr, uid, ded_rec, context=context)]
|
||||
# elif line.category_id.name == 'Deduction':
|
||||
# if not partner.property_account_receivable:
|
||||
# raise osv.except_osv(_('Integrity Error !'), _('Please Configure Partners Receivable Account!!'))
|
||||
# amount = -(amount)
|
||||
# rec['credit'] = amount
|
||||
# total_deduct += amount
|
||||
# ded_rec = {
|
||||
# 'move_id': move_id,
|
||||
# 'name': name,
|
||||
# 'partner_id': partner_id,
|
||||
# 'date': slip.date_from,
|
||||
# 'quantity': 1,
|
||||
# 'account_id': partner.property_account_receivable.id,
|
||||
# 'debit': amount,
|
||||
# 'credit': 0.0,
|
||||
# 'journal_id': slip.journal_id.id,
|
||||
# 'period_id': period_id,
|
||||
# 'ref': slip.number
|
||||
# }
|
||||
# line_ids += [movel_pool.create(cr, uid, ded_rec, context=context)]
|
||||
# line_ids += [movel_pool.create(cr, uid, rec, context=context)]
|
||||
# adj_move_id = False
|
||||
# if total_deduct > 0:
|
||||
# move = {
|
||||
# 'journal_id': slip.journal_id.id,
|
||||
# 'period_id': period_id,
|
||||
# 'date': slip.date_from,
|
||||
# 'ref':slip.number,
|
||||
# 'narration': 'Adjustment: %s' % (slip.name)
|
||||
# }
|
||||
# adj_move_id = move_pool.create(cr, uid, move, context=context)
|
||||
# move_ids += [adj_move_id]
|
||||
# name = "Adjustment Entry - %s" % (slip.employee_id.name)
|
||||
# self.create_voucher(cr, uid, [slip.id], name, adj_move_id)
|
||||
#
|
||||
# ded_rec = {
|
||||
# 'move_id': adj_move_id,
|
||||
# 'name': name,
|
||||
# 'partner_id': partner_id,
|
||||
# 'date': slip.date_from,
|
||||
# 'account_id': partner.property_account_receivable.id,
|
||||
# 'debit': 0.0,
|
||||
# 'quantity': 1,
|
||||
# 'credit': total_deduct,
|
||||
# 'journal_id': slip.journal_id.id,
|
||||
# 'period_id': period_id,
|
||||
# 'ref': slip.number
|
||||
# }
|
||||
# line_ids += [movel_pool.create(cr, uid, ded_rec, context=context)]
|
||||
# cre_rec = {
|
||||
# 'move_id': adj_move_id,
|
||||
# 'name': name,
|
||||
# 'partner_id': partner_id,
|
||||
# 'date': slip.date_from,
|
||||
# 'account_id': partner.property_account_payable.id,
|
||||
# 'debit': total_deduct,
|
||||
# 'quantity': 1,
|
||||
# 'credit': 0.0,
|
||||
# 'journal_id': slip.journal_id.id,
|
||||
# 'period_id': period_id,
|
||||
# 'ref': slip.number
|
||||
# }
|
||||
# line_ids += [movel_pool.create(cr, uid, cre_rec, context=context)]
|
||||
#
|
||||
# rec = {
|
||||
# 'state':'confirm',
|
||||
# 'move_line_ids':[(6, 0,line_ids)],
|
||||
# 'account_move_ids':[(6, 0, move_ids)]
|
||||
# }
|
||||
# if not slip.period_id:
|
||||
# rec['period_id'] = period_id
|
||||
#
|
||||
# exp_ids = exp_pool.search(cr, uid, [('date_valid','>=',slip.date_from), ('date_valid','<=',slip.date_to), ('state','=','invoiced')], context=context)
|
||||
# self.write(cr, uid, [slip.id], rec, context=context)
|
||||
# return True
|
||||
#
|
||||
#hr_payslip()
|
||||
|
||||
#TODO: remove, i don't think it's worth having that information on the payslip line rather than on the salary rule
|
||||
#class hr_payslip_line(osv.osv):
|
||||
@@ -454,6 +380,7 @@ 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,43 +2,7 @@
|
||||
<openerp>
|
||||
<data>
|
||||
|
||||
<record model="ir.ui.view" id="view_hr_payslip_line_inherit_tree">
|
||||
<field name="name">hr.payslip.line.inherit.tree</field>
|
||||
<field name="model">hr.payslip.line</field>
|
||||
<field name="inherit_id" ref="hr_payroll.view_hr_payslip_line_tree"/>
|
||||
<field name="type">tree</field>
|
||||
<field name="arch" type="xml">
|
||||
<field name="category_id" position="after">
|
||||
<field name="analytic_account_id"/>
|
||||
<field name="account_id" required="1"/>
|
||||
</field>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record model="ir.ui.view" id="view_hr_payslip_line_inherit_form">
|
||||
<field name="name">hr.payslip.line.inherit.form</field>
|
||||
<field name="model">hr.payslip.line</field>
|
||||
<field name="inherit_id" ref="hr_payroll.view_hr_payslip_line_form"/>
|
||||
<field name="type">form</field>
|
||||
<field name="arch" type="xml">
|
||||
<field name="company_contrib" position="before">
|
||||
<field name="analytic_account_id"/>
|
||||
<field name="account_id" required="1"/>
|
||||
</field>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<!-- <record model="ir.ui.view" id="view_hr_employee_grade_inherit_form">
|
||||
<field name="name">hr.employee.grade.inherit.form</field>
|
||||
<field name="model">hr.payroll.structure</field>
|
||||
<field name="inherit_id" ref="hr_payroll.view_hr_employee_grade_form"/>
|
||||
<field name="type">form</field>
|
||||
<field name="arch" type="xml">
|
||||
<xpath expr="/form/notebook/page[@string='Salary Structure']/field[@name='line_ids']/form/group/field[@name='company_contrib']" position="before">
|
||||
<field name="account_id" required="1"/>
|
||||
</xpath>
|
||||
</field>
|
||||
</record>-->
|
||||
|
||||
<record model="ir.ui.view" id="view_hr_payslip_inherit_form">
|
||||
<field name="name">hr.payslip.inherit.form</field>
|
||||
@@ -46,41 +10,10 @@
|
||||
<field name="inherit_id" ref="hr_payroll.view_hr_payslip_form"/>
|
||||
<field name="type">form</field>
|
||||
<field name="arch" type="xml">
|
||||
<field name="date_to" position="after">
|
||||
<field name="paid" position="after">
|
||||
<field name="period_id"/>
|
||||
<field name="journal_id" required="1"/>
|
||||
<field name="bank_journal_id" domain="[('type','=','cash')]" required="1"/>
|
||||
<field name="period_id" />
|
||||
</field>
|
||||
</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>
|
||||
<field name="type">form</field>
|
||||
<field name="inherit_id" ref="hr_payroll.view_hr_payslip_form"/>
|
||||
<field name="arch" type="xml">
|
||||
<xpath expr="/form/notebook/page[@string='Salary Computation']/field[@name='line_ids']/tree/field[@name='total']" position="after">
|
||||
<field name="account_id" required="1"/>
|
||||
<field name="analytic_account_id"/>
|
||||
</xpath>
|
||||
<xpath expr="/form/notebook/page[@string='Salary Computation']/field[@name='line_ids']/form/group/field[@name='company_contrib']" position="before">
|
||||
<field name="account_id" required="1"/>
|
||||
<field name="analytic_account_id"/>
|
||||
</xpath>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record model="ir.ui.view" id="hr_contibution_register_inherit_tree">
|
||||
<field name="name">hr.contribution.register.inherit.tree</field>
|
||||
<field name="model">hr.contribution.register</field>
|
||||
<field name="inherit_id" ref="hr_payroll.hr_contribution_register_tree"/>
|
||||
<field name="type">tree</field>
|
||||
<field name="arch" type="xml">
|
||||
<field name="name" position="after">
|
||||
<field name="yearly_total_by_emp"/>
|
||||
<field name="yearly_total_by_comp"/>
|
||||
<field name="move_id" readonly="1"/>
|
||||
</field>
|
||||
</field>
|
||||
</record>
|
||||
@@ -94,91 +27,11 @@
|
||||
<xpath expr="/form/notebook" position="before">
|
||||
<newline/>
|
||||
<field name="account_id" />
|
||||
<field name="analytic_account_id"/>
|
||||
<field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
|
||||
</xpath>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<!-- <record model="ir.ui.view" id="hr_contibution_register_inherit1_form">
|
||||
<field name="name">hr.contribution.register.inherit1.form</field>
|
||||
<field name="model">hr.contribution.register</field>
|
||||
<field name="inherit_id" ref="hr_payroll.hr_contribution_register_form"/>
|
||||
<field name="type">form</field>
|
||||
<field name="arch" type="xml">
|
||||
<xpath expr="/form/notebook" position="before">
|
||||
<group col="2" colspan="2">
|
||||
<newline/>
|
||||
<separator colspan="4" string="Year"/>
|
||||
<field name="yearly_total_by_emp"/>
|
||||
<field name="yearly_total_by_comp"/>
|
||||
</group>
|
||||
</xpath>
|
||||
</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>
|
||||
<field name="type">form</field>
|
||||
<field name="inherit_id" ref="hr_payroll.view_hr_payslip_form"/>
|
||||
<field name="arch" type="xml">
|
||||
<xpath expr="/form/notebook/page[@string='Other Information']" position="replace">
|
||||
<page string="Accounting Details">
|
||||
<group col="4" colspan="3">
|
||||
<separator colspan="4" string="Accounting Informations"/>
|
||||
<field name="move_ids" colspan="4" nolabel="1" readonly="1">
|
||||
<tree string="Accounting Vouchers">
|
||||
<field name="sequence"/>
|
||||
<field name="name"/>
|
||||
<field name="move_id"/>
|
||||
</tree>
|
||||
<form string="Accounting Vouchers">
|
||||
<field name="sequence"/>
|
||||
<field name="name"/>
|
||||
<field name="move_id"/>
|
||||
</form>
|
||||
</field>
|
||||
</group>
|
||||
<group col="2" colspan="1">
|
||||
<separator colspan="4" string="Other Information"/>
|
||||
<group col="5" colspan="2">
|
||||
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
|
||||
<newline/>
|
||||
<field name="paid" readonly="1"/>
|
||||
</group>
|
||||
</group>
|
||||
<separator colspan="4" string="Notes"/>
|
||||
<field name="note" colspan="4" nolabel="1"/>
|
||||
</page>
|
||||
<page string="Account Lines">
|
||||
<field name="move_line_ids" colspan="4" nolabel="1"/>
|
||||
</page>
|
||||
<page string="Payment Lines">
|
||||
<field name="move_payment_ids" colspan="4" nolabel="1"/>
|
||||
</page>
|
||||
<page string="Accounting Entries">
|
||||
<field name="account_move_ids" colspan="4" nolabel="1"/>
|
||||
</page>
|
||||
</xpath>
|
||||
</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>
|
||||
|
||||
<!-- Adding Account fields to the Salary Rules -->
|
||||
|
||||
<record id="hr_salary_rule_form_inherit" model="ir.ui.view">
|
||||
@@ -188,9 +41,10 @@
|
||||
<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"/>
|
||||
<field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
|
||||
<field name="account_tax_id"/>
|
||||
</page>
|
||||
</xpath>
|
||||
@@ -207,7 +61,7 @@
|
||||
<field name="arch" type="xml">
|
||||
<xpath expr="/form/notebook/page/group/field[@name='advantages']" position="after">
|
||||
<separator colspan="4" string="Accounting"/>
|
||||
<field name="analytic_account_id"/>
|
||||
<field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
|
||||
<field name="journal_id"/>
|
||||
</xpath>
|
||||
</field>
|
||||
|
||||
Reference in New Issue
Block a user