[MERGE] rename hr_payroll_l10n_be -> l10n_be_hr_payroll + cleanup

bzr revid: odo@openerp.com-20110919235514-kkroiulcemrbfe03
This commit is contained in:
Olivier Dony 2011-09-20 01:55:14 +02:00
commit b644175924
8 changed files with 17 additions and 32 deletions

View File

@ -1,8 +1,8 @@
# -*- encoding: utf-8 -*- # -*- encoding: utf-8 -*-
############################################################################## ##############################################################################
# #
# OpenERP, Open Source Management Solution # OpenERP, Open Source Management Solution
# Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). # Copyright (C) 2011 OpenERP SA (<http://openerp.com>).
# #
# This program is free software: you can redistribute it and/or modify # This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as # it under the terms of the GNU Affero General Public License as
@ -15,9 +15,7 @@
# GNU Affero General Public License for more details. # GNU Affero General Public License for more details.
# #
# You should have received a copy of the GNU Affero General Public License # You should have received a copy of the GNU Affero General Public License
# 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 hr_payroll_l10n_be import l10n_be_hr_payroll
import hr_contract
import hr_payroll

View File

@ -1,8 +1,8 @@
# -*- encoding: utf-8 -*- # -*- encoding: utf-8 -*-
############################################################################## ##############################################################################
# #
# OpenERP, Open Source Management Solution # OpenERP, Open Source Management Solution
# Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). # Copyright (C) 2011 OpenERP SA (<http://openerp.com>).
# #
# This program is free software: you can redistribute it and/or modify # This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as # it under the terms of the GNU Affero General Public License as
@ -15,19 +15,18 @@
# GNU Affero General Public License for more details. # GNU Affero General Public License for more details.
# #
# You should have received a copy of the GNU Affero General Public License # You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
# #
############################################################################## ##############################################################################
{ {
'name': 'hr_payroll_l10n_be', 'name': 'Belgian Payroll Rules',
'category': 'payroll', 'category': 'payroll',
'init_xml':[], 'author': 'OpenERP SA',
'author': 'OpenERP',
'depends': ['hr_payroll','hr_contract'], 'depends': ['hr_payroll','hr_contract'],
'version': '1.0', 'version': '1.0',
'description': """ 'description': """
Belgian Payroll system. Belgian Payroll Rules
======================= =====================
* Employee Details * Employee Details
* Employee Contracts * Employee Contracts
@ -41,12 +40,12 @@ Belgian Payroll system.
""", """,
'active': False, 'active': False,
'demo_xml': [ 'demo': [
'hr_payroll_l10n_be_demo.xml', 'l10n_be_hr_payroll_demo.xml',
], ],
'update_xml':[ 'data':[
'hr_payroll_l10n_be_view.xml', 'l10n_be_hr_payroll_view.xml',
'hr_payroll_l10n_be_data.xml', 'l10n_be_hr_payroll_data.xml',
'data/hr.salary.rule.csv', 'data/hr.salary.rule.csv',
], ],
'installable': True 'installable': True

View File

@ -2,8 +2,7 @@
############################################################################## ##############################################################################
# #
# OpenERP, Open Source Management Solution # OpenERP, Open Source Management Solution
# Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved # Copyright (C) 2011 OpenERP SA (<http://openerp.com>). All Rights Reserved
# d$
# #
# This program is free software: you can redistribute it and/or modify # This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by # it under the terms of the GNU Affero General Public License as published by
@ -20,18 +19,7 @@
# #
############################################################################## ##############################################################################
import time
from datetime import date
from datetime import datetime
from datetime import timedelta
import netsvc
from osv import fields, osv from osv import fields, osv
import tools
from tools.translate import _
import decimal_precision as dp
class hr_contract_be(osv.osv): class hr_contract_be(osv.osv):
_inherit = 'hr.contract' _inherit = 'hr.contract'