← Back to team overview

clearcorp team mailing list archive

[Merge] lp:~rr.clearcorp/openerp-ccorp-addons/6.1-cic_payroll into lp:openerp-ccorp-addons

 

Ronald Rubi has proposed merging lp:~rr.clearcorp/openerp-ccorp-addons/6.1-cic_payroll into lp:openerp-ccorp-addons.

Requested reviews:
  CLEARCORP drivers (clearcorp-drivers)

For more details, see:
https://code.launchpad.net/~rr.clearcorp/openerp-ccorp-addons/6.1-cic_payroll/+merge/125557

[RMV] Translate module cic_payroll to custom addons
-- 
https://code.launchpad.net/~rr.clearcorp/openerp-ccorp-addons/6.1-cic_payroll/+merge/125557
Your team CLEARCORP development team is subscribed to branch lp:openerp-ccorp-addons.
=== removed directory 'cic_payroll'
=== removed file 'cic_payroll/__init__.py'
--- cic_payroll/__init__.py	2012-09-06 21:27:24 +0000
+++ cic_payroll/__init__.py	1970-01-01 00:00:00 +0000
@@ -1,22 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Addons modules by CLEARCORP S.A.
-#    Copyright (C) 2009-TODAY CLEARCORP S.A. (<http://clearcorp.co.cr>).
-#
-#    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 the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    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/>.
-#
-##############################################################################
-import cic_payroll

=== removed file 'cic_payroll/__openerp__.py'
--- cic_payroll/__openerp__.py	2012-09-06 21:27:24 +0000
+++ cic_payroll/__openerp__.py	1970-01-01 00:00:00 +0000
@@ -1,42 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Addons modules by CLEARCORP S.A.
-#    Copyright (C) 2009-TODAY CLEARCORP S.A. (<http://clearcorp.co.cr>).
-#
-#    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 the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    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/>.
-#
-##############################################################################
-{
-    'name': 'CIC Payroll',
-    'version': '1.0',
-    'url': 'http://launchpad.net/openerp-ccorp-addons',
-    'author': 'ClearCorp S.A.',
-    'website': 'http://clearcorp.co.cr',
-    'category': 'Human Resources',
-    'complexity': 'easy',
-    'description': """This module is to custom payroll to cic
-    """,
-    'depends': [
-        'hr_contract',
-        'l10n_cr_hr_payroll'
-    ],
-    'init_xml': [],
-    'demo_xml': [],
-    'update_xml': [],
-    'license': 'AGPL-3',
-    'installable': True,
-    'active': False,
-}

=== removed file 'cic_payroll/cic_payroll.py'
--- cic_payroll/cic_payroll.py	2012-09-06 21:27:24 +0000
+++ cic_payroll/cic_payroll.py	1970-01-01 00:00:00 +0000
@@ -1,46 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Addons modules by CLEARCORP S.A.
-#    Copyright (C) 2009-TODAY CLEARCORP S.A. (<http://clearcorp.co.cr>).
-#
-#    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 the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    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/>.
-#
-##############################################################################
-
-import netsvc
-from osv import fields, osv
-import tools
-from tools.translate import _
-
-class HrContract(osv.osv):
-
-    _inherit = 'hr.contract'
-    _description = 'Employee Contract'
-    _columns = {
-        'schedule_pay': fields.selection([
-            ('monthly', 'Monthly'),
-            ('weekly', 'Weekly'),
-            ], 'Scheduled Pay', select=True),
-    }
-
-class HrPayslipRun(osv.osv):
-    _inherit = 'hr.payslip.run'
-    _columns = {
-        'schedule_pay': fields.selection([
-            ('monthly', 'Monthly'),
-            ('weekly', 'Weekly'),
-            ], 'Scheduled Pay', select=True, readonly=True, states={'draft': [('readonly', False)]}),
-    }

=== removed directory 'cic_payroll/i18n'
=== removed file 'cic_payroll/i18n/cic_payroll.pot'
--- cic_payroll/i18n/cic_payroll.pot	2012-09-06 21:27:24 +0000
+++ cic_payroll/i18n/cic_payroll.pot	1970-01-01 00:00:00 +0000
@@ -1,32 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* cic_payroll
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.1\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-06 21:19+0000\n"
-"PO-Revision-Date: 2012-09-06 21:19+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-
-#. module: cic_payroll
-#: model:ir.model,name:cic_payroll.model_hr_payslip_run
-msgid "Payslip Batches"
-msgstr ""
-
-#. module: cic_payroll
-#: constraint:hr.contract:0
-msgid "Error! contract start-date must be lower then contract end-date."
-msgstr ""
-
-#. module: cic_payroll
-#: model:ir.model,name:cic_payroll.model_hr_contract
-msgid "Contract"
-msgstr ""
-

=== removed symlink 'cic_payroll/i18n/es.po'
=== target was u'es_CR.po'
=== removed file 'cic_payroll/i18n/es_CR.po'
--- cic_payroll/i18n/es_CR.po	2012-09-06 21:27:24 +0000
+++ cic_payroll/i18n/es_CR.po	1970-01-01 00:00:00 +0000
@@ -1,32 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* cic_payroll
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.1\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-06 21:19+0000\n"
-"PO-Revision-Date: 2012-09-06 21:19+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-
-#. module: cic_payroll
-#: model:ir.model,name:cic_payroll.model_hr_payslip_run
-msgid "Payslip Batches"
-msgstr "Lotes de Nóminas"
-
-#. module: cic_payroll
-#: constraint:hr.contract:0
-msgid "Error! contract start-date must be lower then contract end-date."
-msgstr "¡Error! La fecha de inicio de contrato debe ser menor que la fecha de finalización."
-
-#. module: cic_payroll
-#: model:ir.model,name:cic_payroll.model_hr_contract
-msgid "Contract"
-msgstr "Contrato"
-


Follow ups