Lorenzo Battistini - agilebg.com has proposed merging lp:~openobject-italia-core-devs/openobject-italia/adding_l10n_it_hr into lp:openobject-italia.
Requested reviews: OpenERP Italia core devs (openobject-italia-core-devs) Related bugs: Bug #781032 in OpenERP Italia: "l10n_it_sale dipende da hr" https://bugs.launchpad.net/openobject-italia/+bug/781032 For more details, see: https://code.launchpad.net/~openobject-italia-core-devs/openobject-italia/adding_l10n_it_hr/+merge/60830 fix di https://bugs.launchpad.net/openobject-italia/+bug/781032 -- https://code.launchpad.net/~openobject-italia-core-devs/openobject-italia/adding_l10n_it_hr/+merge/60830 Your team OpenERP Italia core devs is requested to review the proposed merge of lp:~openobject-italia-core-devs/openobject-italia/adding_l10n_it_hr into lp:openobject-italia.
=== added directory 'l10n_it_hr' === added file 'l10n_it_hr/AUTHORS.txt' --- l10n_it_hr/AUTHORS.txt 1970-01-01 00:00:00 +0000 +++ l10n_it_hr/AUTHORS.txt 2011-05-12 20:24:31 +0000 @@ -0,0 +1,2 @@ +Lorenzo Battistini <[email protected]> + === added file 'l10n_it_hr/__init__.py' --- l10n_it_hr/__init__.py 1970-01-01 00:00:00 +0000 +++ l10n_it_hr/__init__.py 2011-05-12 20:24:31 +0000 @@ -0,0 +1,23 @@ +# -*- encoding: utf-8 -*- +############################################################################## +# +# Copyright (C) 2010 OpenERP Italian Community (<http://www.openerp-italia.org>). +# All Rights Reserved +# $Id$ +# +# 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 General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# +############################################################################## + +import employee === added file 'l10n_it_hr/__openerp__.py' --- l10n_it_hr/__openerp__.py 1970-01-01 00:00:00 +0000 +++ l10n_it_hr/__openerp__.py 2011-05-12 20:24:31 +0000 @@ -0,0 +1,47 @@ +# -*- encoding: utf-8 -*- +############################################################################## +# +# Copyright (C) 2010 OpenERP Italian Community (<http://www.openerp-italia.org>). +# All Rights Reserved +# $Id$ +# +# 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 General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# +############################################################################## +{ + 'name': 'Italian Localisation - Sale', + 'version': '0.2', + 'category': 'Localisation/Italy', + 'description': """OpenERP Italian Localization - HR version + +Functionalities: + +- Fiscal Code for employee + +""", + 'author': 'OpenERP Italian Community', + 'website': 'http://www.openerp-italia.org', + 'license': 'AGPL-3', + "depends" : ['hr'], + "init_xml" : [ + ], + "update_xml" : [ + 'employee_view.xml', + ], + "demo_xml" : [], + "active": False, + "installable": True +} +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: + === added file 'l10n_it_hr/employee.py' --- l10n_it_hr/employee.py 1970-01-01 00:00:00 +0000 +++ l10n_it_hr/employee.py 2011-05-12 20:24:31 +0000 @@ -0,0 +1,10 @@ + +from osv import osv +from osv import fields + +class hr_employee(osv.osv): + _inherit = 'hr.employee' + _columns = { + 'fiscalcode': fields.char('Fiscal Code', size=16, help="Italian Fiscal Code"), + } +hr_employee() === added file 'l10n_it_hr/employee_view.xml' --- l10n_it_hr/employee_view.xml 1970-01-01 00:00:00 +0000 +++ l10n_it_hr/employee_view.xml 2011-05-12 20:24:31 +0000 @@ -0,0 +1,17 @@ +<?xml version="1.0" ?> +<openerp> + <data> + + <record id="view_employee_form_fiscalcode" model="ir.ui.view"> + <field name="name">hr.employee.form.fiscalcode</field> + <field name="model">hr.employee</field> + <field name="inherit_id" ref="hr.view_employee_form"/> + <field name="arch" type="xml"> + <field name="passport_id" position="after"> + <field name="fiscalcode"/> + </field> + </field> + </record> + + </data> +</openerp> === added directory 'l10n_it_hr/i18n' === added file 'l10n_it_hr/i18n/it.po' --- l10n_it_hr/i18n/it.po 1970-01-01 00:00:00 +0000 +++ l10n_it_hr/i18n/it.po 2011-05-12 20:24:31 +0000 @@ -0,0 +1,64 @@ +# Translation of OpenERP Server. +# This file contains the translation of the following modules: +# * l10n_it_hr +# +msgid "" +msgstr "" +"Project-Id-Version: OpenERP Server 6.0.2\n" +"Report-Msgid-Bugs-To: [email protected]\n" +"POT-Creation-Date: 2011-05-12 20:06+0000\n" +"PO-Revision-Date: 2011-05-12 22:07+0100\n" +"Last-Translator: Lorenzo Battistini <[email protected]>\n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: \n" + +#. module: l10n_it_hr +#: model:ir.module.module,description:l10n_it_hr.module_meta_information +msgid "" +"OpenERP Italian Localization - HR version\n" +"\n" +"Functionalities:\n" +"\n" +"- Fiscal Code for employee\n" +"\n" +msgstr "" +"Localizzazione Italiana - Versione Risorse Umane\n" +"\n" +"Funzionalità :\n" +"\n" +"- Codice fiscale per i dipendenti\n" +"\n" + +#. module: l10n_it_hr +#: model:ir.module.module,shortdesc:l10n_it_hr.module_meta_information +msgid "Italian Localisation - Sale" +msgstr "Localizzazione Italiana - Vendite" + +#. module: l10n_it_hr +#: constraint:hr.employee:0 +msgid "Error ! You cannot select a department for which the employee is the manager." +msgstr "Errore ! Non è possibile selezionare un dipartimento di cui il dipendente è manager." + +#. module: l10n_it_hr +#: help:hr.employee,fiscalcode:0 +msgid "Italian Fiscal Code" +msgstr "Codice fiscale italiano" + +#. module: l10n_it_hr +#: field:hr.employee,fiscalcode:0 +msgid "Fiscal Code" +msgstr "Codice fiscale" + +#. module: l10n_it_hr +#: model:ir.model,name:l10n_it_hr.model_hr_employee +msgid "Employee" +msgstr "Dipendente" + +#. module: l10n_it_hr +#: constraint:hr.employee:0 +msgid "Error ! You cannot create recursive Hierarchy of Employees." +msgstr "Errore ! Non è possibile creare una gerarchia ricorsiva di dipendenti" + === added file 'l10n_it_hr/i18n/l10n_it_hr.pot' --- l10n_it_hr/i18n/l10n_it_hr.pot 1970-01-01 00:00:00 +0000 +++ l10n_it_hr/i18n/l10n_it_hr.pot 2011-05-12 20:24:31 +0000 @@ -0,0 +1,58 @@ +# Translation of OpenERP Server. +# This file contains the translation of the following modules: +# * l10n_it_hr +# +msgid "" +msgstr "" +"Project-Id-Version: OpenERP Server 6.0.2\n" +"Report-Msgid-Bugs-To: [email protected]\n" +"POT-Creation-Date: 2011-05-12 20:05+0000\n" +"PO-Revision-Date: 2011-05-12 20:05+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: l10n_it_hr +#: model:ir.module.module,description:l10n_it_hr.module_meta_information +msgid "OpenERP Italian Localization - HR version\n" +"\n" +"Functionalities:\n" +"\n" +"- Fiscal Code for employee\n" +"\n" +"" +msgstr "" + +#. module: l10n_it_hr +#: model:ir.module.module,shortdesc:l10n_it_hr.module_meta_information +msgid "Italian Localisation - Sale" +msgstr "" + +#. module: l10n_it_hr +#: constraint:hr.employee:0 +msgid "Error ! You cannot select a department for which the employee is the manager." +msgstr "" + +#. module: l10n_it_hr +#: help:hr.employee,fiscalcode:0 +msgid "Italian Fiscal Code" +msgstr "" + +#. module: l10n_it_hr +#: field:hr.employee,fiscalcode:0 +msgid "Fiscal Code" +msgstr "" + +#. module: l10n_it_hr +#: model:ir.model,name:l10n_it_hr.model_hr_employee +msgid "Employee" +msgstr "" + +#. module: l10n_it_hr +#: constraint:hr.employee:0 +msgid "Error ! You cannot create recursive Hierarchy of Employees." +msgstr "" + === modified file 'l10n_it_sale/__init__.py' --- l10n_it_sale/__init__.py 2011-05-06 13:07:22 +0000 +++ l10n_it_sale/__init__.py 2011-05-12 20:24:31 +0000 @@ -22,7 +22,6 @@ import sale import stock -import hr import account import partner import wizard === modified file 'l10n_it_sale/__openerp__.py' --- l10n_it_sale/__openerp__.py 2011-05-06 13:07:22 +0000 +++ l10n_it_sale/__openerp__.py 2011-05-12 20:24:31 +0000 @@ -23,18 +23,17 @@ 'name': 'Italian Localisation - Sale', 'version': '0.2', 'category': 'Localisation/Italy', - 'description': """This module customizes OpenERP in order to fit italian laws and mores - Sale version + 'description': """OpenERP Italian Localization - Sale version Functionalities: - Documento di trasporto -- Fiscal Code for employee """, 'author': 'OpenERP Italian Community', 'website': 'http://www.openerp-italia.org', 'license': 'AGPL-3', - "depends" : ['stock','sale','hr','account', 'delivery'], + "depends" : ['stock', 'sale', 'account', 'delivery'], "init_xml" : [ ], "update_xml" : [ @@ -49,7 +48,6 @@ 'stock/sequence.xml', 'sale/sale_view.xml', "security/ir.model.access.csv", - 'hr/employee_view.xml', 'partner/partner_view.xml', 'account/invoice_view.xml', ], === removed directory 'l10n_it_sale/hr' === removed file 'l10n_it_sale/hr/__init__.py' --- l10n_it_sale/hr/__init__.py 2010-11-17 08:04:13 +0000 +++ l10n_it_sale/hr/__init__.py 1970-01-01 00:00:00 +0000 @@ -1,23 +0,0 @@ -# -*- encoding: utf-8 -*- -############################################################################## -# -# Copyright (C) 2010 OpenERP Italian Community (<http://www.openerp-italia.org>). -# All Rights Reserved -# $Id$ -# -# 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 General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. -# -############################################################################## - -import employee === removed file 'l10n_it_sale/hr/employee.py' --- l10n_it_sale/hr/employee.py 2010-09-22 13:43:42 +0000 +++ l10n_it_sale/hr/employee.py 1970-01-01 00:00:00 +0000 @@ -1,10 +0,0 @@ - -from osv import osv -from osv import fields - -class hr_employee(osv.osv): - _inherit = 'hr.employee' - _columns = { - 'fiscalcode': fields.char('Fiscal Code', size=16, help="Italian Fiscal Code"), - } -hr_employee() === removed file 'l10n_it_sale/hr/employee_view.xml' --- l10n_it_sale/hr/employee_view.xml 2010-11-01 18:56:36 +0000 +++ l10n_it_sale/hr/employee_view.xml 1970-01-01 00:00:00 +0000 @@ -1,17 +0,0 @@ -<?xml version="1.0" ?> -<openerp> - <data> - - <record id="view_employee_form_fiscalcode" model="ir.ui.view"> - <field name="name">hr.employee.form.fiscalcode</field> - <field name="model">hr.employee</field> - <field name="inherit_id" ref="hr.view_employee_form"/> - <field name="arch" type="xml"> - <field name="passport_id" position="after"> - <field name="fiscalcode"/> - </field> - </field> - </record> - - </data> -</openerp> === modified file 'l10n_it_sale/i18n/it.po' --- l10n_it_sale/i18n/it.po 2011-05-06 13:54:43 +0000 +++ l10n_it_sale/i18n/it.po 2011-05-12 20:24:31 +0000 @@ -6,9 +6,9 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0.2\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2011-05-06 13:50+0000\n" -"PO-Revision-Date: 2011-05-06 15:54+0100\n" -"Last-Translator: eLBati <[email protected]>\n" +"POT-Creation-Date: 2011-05-12 20:12+0000\n" +"PO-Revision-Date: 2011-05-12 22:18+0100\n" +"Last-Translator: Lorenzo Battistini <[email protected]>\n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -23,25 +23,6 @@ msgstr "Aspetto dei Beni" #. module: l10n_it_sale -#: model:ir.module.module,description:l10n_it_sale.module_meta_information -msgid "" -"This module customizes OpenERP in order to fit italian laws and mores - Sale version\n" -"\n" -"Functionalities:\n" -"\n" -"- Documento di trasporto\n" -"- Fiscal Code for employee\n" -"\n" -msgstr "" -"Localizzazione Italiana - Versione Sale\n" -"\n" -"Funzionalità :\n" -"\n" -"- Documento di trasporto\n" -"- Codice fiscale per l'impiegato\n" -"\n" - -#. module: l10n_it_sale #: field:stock.picking.carriage_condition,note:0 #: field:stock.picking.goods_description,note:0 #: field:stock.picking.transportation_reason,note:0 @@ -49,9 +30,11 @@ msgstr "Note" #. module: l10n_it_sale -#: field:hr.employee,fiscalcode:0 -msgid "Fiscal Code" -msgstr "Codice fiscale" +#: model:ir.actions.act_window,name:l10n_it_sale.action_transportation_reason_tree +#: model:ir.ui.menu,name:l10n_it_sale.menu_action_transportation_reason_tree +#: view:stock.picking.transportation_reason:0 +msgid "Reasons for transportation" +msgstr "Causale del trasporto" #. module: l10n_it_sale #: model:ir.model,name:l10n_it_sale.model_stock_picking @@ -59,11 +42,6 @@ msgstr "Picking List" #. module: l10n_it_sale -#: model:ir.model,name:l10n_it_sale.model_hr_employee -msgid "Employee" -msgstr "Dipendente" - -#. module: l10n_it_sale #: model:ir.actions.act_window,name:l10n_it_sale.action_wizard_assign_ddt #: view:stock.picking:0 #: view:wizard.assign.ddt:0 @@ -86,11 +64,6 @@ msgstr "Validità " #. module: l10n_it_sale -#: constraint:hr.employee:0 -msgid "Error ! You cannot create recursive Hierarchy of Employees." -msgstr "Errore ! Non è possibile creare una gerarchia ricorsiva di dipendenti" - -#. module: l10n_it_sale #: model:ir.model,name:l10n_it_sale.model_wizard_assign_ddt msgid "wizard.assign.ddt" msgstr "wizard.assign.ddt" @@ -101,11 +74,6 @@ msgstr "Note" #. module: l10n_it_sale -#: constraint:hr.employee:0 -msgid "Error ! You cannot select a department for which the employee is the manager." -msgstr "Errore ! Non è possibile selezionare un dipartimento di cui il dipendente è manager." - -#. module: l10n_it_sale #: view:account.invoice:0 msgid "Shipping" msgstr "Trasporto" @@ -177,13 +145,6 @@ msgstr "Aspetto dei Beni" #. module: l10n_it_sale -#: model:ir.actions.act_window,name:l10n_it_sale.action_transportation_reason_tree -#: model:ir.ui.menu,name:l10n_it_sale.menu_action_transportation_reason_tree -#: view:stock.picking.transportation_reason:0 -msgid "Reasons for transportation" -msgstr "Causale del trasporto" - -#. module: l10n_it_sale #: model:ir.actions.act_window,name:l10n_it_sale.action_carriage_condition_tree #: model:ir.ui.menu,name:l10n_it_sale.menu_action_carriage_condition_tree #: view:stock.picking.carriage_condition:0 @@ -191,11 +152,6 @@ msgstr "Resa merce" #. module: l10n_it_sale -#: help:hr.employee,fiscalcode:0 -msgid "Italian Fiscal Code" -msgstr "Codice fiscale italiano" - -#. module: l10n_it_sale #: model:ir.model,name:l10n_it_sale.model_account_invoice msgid "Invoice" msgstr "Fattura" @@ -227,3 +183,20 @@ msgid "Default shipping conditions" msgstr "Dati DDT" +#. module: l10n_it_sale +#: model:ir.module.module,description:l10n_it_sale.module_meta_information +msgid "" +"OpenERP Italian Localization - Sale version\n" +"\n" +"Functionalities:\n" +"\n" +"- Documento di trasporto\n" +"\n" +msgstr "" +"Localizzazione Italiana - Versione Sale\n" +"\n" +"Funzionalità :\n" +"\n" +"- Documento di trasporto\n" +"\n" + === modified file 'l10n_it_sale/i18n/l10n_it_sale.pot' --- l10n_it_sale/i18n/l10n_it_sale.pot 2011-05-06 13:54:43 +0000 +++ l10n_it_sale/i18n/l10n_it_sale.pot 2011-05-12 20:24:31 +0000 @@ -6,8 +6,8 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0.2\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2011-05-06 13:37+0000\n" -"PO-Revision-Date: 2011-05-06 13:37+0000\n" +"POT-Creation-Date: 2011-05-12 20:12+0000\n" +"PO-Revision-Date: 2011-05-12 20:12+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -23,18 +23,6 @@ msgstr "" #. module: l10n_it_sale -#: model:ir.module.module,description:l10n_it_sale.module_meta_information -msgid "This module customizes OpenERP in order to fit italian laws and mores - Sale version\n" -"\n" -"Functionalities:\n" -"\n" -"- Documento di trasporto\n" -"- Fiscal Code for employee\n" -"\n" -"" -msgstr "" - -#. module: l10n_it_sale #: field:stock.picking.carriage_condition,note:0 #: field:stock.picking.goods_description,note:0 #: field:stock.picking.transportation_reason,note:0 @@ -42,8 +30,10 @@ msgstr "" #. module: l10n_it_sale -#: field:hr.employee,fiscalcode:0 -msgid "Fiscal Code" +#: model:ir.actions.act_window,name:l10n_it_sale.action_transportation_reason_tree +#: model:ir.ui.menu,name:l10n_it_sale.menu_action_transportation_reason_tree +#: view:stock.picking.transportation_reason:0 +msgid "Reasons for transportation" msgstr "" #. module: l10n_it_sale @@ -52,11 +42,6 @@ msgstr "" #. module: l10n_it_sale -#: model:ir.model,name:l10n_it_sale.model_hr_employee -msgid "Employee" -msgstr "" - -#. module: l10n_it_sale #: model:ir.actions.act_window,name:l10n_it_sale.action_wizard_assign_ddt #: view:stock.picking:0 #: view:wizard.assign.ddt:0 @@ -79,11 +64,6 @@ msgstr "" #. module: l10n_it_sale -#: constraint:hr.employee:0 -msgid "Error ! You cannot create recursive Hierarchy of Employees." -msgstr "" - -#. module: l10n_it_sale #: model:ir.model,name:l10n_it_sale.model_wizard_assign_ddt msgid "wizard.assign.ddt" msgstr "" @@ -94,11 +74,6 @@ msgstr "" #. module: l10n_it_sale -#: constraint:hr.employee:0 -msgid "Error ! You cannot select a department for which the employee is the manager." -msgstr "" - -#. module: l10n_it_sale #: view:account.invoice:0 msgid "Shipping" msgstr "" @@ -170,13 +145,6 @@ msgstr "" #. module: l10n_it_sale -#: model:ir.actions.act_window,name:l10n_it_sale.action_transportation_reason_tree -#: model:ir.ui.menu,name:l10n_it_sale.menu_action_transportation_reason_tree -#: view:stock.picking.transportation_reason:0 -msgid "Reasons for transportation" -msgstr "" - -#. module: l10n_it_sale #: model:ir.actions.act_window,name:l10n_it_sale.action_carriage_condition_tree #: model:ir.ui.menu,name:l10n_it_sale.menu_action_carriage_condition_tree #: view:stock.picking.carriage_condition:0 @@ -184,11 +152,6 @@ msgstr "" #. module: l10n_it_sale -#: help:hr.employee,fiscalcode:0 -msgid "Italian Fiscal Code" -msgstr "" - -#. module: l10n_it_sale #: model:ir.model,name:l10n_it_sale.model_account_invoice msgid "Invoice" msgstr "" @@ -220,3 +183,14 @@ msgid "Default shipping conditions" msgstr "" +#. module: l10n_it_sale +#: model:ir.module.module,description:l10n_it_sale.module_meta_information +msgid "OpenERP Italian Localization - Sale version\n" +"\n" +"Functionalities:\n" +"\n" +"- Documento di trasporto\n" +"\n" +"" +msgstr "" +
_______________________________________________ Mailing list: https://launchpad.net/~openobject-italia-core-devs Post to : [email protected] Unsubscribe : https://launchpad.net/~openobject-italia-core-devs More help : https://help.launchpad.net/ListHelp
