avanzosc team mailing list archive

["Oihane \(Avanzosc\)" <oihanecruce@xxxxxxxxx>]

Oihane (Avanzosc) has proposed merging lp:~avanzosc/openerp-spain/7.0_l10n_es_partner_mercantil into lp:openerp-spain.

Requested reviews:
  OpenERP Spain Team (openerp-spain-team)

For more details, see:
https://code.launchpad.net/~avanzosc/openerp-spain/7.0_l10n_es_partner_mercantil/+merge/226326

Se ha migrado a versión 7.0 el modulo l10n_es_partner_mercantil
-- 
https://code.launchpad.net/~avanzosc/openerp-spain/7.0_l10n_es_partner_mercantil/+merge/226326
Your team Avanzosc Developers is subscribed to branch lp:~avanzosc/openerp-spain/7.0_l10n_es_partner_mercantil.

=== renamed directory '___unported__/l10n_es_partner_mercantil' => 'l10n_es_partner_mercantil'
=== modified file 'l10n_es_partner_mercantil/__init__.py'
--- ___unported__/l10n_es_partner_mercantil/__init__.py	2011-08-29 15:11:11 +0000
+++ l10n_es_partner_mercantil/__init__.py	2014-07-10 15:52:04 +0000
@@ -6,8 +6,8 @@
 #    $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
+#    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,
@@ -20,5 +20,4 @@
 #
 ##############################################################################
 
-import partner_es
-
+from . import models

=== modified file 'l10n_es_partner_mercantil/__openerp__.py'
--- ___unported__/l10n_es_partner_mercantil/__openerp__.py	2013-01-28 10:29:06 +0000
+++ l10n_es_partner_mercantil/__openerp__.py	2014-07-10 15:52:04 +0000
@@ -6,8 +6,8 @@
 #    $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
+#    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,
@@ -21,31 +21,27 @@
 ##############################################################################
 
 {
-    "name" : "Partner Mercantil",
-    "version" : "1.0",
-    "author" : "Spanish Localization Team",
-    "website" : "https://launchpad.net/openerp-spain";,
-    "category" : "Localisation/Europe",
-    "description": """Añade los siguientes campos en la ficha de Empresa:
-    * Libro
-    * Registro Mercantil
-    * Hoja
-    * Folio
-    * Seccion
-    * Tomo
-""",
-    "license" : "AGPL-3",
-    "depends" : [
+    "name": "Partner Mercantil",
+    "version": "1.0",
+    "author": "Spanish Localization Team",
+    "website": "https://launchpad.net/openerp-spain";,
+    "category": "Localisation/Europe",
+    "description": """
+    Añade los siguientes campos en la ficha de Empresa:
+        * Libro
+        * Registro Mercantil
+        * Hoja
+        * Folio
+        * Seccion
+        * Tomo
+    """,
+    "license": "AGPL-3",
+    "depends": [
         "base",
-        ],
-    "init_xml" : [],
-    "update_xml" : [
-        "partner_es_view.xml",
-        ],
-    "active": False,
-    "installable": False
+    ],
+    "data": [
+        "views/partner_es_view.xml",
+    ],
+    "active": True,
+    "installable": True
 }
-
-
-
-

=== modified file 'l10n_es_partner_mercantil/i18n/l10n_es_partner_mercantil.pot'
--- ___unported__/l10n_es_partner_mercantil/i18n/l10n_es_partner_mercantil.pot	2010-10-18 10:04:25 +0000
+++ l10n_es_partner_mercantil/i18n/l10n_es_partner_mercantil.pot	2014-07-10 15:52:04 +0000
@@ -1,13 +1,13 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* l10n_ES_partner_mercantil
+#	* l10n_es_partner_mercantil
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.1\n"
-"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2009-07-22 08:22:59+0000\n"
-"PO-Revision-Date: 2009-07-22 08:22:59+0000\n"
+"Project-Id-Version: OpenERP Server 7.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-07-10 15:45+0000\n"
+"PO-Revision-Date: 2014-07-10 15:45+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -15,65 +15,50 @@
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: \n"
 
-#. module: l10n_ES_partner_mercantil
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: l10n_ES_partner_mercantil
+#. module: l10n_es_partner_mercantil
+#: field:res.partner,es_libro:0
+msgid "Book"
+msgstr ""
+
+#. module: l10n_es_partner_mercantil
+#: view:res.partner:0
+msgid "Commercial Info"
+msgstr ""
+
+#. module: l10n_es_partner_mercantil
 #: field:res.partner,es_registro_mercantil:0
 msgid "Commercial Registry"
 msgstr ""
 
-#. module: l10n_ES_partner_mercantil
+#. module: l10n_es_partner_mercantil
+#: view:res.partner:0
+msgid "Internal Notes"
+msgstr ""
+
+#. module: l10n_es_partner_mercantil
+#: field:res.partner,es_folio:0
+msgid "Page"
+msgstr ""
+
+#. module: l10n_es_partner_mercantil
+#: code:_description:0
+#: model:ir.model,name:l10n_es_partner_mercantil.model_res_partner
+#, python-format
+msgid "Partner"
+msgstr ""
+
+#. module: l10n_es_partner_mercantil
 #: field:res.partner,es_seccion:0
 msgid "Section"
 msgstr ""
 
-#. module: l10n_ES_partner_mercantil
-#: view:res.partner:0
-msgid "Notes"
-msgstr ""
-
-#. module: l10n_ES_partner_mercantil
-#: field:res.partner,es_folio:0
-msgid "Page"
-msgstr ""
-
-#. module: l10n_ES_partner_mercantil
+#. module: l10n_es_partner_mercantil
+#: field:res.partner,es_hoja:0
+msgid "Sheet"
+msgstr ""
+
+#. module: l10n_es_partner_mercantil
 #: field:res.partner,es_tomo:0
 msgid "Volume"
 msgstr ""
 
-#. module: l10n_ES_partner_mercantil
-#: model:ir.module.module,description:l10n_ES_partner_mercantil.module_meta_information
-msgid "Añade los siguientes campos en la ficha de Empresa:\n"
-"    * Libro\n"
-"    * Registro Mercantil\n"
-"    * Hoja\n"
-"    * Folio\n"
-"    * Seccion\n"
-"    * Tomo\n"
-""
-msgstr ""
-
-#. module: l10n_ES_partner_mercantil
-#: field:res.partner,es_libro:0
-msgid "Book"
-msgstr ""
-
-#. module: l10n_ES_partner_mercantil
-#: field:res.partner,es_hoja:0
-msgid "Sheet"
-msgstr ""
-
-#. module: l10n_ES_partner_mercantil
-#: model:ir.module.module,shortdesc:l10n_ES_partner_mercantil.module_meta_information
-msgid "Partner Mercantil"
-msgstr ""
-
-#. module: l10n_ES_partner_mercantil
-#: view:res.partner:0
-msgid "Commercial Info"
-msgstr ""
-

=== added directory 'l10n_es_partner_mercantil/models'
=== added file 'l10n_es_partner_mercantil/models/__init__.py'
--- l10n_es_partner_mercantil/models/__init__.py	1970-01-01 00:00:00 +0000
+++ l10n_es_partner_mercantil/models/__init__.py	2014-07-10 15:52:04 +0000
@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (c) 2009 Spanish Localization Team
+#    $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 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/>.
+#
+##############################################################################
+
+from . import partner_es

=== renamed file '___unported__/l10n_es_partner_mercantil/partner_es.py' => 'l10n_es_partner_mercantil/models/partner_es.py'
--- ___unported__/l10n_es_partner_mercantil/partner_es.py	2011-08-29 15:11:11 +0000
+++ l10n_es_partner_mercantil/models/partner_es.py	2014-07-10 15:52:04 +0000
@@ -6,8 +6,8 @@
 #    $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
+#    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,
@@ -20,18 +20,18 @@
 #
 ##############################################################################
 
-from osv import osv, fields
-
-class res_partner(osv.osv):
+from openerp.osv import orm, fields
+
+
+class ResPartner(orm.Model):
     _inherit = 'res.partner'
+
     _columns = {
-    	'es_libro': fields.char('Book', size=128), #libro
-	    'es_registro_mercantil': fields.char('Commercial Registry', size=128), # Registro Mercantil
-	    'es_hoja': fields.char('Sheet', size=128), #hoja
-	    'es_folio': fields.char('Page', size=128), #folio
-	    'es_seccion': fields.char('Section', size=128),# seccion
-	    'es_tomo': fields.char('Volume', size=128),# tomo
+        'es_libro': fields.char('Book', size=128),  # libro
+        # Registro Mercantil
+        'es_registro_mercantil': fields.char('Commercial Registry', size=128),
+        'es_hoja': fields.char('Sheet', size=128),  # hoja
+        'es_folio': fields.char('Page', size=128),  # folio
+        'es_seccion': fields.char('Section', size=128),  # seccion
+        'es_tomo': fields.char('Volume', size=128),  # tomo
     }
-
-res_partner()
-

=== added directory 'l10n_es_partner_mercantil/views'
=== renamed file '___unported__/l10n_es_partner_mercantil/partner_es_view.xml' => 'l10n_es_partner_mercantil/views/partner_es_view.xml'
--- ___unported__/l10n_es_partner_mercantil/partner_es_view.xml	2010-11-12 12:51:14 +0000
+++ l10n_es_partner_mercantil/views/partner_es_view.xml	2014-07-10 15:52:04 +0000
@@ -1,22 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-  <data>
-    <record model="ir.ui.view" id="view_partner_form_mercantil">
-        <field name="name">view.partner.form.mercantil</field>
-        <field name="model">res.partner</field>
-        <field name="inherit_id" ref="base.view_partner_form"/>
-        <field name="arch" type="xml">
-            <page string="Notes" position="after">
-                <page string="Commercial Info">
-                    <field name="es_libro"/>
-                    <field name="es_registro_mercantil"/>
-                    <field name="es_hoja"/>
-                    <field name="es_folio"/>
-                    <field name="es_seccion"/>
-                    <field name="es_tomo"/>
+    <data>
+        <record model="ir.ui.view" id="view_partner_form_mercantil">
+            <field name="name">view.partner.form.mercantil</field>
+            <field name="model">res.partner</field>
+            <field name="inherit_id" ref="base.view_partner_form" />
+            <field name="arch" type="xml">
+                <page string="Internal Notes" position="after">
+                    <page string="Commercial Info">
+                        <group>
+                            <group>
+                                <field name="es_libro" />
+                                <field name="es_registro_mercantil" />
+                                <field name="es_hoja" />
+                            </group>
+                            <group>
+                                <field name="es_folio" />
+                                <field name="es_seccion" />
+                                <field name="es_tomo" />
+                            </group>
+                        </group>
+                    </page>
                 </page>
-             </page>
-        </field>
-    </record>
-  </data>
+            </field>
+        </record>
+    </data>
 </openerp>