[REF]hr_payroll, hr_payroll_account: code cleaning.
bzr revid: vra@tinyerp.com-20101015055414-d5p5lchgh3t1e7n8
This commit is contained in:
parent
0820c466f1
commit
90e27fd366
|
@ -312,7 +312,6 @@ class hr_contract(osv.osv):
|
||||||
|
|
||||||
_inherit = 'hr.contract'
|
_inherit = 'hr.contract'
|
||||||
_description = 'Employee Contract'
|
_description = 'Employee Contract'
|
||||||
|
|
||||||
_columns = {
|
_columns = {
|
||||||
'permit_no':fields.char('Work Permit No', size=256, required=False, readonly=False),
|
'permit_no':fields.char('Work Permit No', size=256, required=False, readonly=False),
|
||||||
'passport_id':fields.many2one('hr.passport', 'Passport', required=False),
|
'passport_id':fields.many2one('hr.passport', 'Passport', required=False),
|
||||||
|
@ -335,6 +334,7 @@ class payroll_register(osv.osv):
|
||||||
"""
|
"""
|
||||||
Payroll Register
|
Payroll Register
|
||||||
"""
|
"""
|
||||||
|
|
||||||
_name = 'hr.payroll.register'
|
_name = 'hr.payroll.register'
|
||||||
_description = 'Payroll Register'
|
_description = 'Payroll Register'
|
||||||
|
|
||||||
|
@ -495,9 +495,9 @@ class payroll_advice(osv.osv):
|
||||||
'''
|
'''
|
||||||
Bank Advice Note
|
Bank Advice Note
|
||||||
'''
|
'''
|
||||||
|
|
||||||
_name = 'hr.payroll.advice'
|
_name = 'hr.payroll.advice'
|
||||||
_description = 'Bank Advice Note'
|
_description = 'Bank Advice Note'
|
||||||
|
|
||||||
_columns = {
|
_columns = {
|
||||||
'register_id':fields.many2one('hr.payroll.register', 'Payroll Register', required=False),
|
'register_id':fields.many2one('hr.payroll.register', 'Payroll Register', required=False),
|
||||||
'name':fields.char('Name', size=2048, required=True, readonly=False),
|
'name':fields.char('Name', size=2048, required=True, readonly=False),
|
||||||
|
@ -557,9 +557,9 @@ class payroll_advice_line(osv.osv):
|
||||||
'''
|
'''
|
||||||
Bank Advice Lines
|
Bank Advice Lines
|
||||||
'''
|
'''
|
||||||
|
|
||||||
_name = 'hr.payroll.advice.line'
|
_name = 'hr.payroll.advice.line'
|
||||||
_description = 'Bank Advice Lines'
|
_description = 'Bank Advice Lines'
|
||||||
|
|
||||||
_columns = {
|
_columns = {
|
||||||
'advice_id':fields.many2one('hr.payroll.advice', 'Bank Advice', required=False),
|
'advice_id':fields.many2one('hr.payroll.advice', 'Bank Advice', required=False),
|
||||||
'name':fields.char('Bank Account A/C', size=64, required=True, readonly=False),
|
'name':fields.char('Bank Account A/C', size=64, required=True, readonly=False),
|
||||||
|
@ -595,6 +595,7 @@ class contrib_register(osv.osv):
|
||||||
'''
|
'''
|
||||||
Contribution Register
|
Contribution Register
|
||||||
'''
|
'''
|
||||||
|
|
||||||
_name = 'hr.contibution.register'
|
_name = 'hr.contibution.register'
|
||||||
_description = 'Contribution Register'
|
_description = 'Contribution Register'
|
||||||
|
|
||||||
|
@ -634,6 +635,7 @@ class contrib_register_line(osv.osv):
|
||||||
'''
|
'''
|
||||||
Contribution Register Line
|
Contribution Register Line
|
||||||
'''
|
'''
|
||||||
|
|
||||||
_name = 'hr.contibution.register.line'
|
_name = 'hr.contibution.register.line'
|
||||||
_description = 'Contribution Register Line'
|
_description = 'Contribution Register Line'
|
||||||
|
|
||||||
|
@ -669,7 +671,6 @@ class payment_category(osv.osv):
|
||||||
|
|
||||||
_name = 'hr.allounce.deduction.categoty'
|
_name = 'hr.allounce.deduction.categoty'
|
||||||
_description = 'Allowance Deduction Heads'
|
_description = 'Allowance Deduction Heads'
|
||||||
|
|
||||||
_columns = {
|
_columns = {
|
||||||
'name':fields.char('Categoty Name', size=64, required=True, readonly=False),
|
'name':fields.char('Categoty Name', size=64, required=True, readonly=False),
|
||||||
'code':fields.char('Categoty Code', size=64, required=True, readonly=False),
|
'code':fields.char('Categoty Code', size=64, required=True, readonly=False),
|
||||||
|
@ -710,7 +711,6 @@ class company_contribution(osv.osv):
|
||||||
|
|
||||||
_name = 'company.contribution'
|
_name = 'company.contribution'
|
||||||
_description = "Company Contribution"
|
_description = "Company Contribution"
|
||||||
|
|
||||||
_columns = {
|
_columns = {
|
||||||
'category_id':fields.many2one('hr.allounce.deduction.categoty', 'Heads', required=False),
|
'category_id':fields.many2one('hr.allounce.deduction.categoty', 'Heads', required=False),
|
||||||
'name':fields.char('Name', size=256, required=True, readonly=False),
|
'name':fields.char('Name', size=256, required=True, readonly=False),
|
||||||
|
@ -784,7 +784,6 @@ class company_contribution_line(osv.osv):
|
||||||
_name = 'company.contribution.line'
|
_name = 'company.contribution.line'
|
||||||
_description = 'Allowance Deduction Categoty'
|
_description = 'Allowance Deduction Categoty'
|
||||||
_order = 'sequence'
|
_order = 'sequence'
|
||||||
|
|
||||||
_columns = {
|
_columns = {
|
||||||
'contribution_id':fields.many2one('company.contribution', 'Contribution', required=False),
|
'contribution_id':fields.many2one('company.contribution', 'Contribution', required=False),
|
||||||
'name':fields.char('Name', size=64, required=False, readonly=False),
|
'name':fields.char('Name', size=64, required=False, readonly=False),
|
||||||
|
@ -799,8 +798,8 @@ class company_contribution_line(osv.osv):
|
||||||
company_contribution_line()
|
company_contribution_line()
|
||||||
|
|
||||||
class hr_holidays_status(osv.osv):
|
class hr_holidays_status(osv.osv):
|
||||||
_inherit = "hr.holidays.status"
|
|
||||||
|
|
||||||
|
_inherit = "hr.holidays.status"
|
||||||
_columns = {
|
_columns = {
|
||||||
'company_id':fields.many2one('res.company', 'Company', required=False),
|
'company_id':fields.many2one('res.company', 'Company', required=False),
|
||||||
'type':fields.selection([
|
'type':fields.selection([
|
||||||
|
@ -824,6 +823,7 @@ class hr_payslip(osv.osv):
|
||||||
'''
|
'''
|
||||||
Pay Slip
|
Pay Slip
|
||||||
'''
|
'''
|
||||||
|
|
||||||
_name = 'hr.payslip'
|
_name = 'hr.payslip'
|
||||||
_description = 'Pay Slip'
|
_description = 'Pay Slip'
|
||||||
|
|
||||||
|
@ -1315,6 +1315,7 @@ class hr_payslip_line(osv.osv):
|
||||||
'''
|
'''
|
||||||
Payslip Line
|
Payslip Line
|
||||||
'''
|
'''
|
||||||
|
|
||||||
_name = 'hr.payslip.line'
|
_name = 'hr.payslip.line'
|
||||||
_description = 'Payslip Line'
|
_description = 'Payslip Line'
|
||||||
|
|
||||||
|
@ -1396,10 +1397,10 @@ class hr_payslip_line_line(osv.osv):
|
||||||
'''
|
'''
|
||||||
Function Line
|
Function Line
|
||||||
'''
|
'''
|
||||||
|
|
||||||
_name = 'hr.payslip.line.line'
|
_name = 'hr.payslip.line.line'
|
||||||
_description = 'Function Line'
|
_description = 'Function Line'
|
||||||
_order = 'sequence'
|
_order = 'sequence'
|
||||||
|
|
||||||
_columns = {
|
_columns = {
|
||||||
'slipline_id':fields.many2one('hr.payslip.line', 'Slip Line', required=False),
|
'slipline_id':fields.many2one('hr.payslip.line', 'Slip Line', required=False),
|
||||||
'name':fields.char('Name', size=64, required=False, readonly=False),
|
'name':fields.char('Name', size=64, required=False, readonly=False),
|
||||||
|
@ -1417,6 +1418,7 @@ class hr_employee(osv.osv):
|
||||||
'''
|
'''
|
||||||
Employee
|
Employee
|
||||||
'''
|
'''
|
||||||
|
|
||||||
_inherit = 'hr.employee'
|
_inherit = 'hr.employee'
|
||||||
_description = 'Employee'
|
_description = 'Employee'
|
||||||
|
|
||||||
|
|
|
@ -21,3 +21,5 @@
|
||||||
##############################################################################
|
##############################################################################
|
||||||
|
|
||||||
import hr_payroll_account
|
import hr_payroll_account
|
||||||
|
|
||||||
|
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
|
@ -46,3 +46,5 @@
|
||||||
'installable': True,
|
'installable': True,
|
||||||
'active': False,
|
'active': False,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
|
@ -19,7 +19,6 @@
|
||||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
#
|
#
|
||||||
##############################################################################
|
##############################################################################
|
||||||
|
|
||||||
import time
|
import time
|
||||||
import netsvc
|
import netsvc
|
||||||
from datetime import date, datetime, timedelta
|
from datetime import date, datetime, timedelta
|
||||||
|
@ -28,8 +27,6 @@ from osv import fields, osv
|
||||||
from tools import config
|
from tools import config
|
||||||
from tools.translate import _
|
from tools.translate import _
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
def prev_bounds(cdate=False):
|
def prev_bounds(cdate=False):
|
||||||
when = date.fromtimestamp(time.mktime(time.strptime(cdate,"%Y-%m-%d")))
|
when = date.fromtimestamp(time.mktime(time.strptime(cdate,"%Y-%m-%d")))
|
||||||
this_first = date(when.year, when.month, 1)
|
this_first = date(when.year, when.month, 1)
|
||||||
|
@ -669,3 +666,4 @@ class account_move_link_slip(osv.osv):
|
||||||
}
|
}
|
||||||
account_move_link_slip()
|
account_move_link_slip()
|
||||||
|
|
||||||
|
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
|
@ -253,6 +253,5 @@
|
||||||
</notebook>
|
</notebook>
|
||||||
</field>
|
</field>
|
||||||
</record>
|
</record>
|
||||||
|
|
||||||
</data>
|
</data>
|
||||||
</openerp>
|
</openerp>
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<openerp>
|
<openerp>
|
||||||
<data>
|
<data>
|
||||||
|
|
||||||
<record id="act_account_check" model="workflow.activity">
|
<record id="act_account_check" model="workflow.activity">
|
||||||
<field name="wkf_id" ref="hr_payroll.wkf"/>
|
<field name="wkf_id" ref="hr_payroll.wkf"/>
|
||||||
<field name="name">account_check</field>
|
<field name="name">account_check</field>
|
||||||
|
@ -28,6 +27,5 @@
|
||||||
<field name="act_to" ref="hr_payroll.act_cancel"/>
|
<field name="act_to" ref="hr_payroll.act_cancel"/>
|
||||||
<field name="signal">cancel_sheet</field>
|
<field name="signal">cancel_sheet</field>
|
||||||
</record>
|
</record>
|
||||||
|
|
||||||
</data>
|
</data>
|
||||||
</openerp>
|
</openerp>
|
||||||
|
|
Loading…
Reference in New Issue