Merge remote-tracking branch 'odoo/master' into master-wmsstaging3-jco

.gitignore

@@ -3,6 +3,7 @@ _build/
 
 # dotfiles
 .*
+!.gitignore
 # compiled python files
 *.py[co]
 # setup.py egg_info
@@ -12,7 +13,8 @@ _build/
 # hg stuff
 *.orig
 status
-
+# odoo filestore
+openerp/filestore
 # generated for windows installer?
 install/win32/*.bat
 install/win32/meta.py

README.md

@@ -6,7 +6,7 @@ Odoo is a suite of web based open source business apps.  More info at http://www
 The easiest way to play with it is the <a href="https://www.odoo.com/page/start">Odoo free trial</a>, email registration is NOT required, use the "skip this step" link on the registration page to skip it.
 
 
-Getting started with Odoo developement
+Getting started with Odoo development
 --------------------------------------
 
 If you are a developer type the following command at your terminal [1]:

addons/auth_oauth/controllers/main.py

@@ -11,6 +11,7 @@ from openerp import SUPERUSER_ID
 from openerp import http
 from openerp.http import request
 from openerp.addons.web.controllers.main import db_monodb, ensure_db, set_cookie_and_redirect, login_and_redirect
+from openerp.addons.auth_signup.controllers.main import AuthSignupHome as Home
 from openerp.modules.registry import RegistryManager
 from openerp.tools.translate import _
 
@@ -44,7 +45,7 @@ def fragment_to_query_string(func):
 #----------------------------------------------------------
 # Controller
 #----------------------------------------------------------
-class OAuthLogin(openerp.addons.web.controllers.main.Home):
+class OAuthLogin(Home):
     def list_providers(self):
         try:
             provider_obj = request.registry.get('auth.oauth.provider')
@@ -67,10 +68,13 @@ class OAuthLogin(openerp.addons.web.controllers.main.Home):
         return providers
 
     def get_state(self, provider):
+        redirect = request.params.get('redirect', 'web')
+        if not redirect.startswith(('//', 'http://', 'https://')):
+            redirect = '%s%s' % (request.httprequest.url_root, redirect)
         state = dict(
             d=request.session.db,
             p=provider['id'],
-            r=request.httprequest.full_path
+            r=redirect,
         )
         token = request.params.get('token')
         if token:
@@ -141,8 +145,7 @@ class OAuthController(http.Controller):
                 menu = state.get('m')
                 redirect = state.get('r')
                 url = '/web'
-                if redirect and not redirect.startswith('/auth_oauth/signin') and \
-                (not redirect.startswith('/web/login') or 'redirect' in urlparse.urlsplit(redirect).query):
+                if redirect:
                     url = redirect
                 elif action:
                     url = '/web#action=%s' % action

addons/auth_oauth/res_users.py

@@ -6,6 +6,7 @@ import urllib2
 import simplejson
 
 import openerp
+from openerp.addons.auth_signup.res_users import SignupError
 from openerp.osv import osv, fields
 from openerp import SUPERUSER_ID
 
@@ -55,14 +56,37 @@ class res_users(osv.Model):
 
             This method can be overridden to add alternative signin methods.
         """
-        oauth_uid = validation['user_id']
-        user_ids = self.search(cr, uid, [("oauth_uid", "=", oauth_uid), ('oauth_provider_id', '=', provider)])
-        if not user_ids:
-            raise openerp.exceptions.AccessDenied()
-        assert len(user_ids) == 1
-        user = self.browse(cr, uid, user_ids[0], context=context)
-        user.write({'oauth_access_token': params['access_token']})
-        return user.login
+        try:
+            oauth_uid = validation['user_id']
+            user_ids = self.search(cr, uid, [("oauth_uid", "=", oauth_uid), ('oauth_provider_id', '=', provider)])
+            if not user_ids:
+                raise openerp.exceptions.AccessDenied()
+            assert len(user_ids) == 1
+            user = self.browse(cr, uid, user_ids[0], context=context)
+            user.write({'oauth_access_token': params['access_token']})
+            return user.login
+        except openerp.exceptions.AccessDenied, access_denied_exception:
+            if context and context.get('no_user_creation'):
+                return None
+            state = simplejson.loads(params['state'])
+            token = state.get('t')
+            oauth_uid = validation['user_id']
+            email = validation.get('email', 'provider_%s_user_%s' % (provider, oauth_uid))
+            name = validation.get('name', email)
+            values = {
+                'name': name,
+                'login': email,
+                'email': email,
+                'oauth_provider_id': provider,
+                'oauth_uid': oauth_uid,
+                'oauth_access_token': params['access_token'],
+                'active': True,
+            }
+            try:
+                _, login, _ = self.signup(cr, uid, values, token, context=context)
+                return login
+            except SignupError:
+                raise access_denied_exception
 
     def auth_oauth(self, cr, uid, provider, params, context=None):
         # Advice by Google (to avoid Confused Deputy Problem)

addons/base_import/static/src/xml/import.xml

@@ -73,7 +73,8 @@
 
                 <div class="oe_import_error_report"></div>
                 <table class="oe_import_grid" />
-
+            </div>
+            <div class="oe_padding">
                 <h2>Frequently Asked Questions</h2>
 
                 <dl>

addons/base_import_module/bin/oe_module_deploy.py

@@ -1,86 +0,0 @@
-#!/usr/bin/env python
-import argparse
-import os
-import sys
-import tempfile
-import zipfile
-
-
-try:
-    import requests
-except ImportError:
-    # no multipart encoding in stdlib and this script is temporary
-    sys.exit("This script requires the 'requests' module. ( pip install requests )")
-
-session = requests.session()
-
-def deploy_module(module_path, url, login, password, db=''):
-    url = url.rstrip('/')
-    authenticate(url, login, password, db)
-    module_file = zip_module(module_path)
-    try:
-        return upload_module(url, module_file)
-    finally:
-        os.remove(module_file)
-
-def upload_module(server, module_file):
-    print("Uploading module file...")
-    url = server + '/base_import_module/upload'
-    files = dict(mod_file=open(module_file, 'rb'))
-    res = session.post(url, files=files)
-    if res.status_code != 200:
-        raise Exception("Could not authenticate on server '%s'" % server)
-    return res.text
-
-def authenticate(server, login, password, db=''):
-    print("Authenticating on server '%s' ..." % server)
-
-    # Fixate session with a given db if any
-    session.get(server + '/web/login', params=dict(db=db))
-
-    args = dict(login=login, password=password, db=db)
-    res = session.post(server + '/base_import_module/login', args)
-    if res.status_code == 404:
-        raise Exception("The server '%s' does not have the 'base_import_module' installed." % server)
-    elif res.status_code != 200:
-        raise Exception(res.text)
-
-def zip_module(path):
-    path = os.path.abspath(path)
-    if not os.path.isdir(path):
-        raise Exception("Could not find module directory '%s'" % path)
-    container, module_name = os.path.split(path)
-    temp = tempfile.mktemp(suffix='.zip')
-    try:
-        print("Zipping module directory...")
-        with zipfile.ZipFile(temp, 'w') as zfile:
-            for root, dirs, files in os.walk(path):
-                for file in files:
-                    file_path = os.path.join(root, file)
-                    zfile.write(file_path, file_path.split(container).pop())
-            return temp
-    except Exception:
-        os.remove(temp)
-        raise
-
-if __name__ == '__main__':
-    parser = argparse.ArgumentParser(description='Deploy a module on an OpenERP server.')
-    parser.add_argument('path', help="Path of the module to deploy")
-    parser.add_argument('--url', dest='url', help='Url of the server (default=http://localhost:8069)', default="http://localhost:8069")
-    parser.add_argument('--db', dest='db', help='Database to use if server does not use db-filter.')
-    parser.add_argument('--login', dest='login', default="admin", help='Login (default=admin)')
-    parser.add_argument('--password', dest='password', default="admin", help='Password (default=admin)')
-    parser.add_argument('--no-ssl-check', dest='no_ssl_check', action='store_true', help='Do not check ssl cert')
-    if len(sys.argv) == 1:
-        sys.exit(parser.print_help())
-
-    args = parser.parse_args()
-
-    if args.no_ssl_check:
-        session.verify = False
-
-    try:
-        result = deploy_module(args.path, args.url, args.login, args.password, args.db)
-        print(result)
-    except Exception, e:
-        sys.exit("ERROR: %s" % e)

addons/calendar/calendar.py

@@ -1273,7 +1273,7 @@ class calendar_event(osv.Model):
         if data.get('count'):
             data['end_type'] = 'count'
         else:
-            data['end_type'] = 'final_date'
+            data['end_type'] = 'end_date'
         return data
 
     def message_get_subscription_data(self, cr, uid, ids, user_pid=None, context=None):

addons/crm/sales_team_view.xml

@@ -126,10 +126,10 @@
                         <field name="use_leads"/><label for="use_leads" string="Leads"/>
                         <field name="use_opportunities" class="oe_inline"/><label for="use_opportunities"/>
                     </xpath>
-                    <xpath expr="//group/field[@name='active']" position="inside">
+                    <xpath expr="//group[@name='left']" position="after">
                         <group>
                             <label for="alias_name" string="Email Alias"
-                                    attrs="p'invisible': [('alias_domain', '=', False)]}"/>
+                                    attrs="{'invisible': [('alias_domain', '=', False)]}"/>
                             <div name="alias_def"
                                     attrs="{'invisible': [('alias_domain', '=', False)]}">
                                 <field name="alias_id" class="oe_read_only oe_inline"

addons/delivery/sale.py

@@ -74,7 +74,7 @@ class sale_order(osv.Model):
             if not grid_id:
                 raise osv.except_osv(_('No Grid Available!'), _('No grid matching for this carrier!'))
 
-            if order.state != 'draft':
+            if order.state not in ('draft', 'sent'):
                 raise osv.except_osv(_('Order not in Draft State!'), _('The order state have to be draft to add delivery lines.'))
 
             grid = grid_obj.browse(cr, uid, grid_id, context=context)

addons/edi/static/src/js/edi.js

@@ -39,16 +39,15 @@ instance.edi.EdiImport = instance.web.Widget.extend({
             });
         }
         else {
-            $('<div>').dialog({
-                modal: true,
-                title: 'Import Successful!',
-                buttons: {
-                    Ok: function() {
-                        $(this).dialog("close");
-                        window.location = "/";
+            new instance.web.Dialog(this,{
+                    title: 'Import Successful!',
+                    buttons: {
+                        Ok: function() {
+                            this.parents('.modal').modal('hide');
+                            window.location = "/";
+                        }
                     }
-                }
-            }).html(_t('The document has been successfully imported!'));
+                },$('<div>').html(_t('The document has been successfully imported!'))).open();
         }
     },
     on_imported_error: function(response){
@@ -58,13 +57,12 @@ instance.edi.EdiImport = instance.web.Widget.extend({
             msg += "\n " + _t("Reason:") + response.data.message;
         }
         var params = {error: response, message: msg};
-        $(instance.web.qweb.render("CrashManager.warning", params)).dialog({
-            title: _t("Document Import Notification"),
-            modal: true,
-            buttons: {
-                Ok: function() { $(this).dialog("close"); }
-            }
-        });
+        new instance.web.Dialog(this,{
+                title: _t("Document Import Notification"),
+                buttons: {
+                    Ok: function() { this.parents('.modal').modal('hide');}
+                }
+            },$(instance.web.qweb.render("CrashManager.warning", params))).open();
     }
 });
 

addons/event_sale/event_sale.py

@@ -159,7 +159,11 @@ class event_event(osv.osv):
             help="The maximum registration level is equal to the sum of the maximum registration of event ticket." +
             "If you have too much registrations you are not able to confirm your event. (0 to ignore this rule )",
             type='integer',
-            readonly=True),
+            readonly=True,
+            store={
+              'event.event': (lambda self, cr, uid, ids, c = {}: ids, ['event_ticket_ids'], 20),
+              'event.event.ticket': (_get_ticket_events, ['seats_max'], 10),
+            }),
         'seats_available': fields.function(Event._get_seats, oldname='register_avail', string='Available Seats',
                                            type='integer', multi='seats_reserved',
                                            store={

addons/fleet/fleet_cars.xml

@@ -129,9 +129,9 @@
       	<field name="name">Lancia</field>
       	<field name="image" type="base64" file="fleet/static/img/brand_lancia-image.png"/>
       </record>
-      <record id="brand_lander rover" model="fleet.vehicle.model.brand">
-      	<field name="name">Lander Rover</field>
-      	<field name="image" type="base64" file="fleet/static/img/brand_lander rover-image.png"/>
+      <record id="brand_land rover" model="fleet.vehicle.model.brand">
+      	<field name="name">Land Rover</field>
+      	<field name="image" type="base64" file="fleet/static/img/brand_land rover-image.png"/>
       </record>
       <record id="brand_lexus" model="fleet.vehicle.model.brand">
       	<field name="name">Lexus</field>

addons/gamification/models/challenge.py

@@ -380,10 +380,6 @@ class gamification_challenge(osv.Model):
 
     ##### Automatic actions #####
 
-    def generate_goals_from_challenge(self, cr, uid, ids, context=None):
-        _logger.warning("Deprecated, use private method _generate_goals_from_challenge(...) instead.")
-        return self._generate_goals_from_challenge(cr, uid, ids, context=context)
-
     def _generate_goals_from_challenge(self, cr, uid, ids, context=None):
         """Generate the goals for each line and user.
 

addons/gamification/models/goal.py

@@ -333,7 +333,8 @@ class gamification_goal(osv.Model):
 
                         if definition.computation_mode == 'sum':
                             field_name = definition.field_id.name
-                            res = obj.read_group(cr, uid, domain, [field_name], [field_name], context=context)
+                            # TODO for master: group on user field in batch mode
+                            res = obj.read_group(cr, uid, domain, [field_name], [], context=context)
                             new_value = res and res[0][field_name] or 0.0
 
                         else:  # computation mode = count

addons/hr_timesheet_sheet/hr_timesheet_sheet.py

@@ -141,7 +141,7 @@ class hr_timesheet_sheet(osv.osv):
         return {
             sheet_id: {
                 'timesheet_activity_count': Timesheet.search_count(cr,uid, [('sheet_id','=', sheet_id)], context=context),
-                'attendance_count': Attendance.search_count(cr,uid, [('sheed_id', '=', sheet_id)], context=context)
+                'attendance_count': Attendance.search_count(cr,uid, [('sheet_id', '=', sheet_id)], context=context)
             }
             for sheet_id in ids
         }

addons/l10n_es/__init__.py

@@ -2,27 +2,20 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (c) 2007 ACYSOS S.L. (http://acysos.com) All Rights Reserved.
-#                       Pedro Tarrafeta (pedro@acysos.com)
-#    Copyright (c) 2008-2010 Zikzakmedia S.L. (http://zikzakmedia.com) All Rights Reserved.
-#                            Jordi Esteve <jesteve@zikzakmedia.com>
-#    $Id$
 #
 #    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
+#    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.
+#    GNU Affero General Public License for more details.
 #
-#    You should have received a copy of the GNU 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/>.
 #
 ##############################################################################
 
-
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/l10n_es/__openerp__.py

@@ -8,7 +8,6 @@
 #                            Dpto. Consultoría <consultoria@opentia.es>
 #    Copyright (c) 2013 Serv. Tecnol. Avanzados (http://www.serviciosbaeza.com)
 #                       Pedro Manuel Baeza <pedro.baeza@serviciosbaeza.com>
-#    $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
@@ -27,37 +26,39 @@
 
 {
     "name" : "Spanish Charts of Accounts (PGCE 2008)",
-    "version" : "3.0",
+    "version" : "4.0",
     "author" : "Spanish Localization Team",
     'website' : 'https://launchpad.net/openerp-spain',
     "category" : "Localization/Account Charts",
     "description": """
-Spanish Charts of Accounts (PGCE 2008).
-=======================================
+Spanish charts of accounts (PGCE 2008).
+========================================
 
     * Defines the following chart of account templates:
-        * Spanish General Chart of Accounts 2008
-        * Spanish General Chart of Accounts 2008 for small and medium companies
-        * Spanish General Chart of Accounts 2008 for associations
+        * Spanish general chart of accounts 2008
+        * Spanish general chart of accounts 2008 for small and medium companies
+        * Spanish general chart of accounts 2008 for associations
     * Defines templates for sale and purchase VAT
     * Defines tax code templates
+    * Defines fiscal positions for spanish fiscal legislation
 """,
     "license" : "AGPL-3",
     "depends" : ["account", "base_vat", "base_iban"],
     "data" : [
-        "account_chart.xml",
-        "taxes_data.xml",
-        "fiscal_templates.xml",
-        "account_chart_pymes.xml",
-        "taxes_data_pymes.xml",
-        "fiscal_templates_pymes.xml",
-        "account_chart_assoc.xml",
-        "taxes_data_assoc.xml",
-        "fiscal_templates_assoc.xml",
+        "account_type.xml",
+        "account_chart_template.xml",
+        "account_account_common.xml",
+        "account_account_full.xml",
+        "account_account_pymes.xml",
+        "account_account_assoc.xml",
+        "tax_codes_common.xml",
+        "taxes_common.xml",
+        "fiscal_templates_common.xml",
+        "account_chart_template_post.xml",
         "l10n_es_wizard.xml",
     ],
     "demo" : [],
     'auto_install': False,
     "installable": True,
-    'images': ['images/config_chart_l10n_es.jpeg','images/l10n_es_chart.jpeg'],
+    'images': ['images/config_chart_l10n_es.png', 'images/l10n_es_chart.png'],
 }

addons/l10n_es/account_account_pymes.xml

@@ -0,0 +1,695 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+
+    <!--
+          Cuentas que sólo están en el PGC PYMEs:
+            (2935), (296);
+            (5935), (596);
+            (663);
+            (7962), (7963);
+
+        Cuentas que tienen un nombre distinto en el plan de asociaciones:
+            (100), (103), (104), (1040), (1044), (12), (130);
+            (240), (249);
+            (490);
+            (65), (671), (691), (694);
+            (791), (794);
+
+        (2013-10-07)
+        Pedro M. Baeza - pedro.baeza@serviciosbaeza.com
+        Serv. Tecnol. Avanzados - http://www.serviciosbaeza.com
+        Refactorización general
+
+    -->
+
+    <data noupdate="0">
+
+        <record id="pgc_pymes_100" model="account.account.template">
+            <field name="code">100</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_10"/>
+            <field name="type">view</field>
+            <field name="name">Capital social</field>
+            <field name="user_type" ref="l10n_es.account_type_capital"/>
+            <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
+        </record>
+        <record id="pgc_pymes_100_child" model="account.account.template">
+            <field name="code">100</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_pymes_100"/>
+            <field name="type">other</field>
+            <field name="name">Capital social</field>
+            <field name="user_type" ref="l10n_es.account_type_capital"/>
+            <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
+        </record>
+        <record id="pgc_pymes_103" model="account.account.template">
+            <field name="code">103</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_10"/>
+            <field name="type">view</field>
+            <field name="name">Socios por desembolsos no exigidos</field>
+            <field name="user_type" ref="l10n_es.account_type_capital"/>
+            <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
+        </record>
+        <record id="pgc_pymes_1030" model="account.account.template">
+            <field name="code">1030</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_pymes_103"/>
+            <field name="type">view</field>
+            <field name="name">Socios por desembolsos no exigidos, capital social</field>
+            <field name="user_type" ref="l10n_es.account_type_capital"/>
+            <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
+        </record>
+        <record id="pgc_pymes_1030_child" model="account.account.template">
+            <field name="code">1030</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_pymes_1030"/>
+            <field name="type">other</field>
+            <field name="name">Socios por desembolsos no exigidos, capital social</field>
+            <field name="user_type" ref="l10n_es.account_type_capital"/>
+            <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
+        </record>
+        <record id="pgc_pymes_1034" model="account.account.template">
+            <field name="code">1034</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_pymes_103"/>
+            <field name="type">view</field>
+            <field name="name">Socios por desembolsos no exigidos, capital pendiente de inscripción</field>
+            <field name="user_type" ref="l10n_es.account_type_capital"/>
+            <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
+        </record>
+        <record id="pgc_pymes_1034_child" model="account.account.template">
+            <field name="code">1034</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_pymes_1034"/>
+            <field name="type">other</field>
+            <field name="name">Socios por desembolsos no exigidos, capital pendiente de inscripción</field>
+            <field name="user_type" ref="l10n_es.account_type_capital"/>
+            <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
+        </record>
+        <record id="pgc_pymes_104" model="account.account.template">
+            <field name="code">104</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_10"/>
+            <field name="type">view</field>
+            <field name="name">Socios por aportaciones no dinerarias pendientes</field>
+            <field name="user_type" ref="l10n_es.account_type_capital"/>
+            <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
+        </record>
+        <record id="pgc_pymes_1040" model="account.account.template">
+            <field name="code">1040</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_pymes_104"/>
+            <field name="type">view</field>
+            <field name="name">Socios por aportaciones no dinerarias pendientes, capital social</field>
+            <field name="user_type" ref="l10n_es.account_type_capital"/>
+            <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
+        </record>
+        <record id="pgc_pymes_1040_child" model="account.account.template">
+            <field name="code">1040</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_pymes_1040"/>
+            <field name="type">other</field>
+            <field name="name">Socios por aportaciones no dinerarias pendientes, capital social</field>
+            <field name="user_type" ref="l10n_es.account_type_capital"/>
+            <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
+        </record>
+        <record id="pgc_pymes_1044" model="account.account.template">
+            <field name="code">1044</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_pymes_104"/>
+            <field name="type">view</field>
+            <field name="name">Socios por aportaciones no dinerarias pendientes, capital pendiente de inscripción</field>
+            <field name="user_type" ref="l10n_es.account_type_capital"/>
+            <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
+        </record>
+        <record id="pgc_pymes_1044_child" model="account.account.template">
+            <field name="code">1044</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_pymes_1044"/>
+            <field name="type">other</field>
+            <field name="name">Socios por aportaciones no dinerarias pendientes, capital pendiente de inscripción</field>
+            <field name="user_type" ref="l10n_es.account_type_capital"/>
+            <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
+        </record>
+        <record id="pgc_pymes_12" model="account.account.template">
+            <field name="code">12</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_1"/>
+            <field name="type">view</field>
+            <field name="name">Resultados pendientes de aplicación</field>
+            <field name="user_type" ref="l10n_es.account_type_capital"/>
+            <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
+        </record>
+        <record id="pgc_pymes_120" model="account.account.template">
+            <field name="code">120</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_pymes_12"/>
+            <field name="type">view</field>
+            <field name="name">Remanente</field>
+            <field name="user_type" ref="l10n_es.account_type_capital"/>
+            <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
+        </record>
+        <record id="pgc_pymes_120_child" model="account.account.template">
+            <field name="code">120</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_pymes_120"/>
+            <field name="type">other</field>
+            <field name="name">Remanente</field>
+            <field name="user_type" ref="l10n_es.account_type_capital"/>
+            <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
+        </record>
+        <record id="pgc_pymes_121" model="account.account.template">
+            <field name="code">121</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_pymes_12"/>
+            <field name="type">view</field>
+            <field name="name">Resultados negativos de ejercicios anteriores</field>
+            <field name="user_type" ref="l10n_es.account_type_capital"/>
+            <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
+        </record>
+        <record id="pgc_pymes_121_child" model="account.account.template">
+            <field name="code">121</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_pymes_121"/>
+            <field name="type">other</field>
+            <field name="name">Resultados negativos de ejercicios anteriores</field>
+            <field name="user_type" ref="l10n_es.account_type_capital"/>
+            <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
+        </record>
+        <record id="pgc_pymes_129" model="account.account.template">
+            <field name="code">129</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_pymes_12"/>
+            <field name="type">view</field>
+            <field name="name">Resultado del ejercicio</field>
+            <field name="user_type" ref="l10n_es.account_type_capital"/>
+            <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
+        </record>
+        <record id="pgc_pymes_129_child" model="account.account.template">
+            <field name="code">129</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_pymes_129"/>
+            <field name="type">other</field>
+            <field name="name">Resultado del ejercicio</field>
+            <field name="user_type" ref="l10n_es.account_type_capital"/>
+            <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
+        </record>
+        <record id="pgc_pymes_130_child" model="account.account.template">
+            <field name="code">130</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_130"/>
+            <field name="type">other</field>
+            <field name="name">Subvenciones oficiales de capital</field>
+            <field name="user_type" ref="l10n_es.account_type_capital"/>
+            <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
+        </record>
+        <record id="pgc_pymes_132_child" model="account.account.template">
+            <field name="code">132</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_132"/>
+            <field name="type">other</field>
+            <field name="name">Otras subvenciones, donaciones y legados</field>
+            <field name="user_type" ref="l10n_es.account_type_capital"/>
+            <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
+        </record>
+        <record id="pgc_pymes_240" model="account.account.template">
+            <field name="code">240</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_24"/>
+            <field name="type">view</field>
+            <field name="name">Participaciones en partes vinculadas</field>
+            <field name="user_type" ref="l10n_es.account_type_inmo"/>
+            <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
+        </record>
+        <record id="pgc_pymes_2403" model="account.account.template">
+            <field name="code">2403</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_pymes_240"/>
+            <field name="type">view</field>
+            <field name="name">Participaciones en empresas del grupo</field>
+            <field name="user_type" ref="l10n_es.account_type_inmo"/>
+            <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
+        </record>
+        <record id="pgc_pymes_2403_child" model="account.account.template">
+            <field name="code">2403</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_pymes_2403"/>
+            <field name="type">other</field>
+            <field name="name">Participaciones en empresas del grupo</field>
+            <field name="user_type" ref="l10n_es.account_type_inmo"/>
+            <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
+        </record>
+        <record id="pgc_pymes_2404" model="account.account.template">
+            <field name="code">2404</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_pymes_240"/>
+            <field name="type">view</field>
+            <field name="name">Participaciones en empresas asociadas</field>
+            <field name="user_type" ref="l10n_es.account_type_inmo"/>
+            <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
+        </record>
+        <record id="pgc_pymes_2404_child" model="account.account.template">
+            <field name="code">2404</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_pymes_2404"/>
+            <field name="type">other</field>
+            <field name="name">Participaciones en empresas asociadas</field>
+            <field name="user_type" ref="l10n_es.account_type_inmo"/>
+            <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
+        </record>
+        <record id="pgc_pymes_2405" model="account.account.template">
+            <field name="code">2405</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_pymes_240"/>
+            <field name="type">view</field>
+            <field name="name">Participaciones en otras partes vinculadas</field>
+            <field name="user_type" ref="l10n_es.account_type_inmo"/>
+            <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
+        </record>
+        <record id="pgc_pymes_2405_child" model="account.account.template">
+            <field name="code">2405</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_pymes_2405"/>
+            <field name="type">other</field>
+            <field name="name">Participaciones en otras partes vinculadas</field>
+            <field name="user_type" ref="l10n_es.account_type_inmo"/>
+            <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
+        </record>
+        <record id="pgc_pymes_249" model="account.account.template">
+            <field name="code">249</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_24"/>
+            <field name="type">view</field>
+            <field name="name">Desembolsos pendientes sobre participaciones en partes vinculadas</field>
+            <field name="user_type" ref="l10n_es.account_type_inmo"/>
+            <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
+        </record>
+        <record id="pgc_pymes_2493" model="account.account.template">
+            <field name="code">2493</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_pymes_249"/>
+            <field name="type">view</field>
+            <field name="name">Desembolsos pendientes sobre participaciones en empresas del grupo</field>
+            <field name="user_type" ref="l10n_es.account_type_inmo"/>
+            <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
+        </record>
+        <record id="pgc_pymes_2493_child" model="account.account.template">
+            <field name="code">2493</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_pymes_2493"/>
+            <field name="type">other</field>
+            <field name="name">Desembolsos pendientes sobre participaciones en empresas del grupo</field>
+            <field name="user_type" ref="l10n_es.account_type_inmo"/>
+            <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
+        </record>
+        <record id="pgc_pymes_2494" model="account.account.template">
+            <field name="code">2494</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_pymes_249"/>
+            <field name="type">view</field>
+            <field name="name">Desembolsos pendientes sobre participaciones en empresas asociadas</field>
+            <field name="user_type" ref="l10n_es.account_type_inmo"/>
+            <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
+        </record>
+        <record id="pgc_pymes_2494_child" model="account.account.template">
+            <field name="code">2494</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_pymes_2494"/>
+            <field name="type">other</field>
+            <field name="name">Desembolsos pendientes sobre participaciones en empresas asociadas</field>
+            <field name="user_type" ref="l10n_es.account_type_inmo"/>
+            <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
+        </record>
+        <record id="pgc_pymes_2495" model="account.account.template">
+            <field name="code">2495</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_pymes_249"/>
+            <field name="type">view</field>
+            <field name="name">Desembolsos pendientes sobre participaciones en otras partes vinculadas</field>
+            <field name="user_type" ref="l10n_es.account_type_inmo"/>
+            <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
+        </record>
+        <record id="pgc_pymes_2495_child" model="account.account.template">
+            <field name="code">2495</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_pymes_2495"/>
+            <field name="type">other</field>
+            <field name="name">Desembolsos pendientes sobre participaciones en otras partes vinculadas</field>
+            <field name="user_type" ref="l10n_es.account_type_inmo"/>
+            <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
+        </record>
+        <record id="pgc_pymes_255_child" model="account.account.template">
+            <field name="code">255</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_255"/>
+            <field name="type">other</field>
+            <field name="name">Activos por derivados financieros</field>
+            <field name="user_type" ref="l10n_es.account_type_inmo"/>
+            <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
+        </record>
+        <record id="pgc_pymes_2935" model="account.account.template">
+            <field name="code">2935</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_293"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor de participaciones a largo plazo en otras partes vinculadas</field>
+            <field name="user_type" ref="l10n_es.account_type_inmo"/>
+            <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
+        </record>
+        <record id="pgc_pymes_2935_child" model="account.account.template">
+            <field name="code">2935</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_pymes_2935"/>
+            <field name="type">other</field>
+            <field name="name">Deterioro de valor de participaciones a largo plazo en otras partes vinculadas</field>
+            <field name="user_type" ref="l10n_es.account_type_inmo"/>
+            <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
+        </record>
+        <record id="pgc_pymes_296" model="account.account.template">
+            <field name="code">296</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_29"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de  valor de participaciones en el patrimonio neto a largo plazo</field>
+            <field name="user_type" ref="l10n_es.account_type_inmo"/>
+            <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
+        </record>
+        <record id="pgc_pymes_296_child" model="account.account.template">
+            <field name="code">296</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_pymes_296"/>
+            <field name="type">other</field>
+            <field name="name">Deterioro de  valor de participaciones en el patrimonio neto a largo plazo</field>
+            <field name="user_type" ref="l10n_es.account_type_inmo"/>
+            <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
+        </record>
+        <record id="pgc_pyme_490" model="account.account.template">
+            <field name="code">490</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_49"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor de créditos por operaciones comerciales</field>
+            <field name="user_type" ref="l10n_es.account_type_terceros"/>
+            <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
+        </record>
+        <record id="pgc_pyme_490_child" model="account.account.template">
+            <field name="code">490</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_pyme_490"/>
+            <field name="type">other</field>
+            <field name="name">Deterioro de valor de créditos por operaciones comerciales</field>
+            <field name="user_type" ref="l10n_es.account_type_terceros"/>
+            <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
+        </record>
+        <record id="pgc_pyme_551" model="account.account.template">
+            <field name="code">551</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_55"/>
+            <field name="type">view</field>
+            <field name="name">Cuenta corriente con socios y administradores</field>
+            <field name="user_type" ref="l10n_es.account_type_financieras"/>
+            <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
+        </record>
+        <record id="pgc_pyme_551_child" model="account.account.template">
+            <field name="code">551</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_pyme_551"/>
+            <field name="type">other</field>
+            <field name="name">Cuenta corriente con socios y administradores</field>
+            <field name="user_type" ref="l10n_es.account_type_financieras"/>
+            <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
+        </record>
+        <record id="pgc_pymes_5935" model="account.account.template">
+            <field name="code">5935</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_593"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor de participaciones a corto plazo en otras partes vinculadas</field>
+            <field name="user_type" ref="l10n_es.account_type_financieras"/>
+            <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
+        </record>
+        <record id="pgc_pymes_5935_child" model="account.account.template">
+            <field name="code">5935</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_pymes_5935"/>
+            <field name="type">other</field>
+            <field name="name">Deterioro de valor de participaciones a corto plazo en otras partes vinculadas</field>
+            <field name="user_type" ref="l10n_es.account_type_financieras"/>
+            <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
+        </record>
+        <record id="pgc_pymes_596" model="account.account.template">
+            <field name="code">596</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_59"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor de participaciones a corto plazo</field>
+            <field name="user_type" ref="l10n_es.account_type_financieras"/>
+            <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
+        </record>
+        <record id="pgc_pymes_596_child" model="account.account.template">
+            <field name="code">596</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_pymes_596"/>
+            <field name="type">other</field>
+            <field name="name">Deterioro de valor de participaciones a corto plazo</field>
+            <field name="user_type" ref="l10n_es.account_type_financieras"/>
+            <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
+        </record>
+        <record id="pgc_pymes_65" model="account.account.template">
+            <field name="code">65</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_6"/>
+            <field name="type">view</field>
+            <field name="name">Otros gastos de gestión</field>
+            <field name="user_type" ref="account.data_account_type_expense"/>
+            <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
+        </record>
+        <record id="pgc_pymes_650" model="account.account.template">
+            <field name="code">650</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_pymes_65"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas de créditos comerciales incobrables</field>
+            <field name="user_type" ref="account.data_account_type_expense"/>
+            <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
+        </record>
+        <record id="pgc_pymes_650_child" model="account.account.template">
+            <field name="code">650</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_pymes_650"/>
+            <field name="type">other</field>
+            <field name="name">Pérdidas de créditos comerciales incobrables</field>
+            <field name="user_type" ref="account.data_account_type_expense"/>
+            <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
+        </record>
+        <record id="pgc_pymes_651" model="account.account.template">
+            <field name="code">651</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_pymes_65"/>
+            <field name="type">view</field>
+            <field name="name">Resultados de operaciones en común</field>
+            <field name="user_type" ref="account.data_account_type_expense"/>
+            <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
+        </record>
+        <record id="pgc_pymes_6510" model="account.account.template">
+            <field name="code">6510</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_pymes_651"/>
+            <field name="type">view</field>
+            <field name="name">Beneficio transferido (gestor)</field>
+            <field name="user_type" ref="account.data_account_type_expense"/>
+            <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
+        </record>
+        <record id="pgc_pymes_6510_child" model="account.account.template">
+            <field name="code">6510</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_pymes_6510"/>
+            <field name="type">other</field>
+            <field name="name">Beneficio transferido (gestor)</field>
+            <field name="user_type" ref="account.data_account_type_expense"/>
+            <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
+        </record>
+        <record id="pgc_pymes_6511" model="account.account.template">
+            <field name="code">6511</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_pymes_651"/>
+            <field name="type">view</field>
+            <field name="name">Pérdida soportada (partícipe o asociado no gestor)</field>
+            <field name="user_type" ref="account.data_account_type_expense"/>
+            <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
+        </record>
+        <record id="pgc_pymes_6511_child" model="account.account.template">
+            <field name="code">6511</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_pymes_6511"/>
+            <field name="type">other</field>
+            <field name="name">Pérdida soportada (partícipe o asociado no gestor)</field>
+            <field name="user_type" ref="account.data_account_type_expense"/>
+            <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
+        </record>
+        <record id="pgc_pymes_659" model="account.account.template">
+            <field name="code">659</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_pymes_65"/>
+            <field name="type">view</field>
+            <field name="name">Otras pérdidas en gestión corriente</field>
+            <field name="user_type" ref="account.data_account_type_expense"/>
+            <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
+        </record>
+        <record id="pgc_pymes_659_child" model="account.account.template">
+            <field name="code">659</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_pymes_659"/>
+            <field name="type">other</field>
+            <field name="name">Otras pérdidas en gestión corriente</field>
+            <field name="user_type" ref="account.data_account_type_expense"/>
+            <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
+        </record>
+        <record id="pgc_pymes_663_child" model="account.account.template">
+            <field name="code">663</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_663"/>
+            <field name="type">other</field>
+            <field name="name">Pérdidas por valoración de instrumentos financieros por su valor razonable</field>
+            <field name="user_type" ref="account.data_account_type_expense"/>
+            <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
+        </record>
+        <record id="pgc_pymes_671" model="account.account.template">
+            <field name="code">671</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_67"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas procedentes del inmovilizado material</field>
+            <field name="user_type" ref="account.data_account_type_expense"/>
+            <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
+        </record>
+        <record id="pgc_pymes_671_child" model="account.account.template">
+            <field name="code">671</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_pymes_671"/>
+            <field name="type">other</field>
+            <field name="name">Pérdidas procedentes del inmovilizado material</field>
+            <field name="user_type" ref="account.data_account_type_expense"/>
+            <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
+        </record>
+        <record id="pgc_pymes_691" model="account.account.template">
+            <field name="code">691</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_69"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas por deterioro del inmovilizado material</field>
+            <field name="user_type" ref="account.data_account_type_expense"/>
+            <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
+        </record>
+        <record id="pgc_pymes_691_child" model="account.account.template">
+            <field name="code">691</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_pymes_691"/>
+            <field name="type">other</field>
+            <field name="name">Pérdidas por deterioro del inmovilizado material</field>
+            <field name="user_type" ref="account.data_account_type_expense"/>
+            <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
+        </record>
+        <record id="pgc_pymes_694" model="account.account.template">
+            <field name="code">694</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_69"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas por deterioro de créditos por operaciones comerciales</field>
+            <field name="user_type" ref="account.data_account_type_expense"/>
+            <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
+        </record>
+        <record id="pgc_pymes_694_child" model="account.account.template">
+            <field name="code">694</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_pymes_694"/>
+            <field name="type">other</field>
+            <field name="name">Pérdidas por deterioro de créditos por operaciones comerciales</field>
+            <field name="user_type" ref="account.data_account_type_expense"/>
+            <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
+        </record>
+        <record id="pgc_pymes_763_child" model="account.account.template">
+            <field name="code">763</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_763"/>
+            <field name="type">other</field>
+            <field name="name">Beneficios por valoración de instrumentos financieros por su valor razonable</field>
+            <field name="user_type" ref="account.data_account_type_income"/>
+            <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
+        </record>
+        <record id="pgc_pymes_791" model="account.account.template">
+            <field name="code">791</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_79"/>
+            <field name="type">view</field>
+            <field name="name">Reversión del deterioro del inmovilizado material</field>
+            <field name="user_type" ref="account.data_account_type_income"/>
+            <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
+        </record>
+        <record id="pgc_pymes_791_child" model="account.account.template">
+            <field name="code">791</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_pymes_791"/>
+            <field name="type">other</field>
+            <field name="name">Reversión del deterioro del inmovilizado material</field>
+            <field name="user_type" ref="account.data_account_type_income"/>
+            <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
+        </record>
+        <record id="pgc_pymes_794" model="account.account.template">
+            <field name="code">794</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_79"/>
+            <field name="type">view</field>
+            <field name="name">Reversión del deterioro de créditos por operaciones comerciales</field>
+            <field name="user_type" ref="account.data_account_type_income"/>
+            <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
+        </record>
+        <record id="pgc_pymes_794_child" model="account.account.template">
+            <field name="code">794</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_pymes_794"/>
+            <field name="type">other</field>
+            <field name="name">Reversión del deterioro de créditos por operaciones comerciales</field>
+            <field name="user_type" ref="account.data_account_type_income"/>
+            <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
+        </record>
+        <record id="pgc_pymes_7962" model="account.account.template">
+            <field name="code">7962</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_796"/>
+            <field name="type">view</field>
+            <field name="name">Reversión del deterioro de participaciones en instrumentos de patrimonio neto a largo plazo, otras partes vinculadas</field>
+            <field name="user_type" ref="account.data_account_type_income"/>
+            <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
+        </record>
+        <record id="pgc_pymes_7962_child" model="account.account.template">
+            <field name="code">7962</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_pymes_7962"/>
+            <field name="type">other</field>
+            <field name="name">Reversión del deterioro de participaciones en instrumentos de patrimonio neto a largo plazo, otras partes vinculadas</field>
+            <field name="user_type" ref="account.data_account_type_income"/>
+            <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
+        </record>
+        <record id="pgc_pymes_7963" model="account.account.template">
+            <field name="code">7963</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_796"/>
+            <field name="type">view</field>
+            <field name="name">Reversión del deterioro de participaciones en instrumentos de patrimonio neto a largo plazo, otras empresas</field>
+            <field name="user_type" ref="account.data_account_type_income"/>
+            <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
+        </record>
+        <record id="pgc_pymes_7963_child" model="account.account.template">
+            <field name="code">7963</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_pymes_7963"/>
+            <field name="type">other</field>
+            <field name="name">Reversión del deterioro de participaciones en instrumentos de patrimonio neto a largo plazo, otras empresas</field>
+            <field name="user_type" ref="account.data_account_type_income"/>
+            <field name="chart_template_id" ref="l10n_es.account_chart_template_pymes"/>
+        </record>
+
+    </data>
+</openerp>

addons/l10n_es/account_chart_template.xml

@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="0">
+
+        <!-- Plantillas de los planes contables -->
+        <record id="account_chart_template_common" model="account.chart.template">
+            <field name="name">PGCE común</field>
+            <field name="visible" eval="False"/>
+            <field name="complete_tax_set" eval="False"/>
+        </record>
+
+        <record id="account_chart_template_assoc" model="account.chart.template">
+            <field name="name">PGCE entidades sin ánimo de lucro 2008</field>
+            <field name="complete_tax_set" eval="True"/>
+            <field name="parent_id" ref="account_chart_template_common"/>
+        </record>
+
+        <record id="account_chart_template_assoc_value" model="ir.values">
+            <field name="name">PGCE entidades sin ánimo de lucro 2008</field>
+            <field name="model">account.chart.template</field>
+            <field name="key">default</field>
+            <field name="res_id" ref="account_chart_template_assoc"/>
+            <field name="value" ref="base.EUR"/>
+        </record>
+
+        <record id="account_chart_template_pymes" model="account.chart.template">
+            <field name="name">PGCE PYMEs 2008</field>
+            <field name="complete_tax_set" eval="True"/>
+            <field name="parent_id" ref="account_chart_template_common"/>
+        </record>
+
+        <record id="account_chart_template_pymes_value" model="ir.values">
+            <field name="name">PGCE PYMEs 2008</field>
+            <field name="model">account.chart.template</field>
+            <field name="key">default</field>
+            <field name="res_id" ref="account_chart_template_pymes"/>
+            <field name="value" ref="base.EUR"/>
+        </record>
+
+        <record id="account_chart_template_full" model="account.chart.template">
+            <field name="name">PGCE completo 2008</field>
+            <field name="complete_tax_set" eval="True"/>
+            <field name="parent_id" ref="account_chart_template_common"/>
+        </record>
+
+        <record id="account_chart_template_full_value" model="ir.values">
+            <field name="name">PGCE completo 2008</field>
+            <field name="model">account.chart.template</field>
+            <field name="key">default</field>
+            <field name="res_id" ref="account_chart_template_full"/>
+            <field name="value" ref="base.EUR"/>
+        </record>
+
+    </data>
+</openerp>

addons/l10n_es/account_chart_template_post.xml

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="0">
+        
+        
+        <!-- Plantillas de los planes contables - Asignación del resto de valores -->
+        
+        <record id="account_chart_template_common" model="account.chart.template">
+            <field name="tax_code_root_id" ref="vat_code_chart_root"/>
+            <field name="account_root_id" ref="pgc_0"/>
+            <field name="property_account_receivable" ref="pgc_4300_child"/>
+            <field name="property_account_payable" ref="pgc_4100_child"/>
+            <field name="property_account_expense_categ" ref="pgc_600_child"/>
+            <field name="property_account_income_categ" ref="pgc_7000_child"/>
+        </record>
+        
+        <record id="account_chart_template_full" model="account.chart.template">
+            <field name="tax_code_root_id" ref="vat_code_chart_root"/>
+            <field name="bank_account_view_id" ref="pgc_572"/>
+        </record>
+        
+        <record id="account_chart_template_pymes" model="account.chart.template">
+            <field name="tax_code_root_id" ref="vat_code_chart_root"/>
+            <field name="bank_account_view_id" ref="pgc_572"/>
+        </record>
+        
+        <record id="account_chart_template_assoc" model="account.chart.template">
+            <field name="tax_code_root_id" ref="vat_code_chart_root"/>
+            <field name="bank_account_view_id" ref="pgc_572"/>
+        </record>
+        
+    </data>
+</openerp>

addons/l10n_es/account_type.xml

@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    
+    <!-- Actualizar método de cierre de tipos de cuenta estándar -->
+    
+    <data noupdate="1">
+        <record id="account.data_account_type_income"
+            model="account.account.type">
+            <field name="name">Income</field>
+            <field name="close_method">balance</field>
+        </record>
+        <record id="account.data_account_type_expense"
+            model="account.account.type">
+            <field name="name">Expense</field>
+            <field name="close_method">balance</field>
+        </record>
+    </data>
+    
+    <!-- Tipos de cuenta nuevos -->
+    
+    <data noupdate="0">
+        <record id="account_type_capital" model="account.account.type">
+            <field name="name">Capital</field>
+            <field name="code">capital</field>
+            <field name="report_type">asset</field>
+            <field name="close_method">balance</field>
+        </record>
+        <record id="account_type_inmo" model="account.account.type">
+            <field name="name">Inmovilizado</field>
+            <field name="code">inmo</field>
+            <field name="report_type">asset</field>
+            <field name="close_method">balance</field>
+        </record>
+        <record id="account_type_stock" model="account.account.type">
+            <field name="name">Existencias</field>
+            <field name="code">stock</field>
+            <field name="report_type">asset</field>
+            <field name="close_method">balance</field>
+        </record>
+        <record id="account_type_terceros" model="account.account.type">
+            <field name="name">Terceros</field>
+            <field name="code">terceros</field>
+            <field name="close_method">balance</field>
+        </record>
+        <record id="account_type_financieras" model="account.account.type">
+            <field name="name">Financieras</field>
+            <field name="code">financieras</field>
+            <field name="close_method">balance</field>
+        </record>
+        <record id="account_type_gastos_neto" model="account.account.type">
+            <field name="name">Gastos patrimonio neto</field>
+            <field name="code">gastos_neto</field>
+            <field name="report_type">expense</field>
+            <field name="close_method">balance</field>
+        </record>
+        <record id="account_type_ingresos_neto" model="account.account.type">
+            <field name="name">Ingresos patrimonio neto</field>
+            <field name="code">ingresos_neto</field>
+            <field name="report_type">income</field>
+            <field name="close_method">balance</field>
+        </record>
+    </data>
+    
+</openerp>

addons/l10n_es/fiscal_templates_common.xml

@@ -0,0 +1,970 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="0">
+
+        <!-- Definición de posiciones fiscales Régimen Nacional, Recargo de Equivalencia,
+        Extracomunitario, Intracomunitario y Retención de IRPFs
+
+        Añadidas posiciones fiscales Retención de IRPF 18%, 15%, 7%, 1% :
+        Jordi Esteve (Zikzakmedia) - jesteve@zikzakmedia.com 2009-11-21
+
+        Añadidas posiciones fiscales Retención de IRPF 19%, 2% :
+        Jordi Esteve (Zikzakmedia) - jesteve@zikzakmedia.com 2010-02-18
+
+        Añadido mapeo de cuentas del regimen de equivalencia para compras :
+        Ignacio Ibeas (Acysos) - ignacio@acysos.com 2011-02-22 
+
+        Añadidas posiciones fiscales Retención de IRPF 18%, 15%, 7%, 1% :
+        Jordi Esteve (Zikzakmedia) - jesteve@zikzakmedia.com (2009-11-21)
+
+        Añadidas posiciones fiscales Retención de IRPF 19%, 2% :
+        Jordi Esteve (Zikzakmedia) - jesteve@zikzakmedia.com 2010-02-18
+
+        Añadido mapeo de cuentas del regimen de equivalencia para compras y ventas separados:
+        Ignacio Ibeas (Acysos) - ignacio@acysos.com 2011-05-06
+
+        Eliminación IVAs obsoletos 7%, 8%, 16% y 18%
+        Eliminación IRPFs obsoletos 18% y 19%
+        Eliminación recargos de equivalencia obsoletos 1% y 4%
+        Pedro M. Baeza <pedro.baeza@serviciosbaeza.com> (Serv. Tecnol. Avanzados) (2014-03-20)
+        -->
+
+        <!-- ************************************************************* -->
+        <!-- Fiscal Position Templates -->
+        <!-- ************************************************************* -->
+
+        <record id="fp_nacional" model="account.fiscal.position.template">
+            <field name="name">Régimen Nacional</field>
+            <field name="chart_template_id" ref="account_chart_template_common"/>
+        </record>
+
+        <record id="fp_recargo" model="account.fiscal.position.template">
+            <field name="name">Recargo de Equivalencia</field>
+            <field name="chart_template_id" ref="account_chart_template_common"/>
+        </record>
+
+        <record id="fp_extra" model="account.fiscal.position.template">
+            <field name="name">Régimen Extracomunitario</field>
+            <field name="chart_template_id" ref="account_chart_template_common"/>
+        </record>
+
+        <record id="fp_intra" model="account.fiscal.position.template">
+            <field name="name">Régimen Intracomunitario</field>
+            <field name="chart_template_id" ref="account_chart_template_common"/>
+        </record>
+
+        <record id="fp_irpf21" model="account.fiscal.position.template">
+            <field name="name">Retención IRPF 21%</field>
+            <field name="chart_template_id" ref="account_chart_template_common"/>
+        </record>
+
+        <record id="fp_irpf20" model="account.fiscal.position.template">
+            <field name="name">Retención IRPF 20%</field>
+            <field name="chart_template_id" ref="account_chart_template_common"/>
+        </record>
+
+        <record id="fp_irpf15" model="account.fiscal.position.template">
+            <field name="name">Retención IRPF 15%</field>
+            <field name="chart_template_id" ref="account_chart_template_common"/>
+        </record>
+
+        <record id="fp_irpf9" model="account.fiscal.position.template">
+            <field name="name">Retención IRPF 9%</field>
+            <field name="chart_template_id" ref="account_chart_template_common"/>
+        </record>
+
+        <record id="fp_irpf7" model="account.fiscal.position.template">
+            <field name="name">Retención IRPF 7%</field>
+            <field name="chart_template_id" ref="account_chart_template_common"/>
+        </record>
+
+        <record id="fp_irpf2" model="account.fiscal.position.template">
+            <field name="name">Retención IRPF 2%</field>
+            <field name="chart_template_id" ref="account_chart_template_common"/>
+        </record>
+
+        <record id="fp_irpf1" model="account.fiscal.position.template">
+            <field name="name">Retención IRPF 1%</field>
+            <field name="chart_template_id" ref="account_chart_template_common"/>
+        </record>
+
+        <!-- ************************************************************* -->
+        <!-- Fiscal Position Tax Templates -->
+        <!-- ************************************************************* -->
+
+        <!-- Extracomunitarios -->
+
+        <record id="fptt_extra_4" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_extra"/>
+            <field name="tax_src_id" ref="iva_sop_4"/>
+            <field name="tax_dest_id" ref="iva_X4_compras_bc"/>
+        </record>
+        <record id="fptt_extra_4_inv"
+            model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_extra"/>
+            <field name="tax_src_id" ref="iva_sop_4_inv"/>
+            <field name="tax_dest_id" ref="iva_X4_compras_bi"/>
+        </record>
+        <record id="fptt_extra_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_extra"/>
+            <field name="tax_src_id" ref="iva_sop_10"/>
+            <field name="tax_dest_id" ref="iva_X10_compras_bc"/>
+        </record>
+        <record id="fptt_extra_10_inv"
+            model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_extra"/>
+            <field name="tax_src_id" ref="iva_sop_10_inv"/>
+            <field name="tax_dest_id" ref="iva_X10_compras_bi"/>
+        </record>
+        <record id="fptt_extra_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_extra"/>
+            <field name="tax_src_id" ref="iva_sop_21"/>
+            <field name="tax_dest_id" ref="iva_X21_compras_bc"/>
+        </record>
+        <record id="fptt_extra_21_inv"
+            model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_extra"/>
+            <field name="tax_src_id" ref="iva_sop_21_inv"/>
+            <field name="tax_dest_id" ref="iva_X21_compras_bi"/>
+        </record>
+        <record id="fptt_extra_ventas_4"
+            model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_extra"/>
+            <field name="tax_src_id" ref="iva_rep_4"/>
+            <field name="tax_dest_id" ref="iva_X0"/>
+        </record>
+        <record id="fptt_extra_ventas_10"
+            model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_extra"/>
+            <field name="tax_src_id" ref="iva_rep_10"/>
+            <field name="tax_dest_id" ref="iva_X0"/>
+        </record>
+        <record id="fptt_extra_ventas_21"
+            model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_extra"/>
+            <field name="tax_src_id" ref="iva_rep_21"/>
+            <field name="tax_dest_id" ref="iva_X0"/>
+        </record>
+
+        <!-- Intracomunitarios -->
+
+        <record id="fptt_intra_4" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_intra"/>
+            <field name="tax_src_id" ref="iva_sop_4"/>
+            <field name="tax_dest_id" ref="iva_IC_compras_4_bc"/>
+        </record>
+        <record id="fptt_intra_4_inv"
+            model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_intra"/>
+            <field name="tax_src_id" ref="iva_sop_4_inv"/>
+            <field name="tax_dest_id" ref="iva_IC_compras_4_bi"/>
+        </record>
+        <record id="fptt_intra_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_intra"/>
+            <field name="tax_src_id" ref="iva_sop_10"/>
+            <field name="tax_dest_id" ref="iva_IC_compras_10_bc"/>
+        </record>
+        <record id="fptt_intra_10_inv"
+            model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_intra"/>
+            <field name="tax_src_id" ref="iva_sop_10_inv"/>
+            <field name="tax_dest_id" ref="iva_IC_compras_10_bi"/>
+        </record>
+        <record id="fptt_intra_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_intra"/>
+            <field name="tax_src_id" ref="iva_sop_21"/>
+            <field name="tax_dest_id" ref="iva_IC_compras_21_bc"/>
+        </record>
+        <record id="fptt_intra_21_inv"
+            model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_intra"/>
+            <field name="tax_src_id" ref="iva_sop_21_inv"/>
+            <field name="tax_dest_id" ref="iva_IC_compras_21_bi"/>
+        </record>
+        <record id="fptt_intra_ventas_4"
+            model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_intra"/>
+            <field name="tax_src_id" ref="iva_rep_4"/>
+            <field name="tax_dest_id" ref="iva_IO"/>
+        </record>
+        <record id="fptt_intra_ventas_10"
+            model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_intra"/>
+            <field name="tax_src_id" ref="iva_rep_10"/>
+            <field name="tax_dest_id" ref="iva_IO"/>
+        </record>
+        <record id="fptt_intra_ventas_21"
+            model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_intra"/>
+            <field name="tax_src_id" ref="iva_rep_21"/>
+            <field name="tax_dest_id" ref="iva_IO"/>
+        </record>
+
+        <!-- Recargo de equivalencia -->
+
+        <record id="fptt_recargo_4" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_recargo"/>
+            <field name="tax_src_id" ref="iva_rep_4"/>
+            <field name="tax_dest_id" ref="iva_rep_4"/>
+        </record>
+        <record id="fptt_recargo_4_2"
+            model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_recargo"/>
+            <field name="tax_src_id" ref="iva_rep_4"/>
+            <field name="tax_dest_id" ref="re_05"/>
+        </record>
+        <record id="fptt_recargo_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_recargo"/>
+            <field name="tax_src_id" ref="iva_rep_10"/>
+            <field name="tax_dest_id" ref="iva_rep_10"/>
+        </record>
+        <record id="fptt_recargo_10_2"
+            model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_recargo"/>
+            <field name="tax_src_id" ref="iva_rep_10"/>
+            <field name="tax_dest_id" ref="re_14"/>
+        </record>
+        <record id="fptt_recargo_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_recargo"/>
+            <field name="tax_src_id" ref="iva_rep_21"/>
+            <field name="tax_dest_id" ref="iva_rep_21"/>
+        </record>
+        <record id="fptt_recargo_21_2"
+            model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_recargo"/>
+            <field name="tax_src_id" ref="iva_rep_21"/>
+            <field name="tax_dest_id" ref="re_52"/>
+        </record>
+        <record id="fptt_recargo_buy_4"
+            model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_recargo"/>
+            <field name="tax_src_id" ref="iva_sop_4"/>
+            <field name="tax_dest_id" ref="iva_sop_4"/>
+        </record>
+        <record id="fptt_recargo_buy_4_2"
+            model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_recargo"/>
+            <field name="tax_src_id" ref="iva_sop_4"/>
+            <field name="tax_dest_id" ref="re_buy_05"/>
+        </record>
+        <record id="fptt_recargo_buy_10"
+            model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_recargo"/>
+            <field name="tax_src_id" ref="iva_sop_10"/>
+            <field name="tax_dest_id" ref="iva_sop_10"/>
+        </record>
+        <record id="fptt_recargo_buy_10_2"
+            model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_recargo"/>
+            <field name="tax_src_id" ref="iva_sop_10"/>
+            <field name="tax_dest_id" ref="re_buy_14"/>
+        </record>
+        <record id="fptt_recargo_buy_4_inv"
+            model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_recargo"/>
+            <field name="tax_src_id" ref="iva_sop_4_inv"/>
+            <field name="tax_dest_id" ref="iva_sop_4_inv"/>
+        </record>
+        <record id="fptt_recargo_buy_4_2_inv"
+            model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_recargo"/>
+            <field name="tax_src_id" ref="iva_sop_4_inv"/>
+            <field name="tax_dest_id" ref="re_buy_05"/>
+        </record>
+        <record id="fptt_recargo_buy_10_inv"
+            model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_recargo"/>
+            <field name="tax_src_id" ref="iva_sop_10_inv"/>
+            <field name="tax_dest_id" ref="iva_sop_10_inv"/>
+        </record>
+        <record id="fptt_recargo_buy_10_2_inv"
+            model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_recargo"/>
+            <field name="tax_src_id" ref="iva_sop_10_inv"/>
+            <field name="tax_dest_id" ref="re_buy_14"/>
+        </record>
+        <record id="fptt_recargo_buy_21"
+            model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_recargo"/>
+            <field name="tax_src_id" ref="iva_sop_21"/>
+            <field name="tax_dest_id" ref="iva_sop_21"/>
+        </record>
+        <record id="fptt_recargo_buy_21_2"
+            model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_recargo"/>
+            <field name="tax_src_id" ref="iva_sop_21"/>
+            <field name="tax_dest_id" ref="re_buy_52"/>
+        </record>
+        <record id="fptt_recargo_buy_21_inv"
+            model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_recargo"/>
+            <field name="tax_src_id" ref="iva_sop_21_inv"/>
+            <field name="tax_dest_id" ref="iva_sop_21_inv"/>
+        </record>
+        <record id="fptt_recargo_buy_21_2_inv"
+            model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_recargo"/>
+            <field name="tax_src_id" ref="iva_sop_21_inv"/>
+            <field name="tax_dest_id" ref="re_buy_52"/>
+        </record>
+
+        <!-- Retenciones IRPF 21% -->
+
+        <record id="fptt_irpf21sale_21"
+            model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf21"/>
+            <field name="tax_src_id" ref="iva_rep_21"/>
+            <field name="tax_dest_id" ref="iva_rep_21"/>
+        </record>
+        <record id="fptt_irpf21sale_21_2"
+            model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf21"/>
+            <field name="tax_src_id" ref="iva_rep_21"/>
+            <field name="tax_dest_id" ref="irpf_sale_21"/>
+        </record>
+        <record id="fptt_irpf21sale_10"
+            model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf21"/>
+            <field name="tax_src_id" ref="iva_rep_10"/>
+            <field name="tax_dest_id" ref="iva_rep_10"/>
+        </record>
+        <record id="fptt_irpf21sale_10_2"
+            model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf21"/>
+            <field name="tax_src_id" ref="iva_rep_10"/>
+            <field name="tax_dest_id" ref="irpf_sale_21"/>
+        </record>
+        <record id="fptt_irpf21sale_4"
+            model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf21"/>
+            <field name="tax_src_id" ref="iva_rep_4"/>
+            <field name="tax_dest_id" ref="iva_rep_4"/>
+        </record>
+        <record id="fptt_irpf21sale_4_2"
+            model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf21"/>
+            <field name="tax_src_id" ref="iva_rep_4"/>
+            <field name="tax_dest_id" ref="irpf_sale_21"/>
+        </record>
+        <record id="fptt_irpf21_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf21"/>
+            <field name="tax_src_id" ref="iva_sop_21"/>
+            <field name="tax_dest_id" ref="iva_sop_21"/>
+        </record>
+        <record id="fptt_irpf21_21_2"
+            model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf21"/>
+            <field name="tax_src_id" ref="iva_sop_21"/>
+            <field name="tax_dest_id" ref="irpf_21"/>
+        </record>
+        <record id="fptt_irpf21_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf21"/>
+            <field name="tax_src_id" ref="iva_sop_10"/>
+            <field name="tax_dest_id" ref="iva_sop_10"/>
+        </record>
+        <record id="fptt_irpf21_10_2"
+            model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf21"/>
+            <field name="tax_src_id" ref="iva_sop_10"/>
+            <field name="tax_dest_id" ref="irpf_21"/>
+        </record>
+        <record id="fptt_irpf21_4" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf21"/>
+            <field name="tax_src_id" ref="iva_sop_4"/>
+            <field name="tax_dest_id" ref="iva_sop_4"/>
+        </record>
+        <record id="fptt_irpf21_4_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf21"/>
+            <field name="tax_src_id" ref="iva_sop_4"/>
+            <field name="tax_dest_id" ref="irpf_21"/>
+        </record>
+        <record id="fptt_irpf21sale_ex"
+            model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf21"/>
+            <field name="tax_src_id" ref="iva_rep_ex"/>
+            <field name="tax_dest_id" ref="iva_rep_ex"/>
+        </record>
+        <record id="fptt_irpf21sale_ex_2"
+            model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf21"/>
+            <field name="tax_src_id" ref="iva_rep_ex"/>
+            <field name="tax_dest_id" ref="irpf_sale_21"/>
+        </record>
+        <record id="fptt_irpf21_0" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf21"/>
+            <field name="tax_src_id" ref="iva_sop_ex"/>
+            <field name="tax_dest_id" ref="iva_sop_ex"/>
+        </record>
+        <record id="fptt_irpf21_0_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf21"/>
+            <field name="tax_src_id" ref="iva_sop_ex"/>
+            <field name="tax_dest_id" ref="irpf_21"/>
+        </record>
+
+        <!-- Retenciones IRPF 20% -->
+        <record id="fptt_irpf20sale_21"
+            model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf20"/>
+            <field name="tax_src_id" ref="iva_rep_21"/>
+            <field name="tax_dest_id" ref="iva_rep_21"/>
+        </record>
+        <record id="fptt_irpf20sale_21_2"
+            model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf20"/>
+            <field name="tax_src_id" ref="iva_rep_21"/>
+            <field name="tax_dest_id" ref="irpf_sale_20"/>
+        </record>
+        <record id="fptt_irpf20sale_10"
+            model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf20"/>
+            <field name="tax_src_id" ref="iva_rep_10"/>
+            <field name="tax_dest_id" ref="iva_rep_10"/>
+        </record>
+        <record id="fptt_irpf20sale_10_2"
+            model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf20"/>
+            <field name="tax_src_id" ref="iva_rep_10"/>
+            <field name="tax_dest_id" ref="irpf_sale_20"/>
+        </record>
+        <record id="fptt_irpf20sale_4"
+            model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf20"/>
+            <field name="tax_src_id" ref="iva_rep_4"/>
+            <field name="tax_dest_id" ref="iva_rep_4"/>
+        </record>
+        <record id="fptt_irpf20sale_4_2"
+            model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf20"/>
+            <field name="tax_src_id" ref="iva_rep_4"/>
+            <field name="tax_dest_id" ref="irpf_sale_20"/>
+        </record>
+        <record id="fptt_irpf20_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf20"/>
+            <field name="tax_src_id" ref="iva_sop_21"/>
+            <field name="tax_dest_id" ref="iva_sop_21"/>
+        </record>
+        <record id="fptt_irpf20_21_2"
+            model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf20"/>
+            <field name="tax_src_id" ref="iva_sop_21"/>
+            <field name="tax_dest_id" ref="irpf_20"/>
+        </record>
+        <record id="fptt_irpf20_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf20"/>
+            <field name="tax_src_id" ref="iva_sop_10"/>
+            <field name="tax_dest_id" ref="iva_sop_10"/>
+        </record>
+        <record id="fptt_irpf20_10_2"
+            model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf20"/>
+            <field name="tax_src_id" ref="iva_sop_10"/>
+            <field name="tax_dest_id" ref="irpf_20"/>
+        </record>
+        <record id="fptt_irpf20_4" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf20"/>
+            <field name="tax_src_id" ref="iva_sop_4"/>
+            <field name="tax_dest_id" ref="iva_sop_4"/>
+        </record>
+        <record id="fptt_irpf20_4_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf20"/>
+            <field name="tax_src_id" ref="iva_sop_4"/>
+            <field name="tax_dest_id" ref="irpf_20"/>
+        </record>
+
+        <!-- Retenciones IRPF 15% -->
+
+        <record id="fptt_irpf15sale_21"
+            model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf15"/>
+            <field name="tax_src_id" ref="iva_rep_21"/>
+            <field name="tax_dest_id" ref="iva_rep_21"/>
+        </record>
+        <record id="fptt_irpf15sale_21_2"
+            model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf15"/>
+            <field name="tax_src_id" ref="iva_rep_21"/>
+            <field name="tax_dest_id" ref="irpf_sale_15"/>
+        </record>
+        <record id="fptt_irpf15sale_10"
+            model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf15"/>
+            <field name="tax_src_id" ref="iva_rep_10"/>
+            <field name="tax_dest_id" ref="iva_rep_10"/>
+        </record>
+        <record id="fptt_irpf15sale_10_2"
+            model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf15"/>
+            <field name="tax_src_id" ref="iva_rep_10"/>
+            <field name="tax_dest_id" ref="irpf_sale_15"/>
+        </record>
+        <record id="fptt_irpf15sale_4"
+            model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf15"/>
+            <field name="tax_src_id" ref="iva_rep_4"/>
+            <field name="tax_dest_id" ref="iva_rep_4"/>
+        </record>
+        <record id="fptt_irpf15sale_4_2"
+            model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf15"/>
+            <field name="tax_src_id" ref="iva_rep_4"/>
+            <field name="tax_dest_id" ref="irpf_sale_15"/>
+        </record>
+        <record id="fptt_irpf15_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf15"/>
+            <field name="tax_src_id" ref="iva_sop_21"/>
+            <field name="tax_dest_id" ref="iva_sop_21"/>
+        </record>
+        <record id="fptt_irpf15_21_2"
+            model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf15"/>
+            <field name="tax_src_id" ref="iva_sop_21"/>
+            <field name="tax_dest_id" ref="irpf_15"/>
+        </record>
+        <record id="fptt_irpf15_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf15"/>
+            <field name="tax_src_id" ref="iva_sop_10"/>
+            <field name="tax_dest_id" ref="iva_sop_10"/>
+        </record>
+        <record id="fptt_irpf15_10_2"
+            model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf15"/>
+            <field name="tax_src_id" ref="iva_sop_10"/>
+            <field name="tax_dest_id" ref="irpf_15"/>
+        </record>
+        <record id="fptt_irpf15_4" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf15"/>
+            <field name="tax_src_id" ref="iva_sop_4"/>
+            <field name="tax_dest_id" ref="iva_sop_4"/>
+        </record>
+        <record id="fptt_irpf15_4_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf15"/>
+            <field name="tax_src_id" ref="iva_sop_4"/>
+            <field name="tax_dest_id" ref="irpf_15"/>
+        </record>
+
+        <!-- Retenciones IRPF 9% -->
+
+        <record id="fptt_irpf9sale_21"
+            model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf9"/>
+            <field name="tax_src_id" ref="iva_rep_21"/>
+            <field name="tax_dest_id" ref="iva_rep_21"/>
+        </record>
+        <record id="fptt_irpf9sale_21_2"
+            model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf9"/>
+            <field name="tax_src_id" ref="iva_rep_21"/>
+            <field name="tax_dest_id" ref="irpf_sale_9"/>
+        </record>
+        <record id="fptt_irpf9sale_10"
+            model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf9"/>
+            <field name="tax_src_id" ref="iva_rep_10"/>
+            <field name="tax_dest_id" ref="iva_rep_10"/>
+        </record>
+        <record id="fptt_irpf9sale_10_2"
+            model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf9"/>
+            <field name="tax_src_id" ref="iva_rep_10"/>
+            <field name="tax_dest_id" ref="irpf_sale_9"/>
+        </record>
+        <record id="fptt_irpf9sale_4"
+            model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf9"/>
+            <field name="tax_src_id" ref="iva_rep_4"/>
+            <field name="tax_dest_id" ref="iva_rep_4"/>
+        </record>
+        <record id="fptt_irpf9sale_4_2"
+            model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf9"/>
+            <field name="tax_src_id" ref="iva_rep_4"/>
+            <field name="tax_dest_id" ref="irpf_sale_9"/>
+        </record>
+        <record id="fptt_irpf9_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf9"/>
+            <field name="tax_src_id" ref="iva_sop_21"/>
+            <field name="tax_dest_id" ref="iva_sop_21"/>
+        </record>
+        <record id="fptt_irpf9_21_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf9"/>
+            <field name="tax_src_id" ref="iva_sop_21"/>
+            <field name="tax_dest_id" ref="irpf_9"/>
+        </record>
+        <record id="fptt_irpf9_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf9"/>
+            <field name="tax_src_id" ref="iva_sop_10"/>
+            <field name="tax_dest_id" ref="iva_sop_10"/>
+        </record>
+        <record id="fptt_irpf9_10_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf9"/>
+            <field name="tax_src_id" ref="iva_sop_10"/>
+            <field name="tax_dest_id" ref="irpf_9"/>
+        </record>
+        <record id="fptt_irpf9_4" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf9"/>
+            <field name="tax_src_id" ref="iva_sop_4"/>
+            <field name="tax_dest_id" ref="iva_sop_4"/>
+        </record>
+        <record id="fptt_irpf9_4_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf9"/>
+            <field name="tax_src_id" ref="iva_sop_4"/>
+            <field name="tax_dest_id" ref="irpf_9"/>
+        </record>
+        <record id="fptt_irpf9sale_ex"
+            model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf9"/>
+            <field name="tax_src_id" ref="iva_rep_ex"/>
+            <field name="tax_dest_id" ref="iva_rep_ex"/>
+        </record>
+        <record id="fptt_irpf9sale_ex_2"
+            model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf9"/>
+            <field name="tax_src_id" ref="iva_rep_ex"/>
+            <field name="tax_dest_id" ref="irpf_sale_9"/>
+        </record>
+        <record id="fptt_irpf9_0" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf9"/>
+            <field name="tax_src_id" ref="iva_sop_ex"/>
+            <field name="tax_dest_id" ref="iva_sop_ex"/>
+        </record>
+        <record id="fptt_irpf9_0_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf9"/>
+            <field name="tax_src_id" ref="iva_sop_ex"/>
+            <field name="tax_dest_id" ref="irpf_9"/>
+        </record>
+
+        <!-- Retenciones IRPF 7% -->
+
+        <record id="fptt_irpf7sale_21"
+            model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf7"/>
+            <field name="tax_src_id" ref="iva_rep_21"/>
+            <field name="tax_dest_id" ref="iva_rep_21"/>
+        </record>
+        <record id="fptt_irpf7sale_21_2"
+            model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf7"/>
+            <field name="tax_src_id" ref="iva_rep_21"/>
+            <field name="tax_dest_id" ref="irpf_sale_7"/>
+        </record>
+        <record id="fptt_irpf7sale_10"
+            model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf7"/>
+            <field name="tax_src_id" ref="iva_rep_10"/>
+            <field name="tax_dest_id" ref="iva_rep_10"/>
+        </record>
+        <record id="fptt_irpf7sale_10_2"
+            model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf7"/>
+            <field name="tax_src_id" ref="iva_rep_10"/>
+            <field name="tax_dest_id" ref="irpf_sale_7"/>
+        </record>
+        <record id="fptt_irpf7sale_4"
+            model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf7"/>
+            <field name="tax_src_id" ref="iva_rep_4"/>
+            <field name="tax_dest_id" ref="iva_rep_4"/>
+        </record>
+        <record id="fptt_irpf7sale_4_2"
+            model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf7"/>
+            <field name="tax_src_id" ref="iva_rep_4"/>
+            <field name="tax_dest_id" ref="irpf_sale_7"/>
+        </record>
+        <record id="fptt_irpf7_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf7"/>
+            <field name="tax_src_id" ref="iva_sop_21"/>
+            <field name="tax_dest_id" ref="iva_sop_21"/>
+        </record>
+        <record id="fptt_irpf7_21_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf7"/>
+            <field name="tax_src_id" ref="iva_sop_21"/>
+            <field name="tax_dest_id" ref="irpf_7"/>
+        </record>
+        <record id="fptt_irpf7_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf7"/>
+            <field name="tax_src_id" ref="iva_sop_10"/>
+            <field name="tax_dest_id" ref="iva_sop_10"/>
+        </record>
+        <record id="fptt_irpf7_10_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf7"/>
+            <field name="tax_src_id" ref="iva_sop_10"/>
+            <field name="tax_dest_id" ref="irpf_7"/>
+        </record>
+        <record id="fptt_irpf7_4" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf7"/>
+            <field name="tax_src_id" ref="iva_sop_4"/>
+            <field name="tax_dest_id" ref="iva_sop_4"/>
+        </record>
+        <record id="fptt_irpf7_4_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf7"/>
+            <field name="tax_src_id" ref="iva_sop_4"/>
+            <field name="tax_dest_id" ref="irpf_7"/>
+        </record>
+
+        <!-- Retenciones IRPF 2% -->
+
+        <record id="fptt_irpf2sale_21"
+            model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf2"/>
+            <field name="tax_src_id" ref="iva_rep_21"/>
+            <field name="tax_dest_id" ref="iva_rep_21"/>
+        </record>
+        <record id="fptt_irpf2sale_21_2"
+            model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf2"/>
+            <field name="tax_src_id" ref="iva_rep_21"/>
+            <field name="tax_dest_id" ref="irpf_sale_2"/>
+        </record>
+        <record id="fptt_irpf2sale_10"
+            model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf2"/>
+            <field name="tax_src_id" ref="iva_rep_10"/>
+            <field name="tax_dest_id" ref="iva_rep_10"/>
+        </record>
+        <record id="fptt_irpf2sale_10_2"
+            model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf2"/>
+            <field name="tax_src_id" ref="iva_rep_10"/>
+            <field name="tax_dest_id" ref="irpf_sale_2"/>
+        </record>
+        <record id="fptt_irpf2sale_4"
+            model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf2"/>
+            <field name="tax_src_id" ref="iva_rep_4"/>
+            <field name="tax_dest_id" ref="iva_rep_4"/>
+        </record>
+        <record id="fptt_irpf2sale_4_2"
+            model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf2"/>
+            <field name="tax_src_id" ref="iva_rep_4"/>
+            <field name="tax_dest_id" ref="irpf_sale_2"/>
+        </record>
+        <record id="fptt_irpf2_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf2"/>
+            <field name="tax_src_id" ref="iva_sop_21"/>
+            <field name="tax_dest_id" ref="iva_sop_21"/>
+        </record>
+        <record id="fptt_irpf2_21_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf2"/>
+            <field name="tax_src_id" ref="iva_sop_21"/>
+            <field name="tax_dest_id" ref="irpf_2"/>
+        </record>
+        <record id="fptt_irpf2_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf2"/>
+            <field name="tax_src_id" ref="iva_sop_10"/>
+            <field name="tax_dest_id" ref="iva_sop_10"/>
+        </record>
+        <record id="fptt_irpf2_10_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf2"/>
+            <field name="tax_src_id" ref="iva_sop_10"/>
+            <field name="tax_dest_id" ref="irpf_2"/>
+        </record>
+        <record id="fptt_irpf2_4" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf2"/>
+            <field name="tax_src_id" ref="iva_sop_4"/>
+            <field name="tax_dest_id" ref="iva_sop_4"/>
+        </record>
+        <record id="fptt_irpf2_4_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf2"/>
+            <field name="tax_src_id" ref="iva_sop_4"/>
+            <field name="tax_dest_id" ref="irpf_2"/>
+        </record>
+        <record id="fptt_irpf2sale_ex"
+            model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf2"/>
+            <field name="tax_src_id" ref="iva_rep_ex"/>
+            <field name="tax_dest_id" ref="iva_rep_ex"/>
+        </record>
+        <record id="fptt_irpf2sale_ex_2"
+            model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf2"/>
+            <field name="tax_src_id" ref="iva_rep_ex"/>
+            <field name="tax_dest_id" ref="irpf_sale_2"/>
+        </record>
+        <record id="fptt_irpf2_0" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf2"/>
+            <field name="tax_src_id" ref="iva_sop_ex"/>
+            <field name="tax_dest_id" ref="iva_sop_ex"/>
+        </record>
+        <record id="fptt_irpf2_0_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf2"/>
+            <field name="tax_src_id" ref="iva_sop_ex"/>
+            <field name="tax_dest_id" ref="irpf_2"/>
+        </record>
+
+        <!-- Retenciones IRPF 1% -->
+
+        <record id="fptt_irpf1sale_21"
+            model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf1"/>
+            <field name="tax_src_id" ref="iva_rep_21"/>
+            <field name="tax_dest_id" ref="iva_rep_21"/>
+        </record>
+        <record id="fptt_irpf1sale_21_2"
+            model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf1"/>
+            <field name="tax_src_id" ref="iva_rep_21"/>
+            <field name="tax_dest_id" ref="irpf_sale_1"/>
+        </record>
+        <record id="fptt_irpf1sale_10"
+            model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf1"/>
+            <field name="tax_src_id" ref="iva_rep_10"/>
+            <field name="tax_dest_id" ref="iva_rep_10"/>
+        </record>
+        <record id="fptt_irpf1sale_10_2"
+            model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf1"/>
+            <field name="tax_src_id" ref="iva_rep_10"/>
+            <field name="tax_dest_id" ref="irpf_sale_1"/>
+        </record>
+        <record id="fptt_irpf1sale_4"
+            model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf1"/>
+            <field name="tax_src_id" ref="iva_rep_4"/>
+            <field name="tax_dest_id" ref="iva_rep_4"/>
+        </record>
+        <record id="fptt_irpf1sale_4_2"
+            model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf1"/>
+            <field name="tax_src_id" ref="iva_rep_4"/>
+            <field name="tax_dest_id" ref="irpf_sale_1"/>
+        </record>
+        <record id="fptt_irpf1_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf1"/>
+            <field name="tax_src_id" ref="iva_sop_21"/>
+            <field name="tax_dest_id" ref="iva_sop_21"/>
+        </record>
+        <record id="fptt_irpf1_21_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf1"/>
+            <field name="tax_src_id" ref="iva_sop_21"/>
+            <field name="tax_dest_id" ref="irpf_1"/>
+        </record>
+        <record id="fptt_irpf1_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf1"/>
+            <field name="tax_src_id" ref="iva_sop_10"/>
+            <field name="tax_dest_id" ref="iva_sop_10"/>
+        </record>
+        <record id="fptt_irpf1_10_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf1"/>
+            <field name="tax_src_id" ref="iva_sop_10"/>
+            <field name="tax_dest_id" ref="irpf_1"/>
+        </record>
+        <record id="fptt_irpf1_4" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf1"/>
+            <field name="tax_src_id" ref="iva_sop_4"/>
+            <field name="tax_dest_id" ref="iva_sop_4"/>
+        </record>
+        <record id="fptt_irpf1_4_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf1"/>
+            <field name="tax_src_id" ref="iva_sop_4"/>
+            <field name="tax_dest_id" ref="irpf_1"/>
+        </record>
+        <record id="fptt_irpf1sale_ex"
+            model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf1"/>
+            <field name="tax_src_id" ref="iva_rep_ex"/>
+            <field name="tax_dest_id" ref="iva_rep_ex"/>
+        </record>
+        <record id="fptt_irpf1sale_ex_2"
+            model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf1"/>
+            <field name="tax_src_id" ref="iva_rep_ex"/>
+            <field name="tax_dest_id" ref="irpf_sale_1"/>
+        </record>
+        <record id="fptt_irpf1_0" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf1"/>
+            <field name="tax_src_id" ref="iva_sop_ex"/>
+            <field name="tax_dest_id" ref="iva_sop_ex"/>
+        </record>
+        <record id="fptt_irpf1_0_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf1"/>
+            <field name="tax_src_id" ref="iva_sop_ex"/>
+            <field name="tax_dest_id" ref="irpf_1"/>
+        </record>
+
+        <!-- ************************************************************* -->
+        <!-- Fiscal Position Account Templates -->
+        <!-- ************************************************************* -->
+
+        <!-- Extracomunitarios -->
+
+        <record id="fpat_extra_acc_1"
+            model="account.fiscal.position.account.template">
+            <field name="position_id" ref="fp_extra"/>
+            <field name="account_src_id" ref="pgc_7000_child"/>
+            <field name="account_dest_id" ref="pgc_7002_child"/>
+        </record>
+        <record id="fpat_extra_acc_2"
+            model="account.fiscal.position.account.template">
+            <field name="position_id" ref="fp_extra"/>
+            <field name="account_src_id" ref="pgc_7010_child"/>
+            <field name="account_dest_id" ref="pgc_7012_child"/>
+        </record>
+        <record id="fpat_extra_acc_3"
+            model="account.fiscal.position.account.template">
+            <field name="position_id" ref="fp_extra"/>
+            <field name="account_src_id" ref="pgc_7020_child"/>
+            <field name="account_dest_id" ref="pgc_7022_child"/>
+        </record>
+        <record id="fpat_extra_acc_4"
+            model="account.fiscal.position.account.template">
+            <field name="position_id" ref="fp_extra"/>
+            <field name="account_src_id" ref="pgc_7030_child"/>
+            <field name="account_dest_id" ref="pgc_7032_child"/>
+        </record>
+        <record id="fpat_extra_acc_5"
+            model="account.fiscal.position.account.template">
+            <field name="position_id" ref="fp_extra"/>
+            <field name="account_src_id" ref="pgc_7040_child"/>
+            <field name="account_dest_id" ref="pgc_7042_child"/>
+        </record>
+        <record id="fpat_extra_acc_6"
+            model="account.fiscal.position.account.template">
+            <field name="position_id" ref="fp_extra"/>
+            <field name="account_src_id" ref="pgc_7050_child"/>
+            <field name="account_dest_id" ref="pgc_7052_child"/>
+        </record>
+
+        <!-- Intracomunitarios -->
+
+        <record id="fpat_intra_acc_1"
+            model="account.fiscal.position.account.template">
+            <field name="position_id" ref="fp_intra"/>
+            <field name="account_src_id" ref="pgc_7000_child"/>
+            <field name="account_dest_id" ref="pgc_7001_child"/>
+        </record>
+        <record id="fpat_intra_acc_2"
+            model="account.fiscal.position.account.template">
+            <field name="position_id" ref="fp_intra"/>
+            <field name="account_src_id" ref="pgc_7010_child"/>
+            <field name="account_dest_id" ref="pgc_7011_child"/>
+        </record>
+        <record id="fpat_intra_acc_3"
+            model="account.fiscal.position.account.template">
+            <field name="position_id" ref="fp_intra"/>
+            <field name="account_src_id" ref="pgc_7020_child"/>
+            <field name="account_dest_id" ref="pgc_7021_child"/>
+        </record>
+        <record id="fpat_intra_acc_4"
+            model="account.fiscal.position.account.template">
+            <field name="position_id" ref="fp_intra"/>
+            <field name="account_src_id" ref="pgc_7030_child"/>
+            <field name="account_dest_id" ref="pgc_7031_child"/>
+        </record>
+        <record id="fpat_intra_acc_5"
+            model="account.fiscal.position.account.template">
+            <field name="position_id" ref="fp_intra"/>
+            <field name="account_src_id" ref="pgc_7040_child"/>
+            <field name="account_dest_id" ref="pgc_7041_child"/>
+        </record>
+        <record id="fpat_intra_acc_6"
+            model="account.fiscal.position.account.template">
+            <field name="position_id" ref="fp_intra"/>
+            <field name="account_src_id" ref="pgc_7050_child"/>
+            <field name="account_dest_id" ref="pgc_7051_child"/>
+        </record>
+
+    </data>
+</openerp>

addons/l10n_es/i18n/ar.po

@@ -7,77 +7,47 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
-"PO-Revision-Date: 2012-01-17 10:53+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-05-29 22:03+0000\n"
+"PO-Revision-Date: 2014-05-29 22:40+0000\n"
+"Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\n"
 "Language-Team: Arabic <ar@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:30+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2014-05-30 05:56+0000\n"
+"X-Generator: Launchpad (build 17023)\n"
 
 #. module: l10n_es
-#: model:account.account.type,name:l10n_es.inmo
-msgid "Inmobilizado"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.stock
-msgid "Existencias"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.terceros_-_pay
-msgid "Terceros - A Pagar"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.ingresos_neto
-msgid "Ingresos patrimonio neto"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.gastos_neto
-msgid "Gastos patrimonio neto"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.financieras
-msgid "Financieras"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.tax
-msgid "Impuestos"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.ingresos
-msgid "Ingresos"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.terceros_-_rec
-msgid "Terceros - A Cobrar"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.capital
+#: model:account.account.type,name:l10n_es.account_type_capital
 msgid "Capital"
 msgstr ""
 
 #. module: l10n_es
-#: model:account.account.type,name:l10n_es.gastos
-msgid "Gastos"
+#: model:account.account.type,name:l10n_es.account_type_stock
+msgid "Existencias"
 msgstr ""
 
 #. module: l10n_es
-#: model:account.account.type,name:l10n_es.terceros
+#: model:account.account.type,name:l10n_es.account_type_financieras
+msgid "Financieras"
+msgstr ""
+
+#. module: l10n_es
+#: model:account.account.type,name:l10n_es.account_type_gastos_neto
+msgid "Gastos patrimonio neto"
+msgstr ""
+
+#. module: l10n_es
+#: model:account.account.type,name:l10n_es.account_type_ingresos_neto
+msgid "Ingresos patrimonio neto"
+msgstr ""
+
+#. module: l10n_es
+#: model:account.account.type,name:l10n_es.account_type_inmo
+msgid "Inmovilizado"
+msgstr ""
+
+#. module: l10n_es
+#: model:account.account.type,name:l10n_es.account_type_terceros
 msgid "Terceros"
 msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.view
-msgid "View"
-msgstr "عرض"

addons/l10n_es/i18n/ca.po

@@ -4,83 +4,55 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.6\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
-"PO-Revision-Date: 2010-11-15 12:17+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\n"
+"Project-Id-Version: OpenERP Server 7.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-05-29 22:03+0000\n"
+"PO-Revision-Date: 2013-10-10 16:17+0000\n"
+"Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:30+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2014-05-30 05:56+0000\n"
+"X-Generator: Launchpad (build 17023)\n"
 
 #. module: l10n_es
-#: model:account.account.type,name:l10n_es.inmo
-msgid "Inmobilizado"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.stock
-msgid "Existencias"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.terceros_-_pay
-msgid "Terceros - A Pagar"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.ingresos_neto
-msgid "Ingresos patrimonio neto"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.gastos_neto
-msgid "Gastos patrimonio neto"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.financieras
-msgid "Financieras"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.tax
-msgid "Impuestos"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.ingresos
-msgid "Ingresos"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.terceros_-_rec
-msgid "Terceros - A Cobrar"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.capital
+#: model:account.account.type,name:l10n_es.account_type_capital
 msgid "Capital"
 msgstr ""
 
 #. module: l10n_es
-#: model:account.account.type,name:l10n_es.gastos
-msgid "Gastos"
+#: model:account.account.type,name:l10n_es.account_type_stock
+msgid "Existencias"
 msgstr ""
 
 #. module: l10n_es
-#: model:account.account.type,name:l10n_es.terceros
+#: model:account.account.type,name:l10n_es.account_type_financieras
+msgid "Financieras"
+msgstr ""
+
+#. module: l10n_es
+#: model:account.account.type,name:l10n_es.account_type_gastos_neto
+msgid "Gastos patrimonio neto"
+msgstr ""
+
+#. module: l10n_es
+#: model:account.account.type,name:l10n_es.account_type_ingresos_neto
+msgid "Ingresos patrimonio neto"
+msgstr ""
+
+#. module: l10n_es
+#: model:account.account.type,name:l10n_es.account_type_inmo
+msgid "Inmovilizado"
+msgstr ""
+
+#. module: l10n_es
+#: model:account.account.type,name:l10n_es.account_type_terceros
 msgid "Terceros"
 msgstr ""
 
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.view
-msgid "View"
-msgstr ""
+#~ msgid "Spanish Charts of Accounts (PGCE 2008)"
+#~ msgstr "Pla comptable espanyol (PGCE 2008)"
 
 #~ msgid ""
 #~ "Spanish Charts of Accounts (PGCE 2008)\n"
@@ -106,6 +78,3 @@ msgstr ""
 #~ "\n"
 #~ "Nota: Hauríeu d'instal·lar el mòdul l10n_ES_account_balance_report\n"
 #~ "per a reports de comptes anuals (balanç, perdudes i guanys).\n"
-
-#~ msgid "Spanish Charts of Accounts (PGCE 2008)"
-#~ msgstr "Pla comptable espanyol (PGCE 2008)"

addons/l10n_es/i18n/da.po

@@ -7,77 +7,47 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
-"PO-Revision-Date: 2012-01-27 09:00+0000\n"
+"POT-Creation-Date: 2014-05-29 22:03+0000\n"
+"PO-Revision-Date: 2014-05-29 22:40+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:30+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2014-05-30 05:56+0000\n"
+"X-Generator: Launchpad (build 17023)\n"
 
 #. module: l10n_es
-#: model:account.account.type,name:l10n_es.inmo
-msgid "Inmobilizado"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.stock
-msgid "Existencias"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.terceros_-_pay
-msgid "Terceros - A Pagar"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.ingresos_neto
-msgid "Ingresos patrimonio neto"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.gastos_neto
-msgid "Gastos patrimonio neto"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.financieras
-msgid "Financieras"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.tax
-msgid "Impuestos"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.ingresos
-msgid "Ingresos"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.terceros_-_rec
-msgid "Terceros - A Cobrar"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.capital
+#: model:account.account.type,name:l10n_es.account_type_capital
 msgid "Capital"
 msgstr ""
 
 #. module: l10n_es
-#: model:account.account.type,name:l10n_es.gastos
-msgid "Gastos"
+#: model:account.account.type,name:l10n_es.account_type_stock
+msgid "Existencias"
 msgstr ""
 
 #. module: l10n_es
-#: model:account.account.type,name:l10n_es.terceros
+#: model:account.account.type,name:l10n_es.account_type_financieras
+msgid "Financieras"
+msgstr ""
+
+#. module: l10n_es
+#: model:account.account.type,name:l10n_es.account_type_gastos_neto
+msgid "Gastos patrimonio neto"
+msgstr ""
+
+#. module: l10n_es
+#: model:account.account.type,name:l10n_es.account_type_ingresos_neto
+msgid "Ingresos patrimonio neto"
+msgstr ""
+
+#. module: l10n_es
+#: model:account.account.type,name:l10n_es.account_type_inmo
+msgid "Inmovilizado"
+msgstr ""
+
+#. module: l10n_es
+#: model:account.account.type,name:l10n_es.account_type_terceros
 msgid "Terceros"
 msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.view
-msgid "View"
-msgstr ""

addons/l10n_es/i18n/de.po

@@ -1,112 +1,52 @@
-# German translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* l10n_es
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
-"PO-Revision-Date: 2011-01-12 20:18+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: German <de@li.org>\n"
+"Project-Id-Version: OpenERP Server 7.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-05-29 22:03+0000\n"
+"PO-Revision-Date: 2013-10-10 16:17+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:30+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2014-05-30 05:56+0000\n"
+"X-Generator: Launchpad (build 17023)\n"
 
 #. module: l10n_es
-#: model:account.account.type,name:l10n_es.inmo
-msgid "Inmobilizado"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.stock
-msgid "Existencias"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.terceros_-_pay
-msgid "Terceros - A Pagar"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.ingresos_neto
-msgid "Ingresos patrimonio neto"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.gastos_neto
-msgid "Gastos patrimonio neto"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.financieras
-msgid "Financieras"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.tax
-msgid "Impuestos"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.ingresos
-msgid "Ingresos"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.terceros_-_rec
-msgid "Terceros - A Cobrar"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.capital
+#: model:account.account.type,name:l10n_es.account_type_capital
 msgid "Capital"
 msgstr ""
 
 #. module: l10n_es
-#: model:account.account.type,name:l10n_es.gastos
-msgid "Gastos"
+#: model:account.account.type,name:l10n_es.account_type_stock
+msgid "Existencias"
 msgstr ""
 
 #. module: l10n_es
-#: model:account.account.type,name:l10n_es.terceros
+#: model:account.account.type,name:l10n_es.account_type_financieras
+msgid "Financieras"
+msgstr ""
+
+#. module: l10n_es
+#: model:account.account.type,name:l10n_es.account_type_gastos_neto
+msgid "Gastos patrimonio neto"
+msgstr ""
+
+#. module: l10n_es
+#: model:account.account.type,name:l10n_es.account_type_ingresos_neto
+msgid "Ingresos patrimonio neto"
+msgstr ""
+
+#. module: l10n_es
+#: model:account.account.type,name:l10n_es.account_type_inmo
+msgid "Inmovilizado"
+msgstr ""
+
+#. module: l10n_es
+#: model:account.account.type,name:l10n_es.account_type_terceros
 msgid "Terceros"
 msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.view
-msgid "View"
-msgstr ""
-
-#~ msgid ""
-#~ "Spanish Charts of Accounts (PGCE 2008)\n"
-#~ "\n"
-#~ "* Defines the following chart of account templates:\n"
-#~ "        * Spanish General Chart of Accounts 2008.\n"
-#~ "        * Spanish General Chart of Accounts 2008 for small and medium "
-#~ "companies.\n"
-#~ "* Defines templates for sale and purchase VAT.\n"
-#~ "* Defines tax code templates.\n"
-#~ "\n"
-#~ "Note: You should install the l10n_ES_account_balance_report module\n"
-#~ "for yearly account reporting (balance, profit & losses).\n"
-#~ msgstr ""
-#~ "Spanischer Kontenrahmen (PGCE 2008)\n"
-#~ "\n"
-#~ "* Stellt die folgenden Kontenrahmen bereit:\n"
-#~ "        * Allgemeiner spanischer Kontenrahmen 2008\n"
-#~ "        * Allgemeiner spanischer Kontenrahmen 2008 für kleine und "
-#~ "mittelständische Unternehmen.\n"
-#~ "* Definiert Vorlagen für die Umsatzsteuer für Verkauf und Einkauf\n"
-#~ "* Definiert Vorlagen für Steuersätze\n"
-#~ "\n"
-#~ "Hinweis: Für jährliche Berichte zur Buchhaltung (Bilanz, Überschüsse & "
-#~ "Verluste) sollten Sie das Modul l10n_ES_account_balance_report "
-#~ "installieren.\n"
-
-#~ msgid "Spanish Charts of Accounts (PGCE 2008)"
-#~ msgstr "Spanischer Kontenrahmen (PGCE 2008)"

addons/l10n_es/i18n/es.po

@@ -6,81 +6,51 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
-"PO-Revision-Date: 2010-12-28 07:52+0000\n"
-"Last-Translator: Borja López Soilán (NeoPolus) <borjalopezsoilan@gmail.com>\n"
+"POT-Creation-Date: 2014-05-29 22:03+0000\n"
+"PO-Revision-Date: 2014-05-29 22:43+0000\n"
+"Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:31+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2014-05-30 05:56+0000\n"
+"X-Generator: Launchpad (build 17023)\n"
 
 #. module: l10n_es
-#: model:account.account.type,name:l10n_es.inmo
-msgid "Inmobilizado"
-msgstr "Inmovilizado"
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.stock
-msgid "Existencias"
-msgstr "Existencias"
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.terceros_-_pay
-msgid "Terceros - A Pagar"
-msgstr "Terceros - A pagar"
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.ingresos_neto
-msgid "Ingresos patrimonio neto"
-msgstr "Ingresos patrimonio neto"
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.gastos_neto
-msgid "Gastos patrimonio neto"
-msgstr "Gastos patrimonio neto"
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.financieras
-msgid "Financieras"
-msgstr "Financieras"
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.tax
-msgid "Impuestos"
-msgstr "Impuestos"
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.ingresos
-msgid "Ingresos"
-msgstr "Ingresos"
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.terceros_-_rec
-msgid "Terceros - A Cobrar"
-msgstr "Terceros - A cobrar"
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.capital
+#: model:account.account.type,name:l10n_es.account_type_capital
 msgid "Capital"
 msgstr "Capital"
 
 #. module: l10n_es
-#: model:account.account.type,name:l10n_es.gastos
-msgid "Gastos"
-msgstr "Gastos"
+#: model:account.account.type,name:l10n_es.account_type_stock
+msgid "Existencias"
+msgstr "Existencias"
 
 #. module: l10n_es
-#: model:account.account.type,name:l10n_es.terceros
+#: model:account.account.type,name:l10n_es.account_type_financieras
+msgid "Financieras"
+msgstr "Financieras"
+
+#. module: l10n_es
+#: model:account.account.type,name:l10n_es.account_type_gastos_neto
+msgid "Gastos patrimonio neto"
+msgstr "Gastos patrimonio neto"
+
+#. module: l10n_es
+#: model:account.account.type,name:l10n_es.account_type_ingresos_neto
+msgid "Ingresos patrimonio neto"
+msgstr "Ingresos patrimonio neto"
+
+#. module: l10n_es
+#: model:account.account.type,name:l10n_es.account_type_inmo
+msgid "Inmovilizado"
+msgstr "Inmovilizado"
+
+#. module: l10n_es
+#: model:account.account.type,name:l10n_es.account_type_terceros
 msgid "Terceros"
 msgstr "Terceros"
 
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.view
-msgid "View"
-msgstr "Vista"
-
 #~ msgid "Spanish Charts of Accounts (PGCE 2008)"
 #~ msgstr "Plan Contable Español (PGCE 2008)"
 

addons/l10n_es/i18n/es_CR.po

@@ -1,111 +1,53 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# 	* l10n_es
+# Spanish (Costa Rica) translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.6\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
-"PO-Revision-Date: 2012-02-17 17:44+0000\n"
-"Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@gmail.com>\n"
-"Language-Team: \n"
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-05-29 22:03+0000\n"
+"PO-Revision-Date: 2014-05-29 22:43+0000\n"
+"Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\n"
+"Language-Team: Spanish (Costa Rica) <es_CR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:31+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
-"Language: \n"
+"X-Launchpad-Export-Date: 2014-05-30 05:56+0000\n"
+"X-Generator: Launchpad (build 17023)\n"
 
 #. module: l10n_es
-#: model:account.account.type,name:l10n_es.inmo
-msgid "Inmobilizado"
-msgstr "Inmobilizado"
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.stock
-msgid "Existencias"
-msgstr "Existencias"
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.terceros_-_pay
-msgid "Terceros - A Pagar"
-msgstr "Terceros - A Pagar"
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.ingresos_neto
-msgid "Ingresos patrimonio neto"
-msgstr "Ingresos patrimonio neto"
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.gastos_neto
-msgid "Gastos patrimonio neto"
-msgstr "Gastos patrimonio neto"
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.financieras
-msgid "Financieras"
-msgstr "Financieras"
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.tax
-msgid "Impuestos"
-msgstr "Impuestos"
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.ingresos
-msgid "Ingresos"
-msgstr "Ingresos"
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.terceros_-_rec
-msgid "Terceros - A Cobrar"
-msgstr "Terceros - A Cobrar"
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.capital
+#: model:account.account.type,name:l10n_es.account_type_capital
 msgid "Capital"
 msgstr "Capital"
 
 #. module: l10n_es
-#: model:account.account.type,name:l10n_es.gastos
-msgid "Gastos"
-msgstr "Gastos"
+#: model:account.account.type,name:l10n_es.account_type_stock
+msgid "Existencias"
+msgstr "Existencias"
 
 #. module: l10n_es
-#: model:account.account.type,name:l10n_es.terceros
+#: model:account.account.type,name:l10n_es.account_type_financieras
+msgid "Financieras"
+msgstr "Financieras"
+
+#. module: l10n_es
+#: model:account.account.type,name:l10n_es.account_type_gastos_neto
+msgid "Gastos patrimonio neto"
+msgstr "Gastos patrimonio neto"
+
+#. module: l10n_es
+#: model:account.account.type,name:l10n_es.account_type_ingresos_neto
+msgid "Ingresos patrimonio neto"
+msgstr "Ingresos patrimonio neto"
+
+#. module: l10n_es
+#: model:account.account.type,name:l10n_es.account_type_inmo
+msgid "Inmovilizado"
+msgstr ""
+
+#. module: l10n_es
+#: model:account.account.type,name:l10n_es.account_type_terceros
 msgid "Terceros"
 msgstr "Terceros"
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.view
-msgid "View"
-msgstr "Vista"
-
-#~ msgid "Spanish Charts of Accounts (PGCE 2008)"
-#~ msgstr "Plan Contable Español (PGCE 2008)"
-
-#~ msgid ""
-#~ "Spanish Charts of Accounts (PGCE 2008)\n"
-#~ "\n"
-#~ "* Defines the following chart of account templates:\n"
-#~ "        * Spanish General Chart of Accounts 2008.\n"
-#~ "        * Spanish General Chart of Accounts 2008 for small and medium "
-#~ "companies.\n"
-#~ "* Defines templates for sale and purchase VAT.\n"
-#~ "* Defines tax code templates.\n"
-#~ "\n"
-#~ "Note: You should install the l10n_ES_account_balance_report module\n"
-#~ "for yearly account reporting (balance, profit & losses).\n"
-#~ msgstr ""
-#~ "Plan General Contable Español (PGCE 2008)\n"
-#~ "\n"
-#~ "* Define las siguientes plantillas de planes de cuentas:\n"
-#~ "        * Plan General Contable Español 2008.\n"
-#~ "        * Plan General Contable Español 2008 para pequeñas y medianas "
-#~ "empresas (PYMES).\n"
-#~ "* Define plantillas de impuestos de ventas y compras.\n"
-#~ "* Define plantillas de códigos de impuesto.\n"
-#~ "\n"
-#~ "Note: Debería instalar el módulo l10n_ES_account_balance_report\n"
-#~ "para reportes de cuentas anuales (balance, perdidas y ganancias).\n"

addons/l10n_es/i18n/es_MX.po

@@ -6,44 +6,75 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2010-12-28 07:52+0000\n"
+"POT-Creation-Date: 2014-05-29 22:03+0000\n"
+"PO-Revision-Date: 2014-05-29 22:42+0000\n"
 "Last-Translator: Borja López Soilán (NeoPolus) <borjalopezsoilan@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-05 05:58+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Launchpad-Export-Date: 2014-05-30 05:56+0000\n"
+"X-Generator: Launchpad (build 17023)\n"
 
 #. module: l10n_es
-#: model:ir.module.module,shortdesc:l10n_es.module_meta_information
-msgid "Spanish Charts of Accounts (PGCE 2008)"
-msgstr "Plan Contable Español (PGCE 2008)"
-
-#. module: l10n_es
-#: model:ir.module.module,description:l10n_es.module_meta_information
-msgid ""
-"Spanish Charts of Accounts (PGCE 2008)\n"
-"\n"
-"* Defines the following chart of account templates:\n"
-"        * Spanish General Chart of Accounts 2008.\n"
-"        * Spanish General Chart of Accounts 2008 for small and medium "
-"companies.\n"
-"* Defines templates for sale and purchase VAT.\n"
-"* Defines tax code templates.\n"
-"\n"
-"Note: You should install the l10n_ES_account_balance_report module\n"
-"for yearly account reporting (balance, profit & losses).\n"
+#: model:account.account.type,name:l10n_es.account_type_capital
+msgid "Capital"
 msgstr ""
-"Plan General Contable Español (PGCE 2008)\n"
-"\n"
-"* Define las siguientes plantillas de planes de cuentas:\n"
-"        * Plan General Contable Español 2008.\n"
-"        * Plan General Contable Español 2008 para pequeñas y medianas "
-"empresas (PYMES).\n"
-"* Define plantillas de impuestos de ventas y compras.\n"
-"* Define plantillas de códigos de impuesto.\n"
-"\n"
-"Note: Debería instalar el módulo l10n_ES_account_balance_report\n"
-"para reportes de cuentas anuales (balance, perdidas y ganancias).\n"
+
+#. module: l10n_es
+#: model:account.account.type,name:l10n_es.account_type_stock
+msgid "Existencias"
+msgstr ""
+
+#. module: l10n_es
+#: model:account.account.type,name:l10n_es.account_type_financieras
+msgid "Financieras"
+msgstr ""
+
+#. module: l10n_es
+#: model:account.account.type,name:l10n_es.account_type_gastos_neto
+msgid "Gastos patrimonio neto"
+msgstr ""
+
+#. module: l10n_es
+#: model:account.account.type,name:l10n_es.account_type_ingresos_neto
+msgid "Ingresos patrimonio neto"
+msgstr ""
+
+#. module: l10n_es
+#: model:account.account.type,name:l10n_es.account_type_inmo
+msgid "Inmovilizado"
+msgstr ""
+
+#. module: l10n_es
+#: model:account.account.type,name:l10n_es.account_type_terceros
+msgid "Terceros"
+msgstr ""
+
+#~ msgid "Spanish Charts of Accounts (PGCE 2008)"
+#~ msgstr "Plan Contable Español (PGCE 2008)"
+
+#~ msgid ""
+#~ "Spanish Charts of Accounts (PGCE 2008)\n"
+#~ "\n"
+#~ "* Defines the following chart of account templates:\n"
+#~ "        * Spanish General Chart of Accounts 2008.\n"
+#~ "        * Spanish General Chart of Accounts 2008 for small and medium "
+#~ "companies.\n"
+#~ "* Defines templates for sale and purchase VAT.\n"
+#~ "* Defines tax code templates.\n"
+#~ "\n"
+#~ "Note: You should install the l10n_ES_account_balance_report module\n"
+#~ "for yearly account reporting (balance, profit & losses).\n"
+#~ msgstr ""
+#~ "Plan General Contable Español (PGCE 2008)\n"
+#~ "\n"
+#~ "* Define las siguientes plantillas de planes de cuentas:\n"
+#~ "        * Plan General Contable Español 2008.\n"
+#~ "        * Plan General Contable Español 2008 para pequeñas y medianas "
+#~ "empresas (PYMES).\n"
+#~ "* Define plantillas de impuestos de ventas y compras.\n"
+#~ "* Define plantillas de códigos de impuesto.\n"
+#~ "\n"
+#~ "Note: Debería instalar el módulo l10n_ES_account_balance_report\n"
+#~ "para reportes de cuentas anuales (balance, perdidas y ganancias).\n"

addons/l10n_es/i18n/es_PY.po

@@ -1,86 +1,58 @@
-# Spanish (Paraguay) translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* l10n_es
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
-"PO-Revision-Date: 2011-03-21 16:21+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Spanish (Paraguay) <es_PY@li.org>\n"
+"Project-Id-Version: OpenERP Server 7.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-05-29 22:03+0000\n"
+"PO-Revision-Date: 2013-10-10 16:25+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:31+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2014-05-30 05:56+0000\n"
+"X-Generator: Launchpad (build 17023)\n"
 
 #. module: l10n_es
-#: model:account.account.type,name:l10n_es.inmo
-msgid "Inmobilizado"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.stock
-msgid "Existencias"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.terceros_-_pay
-msgid "Terceros - A Pagar"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.ingresos_neto
-msgid "Ingresos patrimonio neto"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.gastos_neto
-msgid "Gastos patrimonio neto"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.financieras
-msgid "Financieras"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.tax
-msgid "Impuestos"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.ingresos
-msgid "Ingresos"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.terceros_-_rec
-msgid "Terceros - A Cobrar"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.capital
+#: model:account.account.type,name:l10n_es.account_type_capital
 msgid "Capital"
 msgstr ""
 
 #. module: l10n_es
-#: model:account.account.type,name:l10n_es.gastos
-msgid "Gastos"
+#: model:account.account.type,name:l10n_es.account_type_stock
+msgid "Existencias"
 msgstr ""
 
 #. module: l10n_es
-#: model:account.account.type,name:l10n_es.terceros
+#: model:account.account.type,name:l10n_es.account_type_financieras
+msgid "Financieras"
+msgstr ""
+
+#. module: l10n_es
+#: model:account.account.type,name:l10n_es.account_type_gastos_neto
+msgid "Gastos patrimonio neto"
+msgstr ""
+
+#. module: l10n_es
+#: model:account.account.type,name:l10n_es.account_type_ingresos_neto
+msgid "Ingresos patrimonio neto"
+msgstr ""
+
+#. module: l10n_es
+#: model:account.account.type,name:l10n_es.account_type_inmo
+msgid "Inmovilizado"
+msgstr ""
+
+#. module: l10n_es
+#: model:account.account.type,name:l10n_es.account_type_terceros
 msgid "Terceros"
 msgstr ""
 
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.view
-msgid "View"
-msgstr ""
+#~ msgid "Spanish Charts of Accounts (PGCE 2008)"
+#~ msgstr "Plan Contable Español (PGCE 2008)"
 
 #~ msgid ""
 #~ "Spanish Charts of Accounts (PGCE 2008)\n"
@@ -106,6 +78,3 @@ msgstr ""
 #~ "\n"
 #~ "Note: Debería instalar el módulo l10n_ES_account_balance_report\n"
 #~ "para reportes de cuentas anuales (balance, perdidas y ganancias).\n"
-
-#~ msgid "Spanish Charts of Accounts (PGCE 2008)"
-#~ msgstr "Plan Contable Español (PGCE 2008)"

addons/l10n_es/i18n/es_VE.po

@@ -6,44 +6,75 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2010-12-28 07:52+0000\n"
+"POT-Creation-Date: 2014-05-29 22:03+0000\n"
+"PO-Revision-Date: 2014-05-29 22:38+0000\n"
 "Last-Translator: Borja López Soilán (NeoPolus) <borjalopezsoilan@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-05 05:58+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Launchpad-Export-Date: 2014-05-30 05:56+0000\n"
+"X-Generator: Launchpad (build 17023)\n"
 
 #. module: l10n_es
-#: model:ir.module.module,shortdesc:l10n_es.module_meta_information
-msgid "Spanish Charts of Accounts (PGCE 2008)"
-msgstr "Plan Contable Español (PGCE 2008)"
-
-#. module: l10n_es
-#: model:ir.module.module,description:l10n_es.module_meta_information
-msgid ""
-"Spanish Charts of Accounts (PGCE 2008)\n"
-"\n"
-"* Defines the following chart of account templates:\n"
-"        * Spanish General Chart of Accounts 2008.\n"
-"        * Spanish General Chart of Accounts 2008 for small and medium "
-"companies.\n"
-"* Defines templates for sale and purchase VAT.\n"
-"* Defines tax code templates.\n"
-"\n"
-"Note: You should install the l10n_ES_account_balance_report module\n"
-"for yearly account reporting (balance, profit & losses).\n"
+#: model:account.account.type,name:l10n_es.account_type_capital
+msgid "Capital"
 msgstr ""
-"Plan General Contable Español (PGCE 2008)\n"
-"\n"
-"* Define las siguientes plantillas de planes de cuentas:\n"
-"        * Plan General Contable Español 2008.\n"
-"        * Plan General Contable Español 2008 para pequeñas y medianas "
-"empresas (PYMES).\n"
-"* Define plantillas de impuestos de ventas y compras.\n"
-"* Define plantillas de códigos de impuesto.\n"
-"\n"
-"Note: Debería instalar el módulo l10n_ES_account_balance_report\n"
-"para reportes de cuentas anuales (balance, perdidas y ganancias).\n"
+
+#. module: l10n_es
+#: model:account.account.type,name:l10n_es.account_type_stock
+msgid "Existencias"
+msgstr ""
+
+#. module: l10n_es
+#: model:account.account.type,name:l10n_es.account_type_financieras
+msgid "Financieras"
+msgstr ""
+
+#. module: l10n_es
+#: model:account.account.type,name:l10n_es.account_type_gastos_neto
+msgid "Gastos patrimonio neto"
+msgstr ""
+
+#. module: l10n_es
+#: model:account.account.type,name:l10n_es.account_type_ingresos_neto
+msgid "Ingresos patrimonio neto"
+msgstr ""
+
+#. module: l10n_es
+#: model:account.account.type,name:l10n_es.account_type_inmo
+msgid "Inmovilizado"
+msgstr ""
+
+#. module: l10n_es
+#: model:account.account.type,name:l10n_es.account_type_terceros
+msgid "Terceros"
+msgstr ""
+
+#~ msgid "Spanish Charts of Accounts (PGCE 2008)"
+#~ msgstr "Plan Contable Español (PGCE 2008)"
+
+#~ msgid ""
+#~ "Spanish Charts of Accounts (PGCE 2008)\n"
+#~ "\n"
+#~ "* Defines the following chart of account templates:\n"
+#~ "        * Spanish General Chart of Accounts 2008.\n"
+#~ "        * Spanish General Chart of Accounts 2008 for small and medium "
+#~ "companies.\n"
+#~ "* Defines templates for sale and purchase VAT.\n"
+#~ "* Defines tax code templates.\n"
+#~ "\n"
+#~ "Note: You should install the l10n_ES_account_balance_report module\n"
+#~ "for yearly account reporting (balance, profit & losses).\n"
+#~ msgstr ""
+#~ "Plan General Contable Español (PGCE 2008)\n"
+#~ "\n"
+#~ "* Define las siguientes plantillas de planes de cuentas:\n"
+#~ "        * Plan General Contable Español 2008.\n"
+#~ "        * Plan General Contable Español 2008 para pequeñas y medianas "
+#~ "empresas (PYMES).\n"
+#~ "* Define plantillas de impuestos de ventas y compras.\n"
+#~ "* Define plantillas de códigos de impuesto.\n"
+#~ "\n"
+#~ "Note: Debería instalar el módulo l10n_ES_account_balance_report\n"
+#~ "para reportes de cuentas anuales (balance, perdidas y ganancias).\n"

addons/l10n_es/i18n/fr.po

@@ -1,88 +1,56 @@
-# French translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* l10n_es
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
-"PO-Revision-Date: 2011-01-14 00:16+0000\n"
-"Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
-"<maxime.chambreuil@savoirfairelinux.com>\n"
-"Language-Team: French <fr@li.org>\n"
+"Project-Id-Version: OpenERP Server 7.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-05-29 22:03+0000\n"
+"PO-Revision-Date: 2013-10-10 16:29+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:30+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2014-05-30 05:56+0000\n"
+"X-Generator: Launchpad (build 17023)\n"
 
 #. module: l10n_es
-#: model:account.account.type,name:l10n_es.inmo
-msgid "Inmobilizado"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.stock
-msgid "Existencias"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.terceros_-_pay
-msgid "Terceros - A Pagar"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.ingresos_neto
-msgid "Ingresos patrimonio neto"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.gastos_neto
-msgid "Gastos patrimonio neto"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.financieras
-msgid "Financieras"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.tax
-msgid "Impuestos"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.ingresos
-msgid "Ingresos"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.terceros_-_rec
-msgid "Terceros - A Cobrar"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.capital
+#: model:account.account.type,name:l10n_es.account_type_capital
 msgid "Capital"
 msgstr ""
 
 #. module: l10n_es
-#: model:account.account.type,name:l10n_es.gastos
-msgid "Gastos"
+#: model:account.account.type,name:l10n_es.account_type_stock
+msgid "Existencias"
 msgstr ""
 
 #. module: l10n_es
-#: model:account.account.type,name:l10n_es.terceros
+#: model:account.account.type,name:l10n_es.account_type_financieras
+msgid "Financieras"
+msgstr ""
+
+#. module: l10n_es
+#: model:account.account.type,name:l10n_es.account_type_gastos_neto
+msgid "Gastos patrimonio neto"
+msgstr ""
+
+#. module: l10n_es
+#: model:account.account.type,name:l10n_es.account_type_ingresos_neto
+msgid "Ingresos patrimonio neto"
+msgstr ""
+
+#. module: l10n_es
+#: model:account.account.type,name:l10n_es.account_type_inmo
+msgid "Inmovilizado"
+msgstr ""
+
+#. module: l10n_es
+#: model:account.account.type,name:l10n_es.account_type_terceros
 msgid "Terceros"
 msgstr ""
 
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.view
-msgid "View"
-msgstr ""
-
 #~ msgid "Spanish Charts of Accounts (PGCE 2008)"
 #~ msgstr "Plan comptable espagnol (PGCE 2008)"
 

addons/l10n_es/i18n/gl.po

@@ -1,86 +1,58 @@
-# Galician translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* l10n_es
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
-"PO-Revision-Date: 2011-02-14 11:06+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Galician <gl@li.org>\n"
+"Project-Id-Version: OpenERP Server 7.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-05-29 22:03+0000\n"
+"PO-Revision-Date: 2013-10-10 16:29+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:30+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2014-05-30 05:56+0000\n"
+"X-Generator: Launchpad (build 17023)\n"
 
 #. module: l10n_es
-#: model:account.account.type,name:l10n_es.inmo
-msgid "Inmobilizado"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.stock
-msgid "Existencias"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.terceros_-_pay
-msgid "Terceros - A Pagar"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.ingresos_neto
-msgid "Ingresos patrimonio neto"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.gastos_neto
-msgid "Gastos patrimonio neto"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.financieras
-msgid "Financieras"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.tax
-msgid "Impuestos"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.ingresos
-msgid "Ingresos"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.terceros_-_rec
-msgid "Terceros - A Cobrar"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.capital
+#: model:account.account.type,name:l10n_es.account_type_capital
 msgid "Capital"
 msgstr ""
 
 #. module: l10n_es
-#: model:account.account.type,name:l10n_es.gastos
-msgid "Gastos"
+#: model:account.account.type,name:l10n_es.account_type_stock
+msgid "Existencias"
 msgstr ""
 
 #. module: l10n_es
-#: model:account.account.type,name:l10n_es.terceros
+#: model:account.account.type,name:l10n_es.account_type_financieras
+msgid "Financieras"
+msgstr ""
+
+#. module: l10n_es
+#: model:account.account.type,name:l10n_es.account_type_gastos_neto
+msgid "Gastos patrimonio neto"
+msgstr ""
+
+#. module: l10n_es
+#: model:account.account.type,name:l10n_es.account_type_ingresos_neto
+msgid "Ingresos patrimonio neto"
+msgstr ""
+
+#. module: l10n_es
+#: model:account.account.type,name:l10n_es.account_type_inmo
+msgid "Inmovilizado"
+msgstr ""
+
+#. module: l10n_es
+#: model:account.account.type,name:l10n_es.account_type_terceros
 msgid "Terceros"
 msgstr ""
 
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.view
-msgid "View"
-msgstr ""
+#~ msgid "Spanish Charts of Accounts (PGCE 2008)"
+#~ msgstr "Plan Contable Español (PGCE 2008)"
 
 #~ msgid ""
 #~ "Spanish Charts of Accounts (PGCE 2008)\n"
@@ -105,6 +77,3 @@ msgstr ""
 #~ "\n"
 #~ "Nota: Debería instalá-lo módulo \"l10n_ES_account_balance_report\"\n"
 #~ "para os informes financieros anuales (balance, pérdidas e ganancias).\n"
-
-#~ msgid "Spanish Charts of Accounts (PGCE 2008)"
-#~ msgstr "Plan Contable Español (PGCE 2008)"

addons/l10n_es/i18n/hu.po

@@ -1,83 +1,52 @@
-# Hungarian translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* l10n_es
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
-"PO-Revision-Date: 2011-01-10 10:43+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Hungarian <hu@li.org>\n"
+"Project-Id-Version: OpenERP Server 7.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-05-29 22:03+0000\n"
+"PO-Revision-Date: 2013-10-10 16:38+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:30+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2014-05-30 05:56+0000\n"
+"X-Generator: Launchpad (build 17023)\n"
 
 #. module: l10n_es
-#: model:account.account.type,name:l10n_es.inmo
-msgid "Inmobilizado"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.stock
-msgid "Existencias"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.terceros_-_pay
-msgid "Terceros - A Pagar"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.ingresos_neto
-msgid "Ingresos patrimonio neto"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.gastos_neto
-msgid "Gastos patrimonio neto"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.financieras
-msgid "Financieras"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.tax
-msgid "Impuestos"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.ingresos
-msgid "Ingresos"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.terceros_-_rec
-msgid "Terceros - A Cobrar"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.capital
+#: model:account.account.type,name:l10n_es.account_type_capital
 msgid "Capital"
 msgstr ""
 
 #. module: l10n_es
-#: model:account.account.type,name:l10n_es.gastos
-msgid "Gastos"
+#: model:account.account.type,name:l10n_es.account_type_stock
+msgid "Existencias"
 msgstr ""
 
 #. module: l10n_es
-#: model:account.account.type,name:l10n_es.terceros
+#: model:account.account.type,name:l10n_es.account_type_financieras
+msgid "Financieras"
+msgstr ""
+
+#. module: l10n_es
+#: model:account.account.type,name:l10n_es.account_type_gastos_neto
+msgid "Gastos patrimonio neto"
+msgstr ""
+
+#. module: l10n_es
+#: model:account.account.type,name:l10n_es.account_type_ingresos_neto
+msgid "Ingresos patrimonio neto"
+msgstr ""
+
+#. module: l10n_es
+#: model:account.account.type,name:l10n_es.account_type_inmo
+msgid "Inmovilizado"
+msgstr ""
+
+#. module: l10n_es
+#: model:account.account.type,name:l10n_es.account_type_terceros
 msgid "Terceros"
 msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.view
-msgid "View"
-msgstr ""

addons/l10n_es/i18n/it.po

@@ -1,86 +1,55 @@
-# Italian translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* l10n_es
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
-"PO-Revision-Date: 2011-01-13 22:58+0000\n"
-"Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
-"Language-Team: Italian <it@li.org>\n"
+"Project-Id-Version: OpenERP Server 7.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-05-29 22:03+0000\n"
+"PO-Revision-Date: 2013-10-10 16:39+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:31+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2014-05-30 05:56+0000\n"
+"X-Generator: Launchpad (build 17023)\n"
 
 #. module: l10n_es
-#: model:account.account.type,name:l10n_es.inmo
-msgid "Inmobilizado"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.stock
-msgid "Existencias"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.terceros_-_pay
-msgid "Terceros - A Pagar"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.ingresos_neto
-msgid "Ingresos patrimonio neto"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.gastos_neto
-msgid "Gastos patrimonio neto"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.financieras
-msgid "Financieras"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.tax
-msgid "Impuestos"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.ingresos
-msgid "Ingresos"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.terceros_-_rec
-msgid "Terceros - A Cobrar"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.capital
+#: model:account.account.type,name:l10n_es.account_type_capital
 msgid "Capital"
 msgstr ""
 
 #. module: l10n_es
-#: model:account.account.type,name:l10n_es.gastos
-msgid "Gastos"
+#: model:account.account.type,name:l10n_es.account_type_stock
+msgid "Existencias"
 msgstr ""
 
 #. module: l10n_es
-#: model:account.account.type,name:l10n_es.terceros
+#: model:account.account.type,name:l10n_es.account_type_financieras
+msgid "Financieras"
+msgstr ""
+
+#. module: l10n_es
+#: model:account.account.type,name:l10n_es.account_type_gastos_neto
+msgid "Gastos patrimonio neto"
+msgstr ""
+
+#. module: l10n_es
+#: model:account.account.type,name:l10n_es.account_type_ingresos_neto
+msgid "Ingresos patrimonio neto"
+msgstr ""
+
+#. module: l10n_es
+#: model:account.account.type,name:l10n_es.account_type_inmo
+msgid "Inmovilizado"
+msgstr ""
+
+#. module: l10n_es
+#: model:account.account.type,name:l10n_es.account_type_terceros
 msgid "Terceros"
 msgstr ""
 
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.view
-msgid "View"
-msgstr ""
-
 #~ msgid "Spanish Charts of Accounts (PGCE 2008)"
 #~ msgstr "Piano dei conti della Spagna (PGCE 2008)"

addons/l10n_es/i18n/l10n_es.pot

@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 7.0alpha\n"
+"Project-Id-Version: OpenERP Server 7.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
-"PO-Revision-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2014-05-29 22:03+0000\n"
+"PO-Revision-Date: 2014-05-29 22:03+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,67 +16,37 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: l10n_es
-#: model:account.account.type,name:l10n_es.inmo
-msgid "Inmobilizado"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.stock
-msgid "Existencias"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.terceros_-_pay
-msgid "Terceros - A Pagar"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.ingresos_neto
-msgid "Ingresos patrimonio neto"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.gastos_neto
-msgid "Gastos patrimonio neto"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.financieras
-msgid "Financieras"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.tax
-msgid "Impuestos"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.ingresos
-msgid "Ingresos"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.terceros_-_rec
-msgid "Terceros - A Cobrar"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.capital
+#: model:account.account.type,name:l10n_es.account_type_capital
 msgid "Capital"
 msgstr ""
 
 #. module: l10n_es
-#: model:account.account.type,name:l10n_es.gastos
-msgid "Gastos"
+#: model:account.account.type,name:l10n_es.account_type_stock
+msgid "Existencias"
 msgstr ""
 
 #. module: l10n_es
-#: model:account.account.type,name:l10n_es.terceros
+#: model:account.account.type,name:l10n_es.account_type_financieras
+msgid "Financieras"
+msgstr ""
+
+#. module: l10n_es
+#: model:account.account.type,name:l10n_es.account_type_gastos_neto
+msgid "Gastos patrimonio neto"
+msgstr ""
+
+#. module: l10n_es
+#: model:account.account.type,name:l10n_es.account_type_ingresos_neto
+msgid "Ingresos patrimonio neto"
+msgstr ""
+
+#. module: l10n_es
+#: model:account.account.type,name:l10n_es.account_type_inmo
+msgid "Inmovilizado"
+msgstr ""
+
+#. module: l10n_es
+#: model:account.account.type,name:l10n_es.account_type_terceros
 msgid "Terceros"
 msgstr ""
 
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.view
-msgid "View"
-msgstr ""
-

addons/l10n_es/i18n/nl.po

@@ -0,0 +1,53 @@
+# Dutch translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-05-29 22:03+0000\n"
+"PO-Revision-Date: 2014-05-29 22:43+0000\n"
+"Last-Translator: Jan Jurkus (GCE CAD-Service) <ict@gcecad-service.nl>\n"
+"Language-Team: Dutch <nl@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2014-05-30 05:56+0000\n"
+"X-Generator: Launchpad (build 17023)\n"
+
+#. module: l10n_es
+#: model:account.account.type,name:l10n_es.account_type_capital
+msgid "Capital"
+msgstr "Kapitaal"
+
+#. module: l10n_es
+#: model:account.account.type,name:l10n_es.account_type_stock
+msgid "Existencias"
+msgstr ""
+
+#. module: l10n_es
+#: model:account.account.type,name:l10n_es.account_type_financieras
+msgid "Financieras"
+msgstr ""
+
+#. module: l10n_es
+#: model:account.account.type,name:l10n_es.account_type_gastos_neto
+msgid "Gastos patrimonio neto"
+msgstr ""
+
+#. module: l10n_es
+#: model:account.account.type,name:l10n_es.account_type_ingresos_neto
+msgid "Ingresos patrimonio neto"
+msgstr ""
+
+#. module: l10n_es
+#: model:account.account.type,name:l10n_es.account_type_inmo
+msgid "Inmovilizado"
+msgstr ""
+
+#. module: l10n_es
+#: model:account.account.type,name:l10n_es.account_type_terceros
+msgid "Terceros"
+msgstr ""

addons/l10n_es/i18n/oc.po

@@ -1,86 +1,53 @@
 # Occitan (post 1500) translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
 # This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
-"PO-Revision-Date: 2011-11-20 09:22+0000\n"
+"POT-Creation-Date: 2014-05-29 22:03+0000\n"
+"PO-Revision-Date: 2014-05-29 22:39+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Occitan (post 1500) <oc@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:31+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2014-05-30 05:56+0000\n"
+"X-Generator: Launchpad (build 17023)\n"
 
 #. module: l10n_es
-#: model:account.account.type,name:l10n_es.inmo
-msgid "Inmobilizado"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.stock
-msgid "Existencias"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.terceros_-_pay
-msgid "Terceros - A Pagar"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.ingresos_neto
-msgid "Ingresos patrimonio neto"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.gastos_neto
-msgid "Gastos patrimonio neto"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.financieras
-msgid "Financieras"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.tax
-msgid "Impuestos"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.ingresos
-msgid "Ingresos"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.terceros_-_rec
-msgid "Terceros - A Cobrar"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.capital
+#: model:account.account.type,name:l10n_es.account_type_capital
 msgid "Capital"
 msgstr ""
 
 #. module: l10n_es
-#: model:account.account.type,name:l10n_es.gastos
-msgid "Gastos"
+#: model:account.account.type,name:l10n_es.account_type_stock
+msgid "Existencias"
 msgstr ""
 
 #. module: l10n_es
-#: model:account.account.type,name:l10n_es.terceros
+#: model:account.account.type,name:l10n_es.account_type_financieras
+msgid "Financieras"
+msgstr ""
+
+#. module: l10n_es
+#: model:account.account.type,name:l10n_es.account_type_gastos_neto
+msgid "Gastos patrimonio neto"
+msgstr ""
+
+#. module: l10n_es
+#: model:account.account.type,name:l10n_es.account_type_ingresos_neto
+msgid "Ingresos patrimonio neto"
+msgstr ""
+
+#. module: l10n_es
+#: model:account.account.type,name:l10n_es.account_type_inmo
+msgid "Inmovilizado"
+msgstr ""
+
+#. module: l10n_es
+#: model:account.account.type,name:l10n_es.account_type_terceros
 msgid "Terceros"
 msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.view
-msgid "View"
-msgstr ""
-
-#~ msgid "Spanish Charts of Accounts (PGCE 2008)"
-#~ msgstr "Plan comptable espanhòl (PGCE 2008)"

addons/l10n_es/i18n/pt.po

@@ -1,86 +1,55 @@
-# Portuguese translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* l10n_es
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
-"PO-Revision-Date: 2010-12-20 20:33+0000\n"
-"Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
-"Language-Team: Portuguese <pt@li.org>\n"
+"Project-Id-Version: OpenERP Server 7.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-05-29 22:03+0000\n"
+"PO-Revision-Date: 2013-10-10 16:39+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:31+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2014-05-30 05:56+0000\n"
+"X-Generator: Launchpad (build 17023)\n"
 
 #. module: l10n_es
-#: model:account.account.type,name:l10n_es.inmo
-msgid "Inmobilizado"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.stock
-msgid "Existencias"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.terceros_-_pay
-msgid "Terceros - A Pagar"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.ingresos_neto
-msgid "Ingresos patrimonio neto"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.gastos_neto
-msgid "Gastos patrimonio neto"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.financieras
-msgid "Financieras"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.tax
-msgid "Impuestos"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.ingresos
-msgid "Ingresos"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.terceros_-_rec
-msgid "Terceros - A Cobrar"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.capital
+#: model:account.account.type,name:l10n_es.account_type_capital
 msgid "Capital"
 msgstr ""
 
 #. module: l10n_es
-#: model:account.account.type,name:l10n_es.gastos
-msgid "Gastos"
+#: model:account.account.type,name:l10n_es.account_type_stock
+msgid "Existencias"
 msgstr ""
 
 #. module: l10n_es
-#: model:account.account.type,name:l10n_es.terceros
+#: model:account.account.type,name:l10n_es.account_type_financieras
+msgid "Financieras"
+msgstr ""
+
+#. module: l10n_es
+#: model:account.account.type,name:l10n_es.account_type_gastos_neto
+msgid "Gastos patrimonio neto"
+msgstr ""
+
+#. module: l10n_es
+#: model:account.account.type,name:l10n_es.account_type_ingresos_neto
+msgid "Ingresos patrimonio neto"
+msgstr ""
+
+#. module: l10n_es
+#: model:account.account.type,name:l10n_es.account_type_inmo
+msgid "Inmovilizado"
+msgstr ""
+
+#. module: l10n_es
+#: model:account.account.type,name:l10n_es.account_type_terceros
 msgid "Terceros"
 msgstr ""
 
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.view
-msgid "View"
-msgstr ""
-
 #~ msgid "Spanish Charts of Accounts (PGCE 2008)"
 #~ msgstr "Esquema de contas espanhol (PGCE 2008)"

addons/l10n_es/i18n/pt_BR.po

@@ -7,80 +7,54 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
-"PO-Revision-Date: 2011-03-09 22:32+0000\n"
-"Last-Translator: Emerson <Unknown>\n"
+"POT-Creation-Date: 2014-05-29 22:03+0000\n"
+"PO-Revision-Date: 2014-05-29 22:40+0000\n"
+"Last-Translator: Fábio Martinelli - http://zupy.com.br "
+"<webmaster@zupy.com.br>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:31+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2014-05-30 05:56+0000\n"
+"X-Generator: Launchpad (build 17023)\n"
 
 #. module: l10n_es
-#: model:account.account.type,name:l10n_es.inmo
-msgid "Inmobilizado"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.stock
-msgid "Existencias"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.terceros_-_pay
-msgid "Terceros - A Pagar"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.ingresos_neto
-msgid "Ingresos patrimonio neto"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.gastos_neto
-msgid "Gastos patrimonio neto"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.financieras
-msgid "Financieras"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.tax
-msgid "Impuestos"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.ingresos
-msgid "Ingresos"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.terceros_-_rec
-msgid "Terceros - A Cobrar"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.capital
+#: model:account.account.type,name:l10n_es.account_type_capital
 msgid "Capital"
+msgstr "Capital"
+
+#. module: l10n_es
+#: model:account.account.type,name:l10n_es.account_type_stock
+msgid "Existencias"
+msgstr "Estoques"
+
+#. module: l10n_es
+#: model:account.account.type,name:l10n_es.account_type_financieras
+msgid "Financieras"
+msgstr "Financeiras"
+
+#. module: l10n_es
+#: model:account.account.type,name:l10n_es.account_type_gastos_neto
+msgid "Gastos patrimonio neto"
+msgstr "Despesas Líquidas"
+
+#. module: l10n_es
+#: model:account.account.type,name:l10n_es.account_type_ingresos_neto
+msgid "Ingresos patrimonio neto"
+msgstr "Resultado de equivalência patrimonial"
+
+#. module: l10n_es
+#: model:account.account.type,name:l10n_es.account_type_inmo
+msgid "Inmovilizado"
 msgstr ""
 
 #. module: l10n_es
-#: model:account.account.type,name:l10n_es.gastos
-msgid "Gastos"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.terceros
+#: model:account.account.type,name:l10n_es.account_type_terceros
 msgid "Terceros"
-msgstr ""
+msgstr "Terceiros"
 
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.view
-msgid "View"
-msgstr ""
+#~ msgid "Spanish Charts of Accounts (PGCE 2008)"
+#~ msgstr "Spanish Charts of Accounts (PGCE 2008)"
 
 #~ msgid ""
 #~ "Spanish Charts of Accounts (PGCE 2008)\n"
@@ -106,6 +80,3 @@ msgstr ""
 #~ "\n"
 #~ "Note: You should install the l10n_ES_account_balance_report module\n"
 #~ "for yearly account reporting (balance, profit & losses).\n"
-
-#~ msgid "Spanish Charts of Accounts (PGCE 2008)"
-#~ msgstr "Spanish Charts of Accounts (PGCE 2008)"

addons/l10n_es/i18n/sl.po

@@ -0,0 +1,53 @@
+# Slovenian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-05-29 22:03+0000\n"
+"PO-Revision-Date: 2014-05-29 22:39+0000\n"
+"Last-Translator: Dušan Laznik (Mentis) <laznik@mentis.si>\n"
+"Language-Team: Slovenian <sl@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2014-05-30 05:56+0000\n"
+"X-Generator: Launchpad (build 17023)\n"
+
+#. module: l10n_es
+#: model:account.account.type,name:l10n_es.account_type_capital
+msgid "Capital"
+msgstr "Capital"
+
+#. module: l10n_es
+#: model:account.account.type,name:l10n_es.account_type_stock
+msgid "Existencias"
+msgstr "Existencias"
+
+#. module: l10n_es
+#: model:account.account.type,name:l10n_es.account_type_financieras
+msgid "Financieras"
+msgstr "Financieras"
+
+#. module: l10n_es
+#: model:account.account.type,name:l10n_es.account_type_gastos_neto
+msgid "Gastos patrimonio neto"
+msgstr "Gastos patrimonio neto"
+
+#. module: l10n_es
+#: model:account.account.type,name:l10n_es.account_type_ingresos_neto
+msgid "Ingresos patrimonio neto"
+msgstr "Ingresos patrimonio neto"
+
+#. module: l10n_es
+#: model:account.account.type,name:l10n_es.account_type_inmo
+msgid "Inmovilizado"
+msgstr ""
+
+#. module: l10n_es
+#: model:account.account.type,name:l10n_es.account_type_terceros
+msgid "Terceros"
+msgstr "Terceros"

addons/l10n_es/i18n/sr@latin.po

@@ -1,110 +1,52 @@
-# Serbian latin translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* l10n_es
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
-"PO-Revision-Date: 2011-10-13 15:18+0000\n"
-"Last-Translator: Milan Milosevic <Unknown>\n"
-"Language-Team: Serbian latin <sr@latin@li.org>\n"
+"Project-Id-Version: OpenERP Server 7.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-05-29 22:03+0000\n"
+"PO-Revision-Date: 2013-10-10 16:40+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:31+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2014-05-30 05:56+0000\n"
+"X-Generator: Launchpad (build 17023)\n"
 
 #. module: l10n_es
-#: model:account.account.type,name:l10n_es.inmo
-msgid "Inmobilizado"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.stock
-msgid "Existencias"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.terceros_-_pay
-msgid "Terceros - A Pagar"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.ingresos_neto
-msgid "Ingresos patrimonio neto"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.gastos_neto
-msgid "Gastos patrimonio neto"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.financieras
-msgid "Financieras"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.tax
-msgid "Impuestos"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.ingresos
-msgid "Ingresos"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.terceros_-_rec
-msgid "Terceros - A Cobrar"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.capital
+#: model:account.account.type,name:l10n_es.account_type_capital
 msgid "Capital"
 msgstr ""
 
 #. module: l10n_es
-#: model:account.account.type,name:l10n_es.gastos
-msgid "Gastos"
+#: model:account.account.type,name:l10n_es.account_type_stock
+msgid "Existencias"
 msgstr ""
 
 #. module: l10n_es
-#: model:account.account.type,name:l10n_es.terceros
+#: model:account.account.type,name:l10n_es.account_type_financieras
+msgid "Financieras"
+msgstr ""
+
+#. module: l10n_es
+#: model:account.account.type,name:l10n_es.account_type_gastos_neto
+msgid "Gastos patrimonio neto"
+msgstr ""
+
+#. module: l10n_es
+#: model:account.account.type,name:l10n_es.account_type_ingresos_neto
+msgid "Ingresos patrimonio neto"
+msgstr ""
+
+#. module: l10n_es
+#: model:account.account.type,name:l10n_es.account_type_inmo
+msgid "Inmovilizado"
+msgstr ""
+
+#. module: l10n_es
+#: model:account.account.type,name:l10n_es.account_type_terceros
 msgid "Terceros"
 msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.view
-msgid "View"
-msgstr ""
-
-#~ msgid ""
-#~ "Spanish Charts of Accounts (PGCE 2008)\n"
-#~ "\n"
-#~ "* Defines the following chart of account templates:\n"
-#~ "        * Spanish General Chart of Accounts 2008.\n"
-#~ "        * Spanish General Chart of Accounts 2008 for small and medium "
-#~ "companies.\n"
-#~ "* Defines templates for sale and purchase VAT.\n"
-#~ "* Defines tax code templates.\n"
-#~ "\n"
-#~ "Note: You should install the l10n_ES_account_balance_report module\n"
-#~ "for yearly account reporting (balance, profit & losses).\n"
-#~ msgstr ""
-#~ "Računske tabele za Španiju (PGCE 2008)\n"
-#~ "\n"
-#~ "*Definiše sledeće modele za računske tabele:\n"
-#~ "        *Opšte računske tabele za Španiju 2008.\n"
-#~ "        *OPšte računske tabele za Španiju za mala i srednja preduzeća.\n"
-#~ "*Definiše modele za prodaju i nabavku VAT-a.\n"
-#~ "*Definiše model za takseni kod.\n"
-#~ "\n"
-#~ "Beleška: Trebalo bi da instalirate modul ''l10n_ES_account_balance_report''\n"
-#~ "za godišnje izveštaje o računu (balans, prihod i rashod).\n"
-
-#~ msgid "Spanish Charts of Accounts (PGCE 2008)"
-#~ msgstr "Računske tabele za Španiju (PGCE 2008)"

addons/l10n_es/i18n/tr.po

@@ -1,86 +1,53 @@
 # Turkish translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
 # This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
-"PO-Revision-Date: 2011-06-08 10:18+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-05-29 22:03+0000\n"
+"PO-Revision-Date: 2014-05-29 22:43+0000\n"
+"Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:31+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2014-05-30 05:56+0000\n"
+"X-Generator: Launchpad (build 17023)\n"
 
 #. module: l10n_es
-#: model:account.account.type,name:l10n_es.inmo
-msgid "Inmobilizado"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.stock
-msgid "Existencias"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.terceros_-_pay
-msgid "Terceros - A Pagar"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.ingresos_neto
-msgid "Ingresos patrimonio neto"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.gastos_neto
-msgid "Gastos patrimonio neto"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.financieras
-msgid "Financieras"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.tax
-msgid "Impuestos"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.ingresos
-msgid "Ingresos"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.terceros_-_rec
-msgid "Terceros - A Cobrar"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.capital
+#: model:account.account.type,name:l10n_es.account_type_capital
 msgid "Capital"
+msgstr "Capital"
+
+#. module: l10n_es
+#: model:account.account.type,name:l10n_es.account_type_stock
+msgid "Existencias"
+msgstr "Existencias"
+
+#. module: l10n_es
+#: model:account.account.type,name:l10n_es.account_type_financieras
+msgid "Financieras"
+msgstr "Financieras"
+
+#. module: l10n_es
+#: model:account.account.type,name:l10n_es.account_type_gastos_neto
+msgid "Gastos patrimonio neto"
+msgstr "Gastos patrimonio neto"
+
+#. module: l10n_es
+#: model:account.account.type,name:l10n_es.account_type_ingresos_neto
+msgid "Ingresos patrimonio neto"
+msgstr "Ingresos patrimonio neto"
+
+#. module: l10n_es
+#: model:account.account.type,name:l10n_es.account_type_inmo
+msgid "Inmovilizado"
 msgstr ""
 
 #. module: l10n_es
-#: model:account.account.type,name:l10n_es.gastos
-msgid "Gastos"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.terceros
+#: model:account.account.type,name:l10n_es.account_type_terceros
 msgid "Terceros"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.view
-msgid "View"
-msgstr ""
-
-#~ msgid "Spanish Charts of Accounts (PGCE 2008)"
-#~ msgstr "İspanya Hesap tabloları (PGCE 2008)"
+msgstr "Terceros"

addons/l10n_es/l10n_es_wizard.xml

@@ -1,8 +1,9 @@
 <openerp>
     <data noupdate="1">
-        <record id="account.action_wizard_multi_chart_todo" model="ir.actions.todo">
+        <record id="account.action_wizard_multi_chart_todo"
+            model="ir.actions.todo">
             <field name="state">open</field>
         </record>
-
+        
     </data>
-</openerp>
+</openerp>

addons/l10n_es/tax_codes_common.xml

@@ -0,0 +1,775 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="0">
+
+        <!-- Plantilla de códigos de impuestos según fiscalidad española. 
+
+        Pedro M. Baeza (Serv. Tecnol. Avanzados) - pedro.baeza@serviciosbaeza.com (2013-05-19)
+        Refactorización general
+
+        Pedro M. Baeza (Serv. Tecnol. Avanzados) - pedro.baeza@serviciosbaeza.com (2014-03-20)
+        Eliminación IVAs obsoletos 7%, 8%, 16% y 18%
+        Eliminación IRPFs obsoletos 18% y 19%
+        Eliminación recargos de equivalencia obsoletos 1% y 4%
+
+        Pablo Cayuela (Aserti Global Solutions) - soporte@aserti.com (2014-04-01)
+        Añadidos códigos para el IVA agrario
+        Cambio en los nombres para reflejar que los antiguos códigos de
+        adquisiciones intracomunitarias de bienes incluyen también servicios
+
+        -->
+
+        <record id="vat_code_chart_root" model="account.tax.code.template">
+            <field name="name">Plan de impuestos español</field>
+        </record>
+
+        <!-- *********************************************** -->
+        <!--IVA DEVENGADO -->
+        <!-- *********************************************** -->
+
+        <!--Base imponible-->
+        <record id="iva_dev_base" model="account.tax.code.template">
+            <field name="name">IVA devengado. Base imponible</field>
+            <field name="code">--</field>
+            <field name="sign">1.0</field>
+            <field name="parent_id" ref="vat_code_chart_root"/>
+        </record>
+
+        <!-- Exentas IVA -->
+        <record id="base_sop_ex" model="account.tax.code.template">
+            <field name="name">Base adquisiciones exentas</field>
+            <field name="parent_id" ref="vat_code_chart_root"/>
+            <field name="code">--</field>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="base_rep_ex" model="account.tax.code.template">
+            <field name="name">Base ventas exentas</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="vat_code_chart_root"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <!--Régimen general-->
+
+        <record id="iva_dev_01" model="account.tax.code.template">
+            <field name="name">Régimen general IVA devengado. Base imponible 4%</field>
+            <field name="code">[01]</field>
+            <field name="parent_id" ref="iva_dev_base"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_dev_04_10" model="account.tax.code.template">
+            <field name="name">Régimen general IVA devengado. Base imponible 10%</field>
+            <field name="code">[04]</field>
+            <field name="parent_id" ref="iva_dev_base"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_dev_07_21" model="account.tax.code.template">
+            <field name="name">Régimen general IVA devengado. Base imponible 21%</field>
+            <field name="code">[07]</field>
+            <field name="parent_id" ref="iva_dev_base"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_dev_10" model="account.tax.code.template">
+            <field name="name">Recargo equivalencia base imponible 0.5%</field>
+            <field name="code">[10]</field>
+            <field name="parent_id" ref="iva_dev_base"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_dev_13_14" model="account.tax.code.template">
+            <field name="name">Recargo equivalencia base imponible 1.4%</field>
+            <field name="code">[13]</field>
+            <field name="parent_id" ref="iva_dev_base"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_dev_16_52" model="account.tax.code.template">
+            <field name="name">Recargo equivalencia base imponible 5.2%</field>
+            <field name="code">[16]</field>
+            <field name="parent_id" ref="iva_dev_base"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <!-- ADQUISICIONES INTRACOMUNITARIAS -->
+
+        <record id="iva_dev_19" model="account.tax.code.template">
+            <field name="name">Adquisiciones intracomunitarias. Base imponible</field>
+            <field name="code">[19]</field>
+            <field name="parent_id" ref="iva_dev_base"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <!--IVA devengado cuota-->
+        <!-- *********************************************** -->
+
+        <!--Régimen general-->
+        <record id="iva_dev_21" model="account.tax.code.template">
+            <field name="name">IVA cuota total devengada</field>
+            <field name="code">[21]</field>
+            <field name="sign">1.0</field>
+            <field name="parent_id" ref="vat_code_chart_root"/>
+        </record>
+        <record id="iva_dev_03" model="account.tax.code.template">
+            <field name="name">Régimen general IVA devengado. Cuota 4%</field>
+            <field name="code">[03]</field>
+            <field name="parent_id" ref="iva_dev_21"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_dev_06_10" model="account.tax.code.template">
+            <field name="name">Régimen general IVA devengado. Cuota 10%</field>
+            <field name="code">[06]</field>
+            <field name="parent_id" ref="iva_dev_21"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_dev_09_21" model="account.tax.code.template">
+            <field name="name">Régimen general IVA devengado. Cuota 21%</field>
+            <field name="code">[09]</field>
+            <field name="parent_id" ref="iva_dev_21"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_dev_12" model="account.tax.code.template">
+            <field name="name">Recargo equivalencia. Cuota 0.5%</field>
+            <field name="code">[12]</field>
+            <field name="parent_id" ref="iva_dev_21"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_dev_15_14" model="account.tax.code.template">
+            <field name="name">Recargo equivalencia. Cuota 1.4%</field>
+            <field name="code">[15]</field>
+            <field name="parent_id" ref="iva_dev_21"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_dev_18_52" model="account.tax.code.template">
+            <field name="name">Recargo equivalencia. Cuota 5.2%</field>
+            <field name="code">[18]</field>
+            <field name="parent_id" ref="iva_dev_21"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <!-- ADQUISICIONES INTRACOMUNITARIAS -->
+
+        <record id="iva_dev_20" model="account.tax.code.template">
+            <field name="name">Adquisiciones intracomunitarias. Cuota</field>
+            <field name="code">[20]</field>
+            <field name="parent_id" ref="iva_dev_21"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <!-- *********************************************** -->
+        <!--IVA DEDUCIBLE -->
+        <!-- *********************************************** -->
+        <!--IVA Soportado (Deducible) Base Imponible-->
+        <!-- *********************************************** -->
+        <record id="iva_ded_base_total" model="account.tax.code.template">
+            <field name="name">IVA deducible. Base imponible</field>
+            <field name="code">--</field>
+            <field name="sign">1.0</field>
+            <field name="parent_id" ref="vat_code_chart_root"/>
+        </record>
+
+        <!-- Base en REGIMEN ESPECIAL A., G. y P. -->
+        <record id="base_sop_agr" model="account.tax.code.template">
+            <field name="name">Base de compensaciones Régimen Especial A., G. y P. 12%</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_ded_base_total"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <!-- Base en OPERACIONES INTERIORES CORRIENTES-->
+        <record id="iva_ded_22" model="account.tax.code.template">
+            <field name="name">Base operaciones interiores corrientes</field>
+            <field name="code">[22]</field>
+            <field name="parent_id" ref="iva_ded_base_total"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_ded_22_4" model="account.tax.code.template">
+            <field name="name">Base operaciones interiores corrientes (4%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_ded_22"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_ded_22_10" model="account.tax.code.template">
+            <field name="name">Base operaciones interiores corrientes (10%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_ded_22"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_ded_22_21" model="account.tax.code.template">
+            <field name="name">Base operaciones interiores corrientes (21%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_ded_22"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <!-- Base en OPERACIONES INTERIORES CON BIENES DE INVERSIÓN-->
+        <record id="iva_ded_24" model="account.tax.code.template">
+            <field name="name">Base operaciones interiores bienes inversión</field>
+            <field name="code">[24]</field>
+            <field name="parent_id" ref="iva_ded_base_total"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_ded_24_4" model="account.tax.code.template">
+            <field name="name">Base operaciones interiores bienes inversión (4%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_ded_24"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_ded_24_10" model="account.tax.code.template">
+            <field name="name">Base operaciones interiores bienes inversión (10%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_ded_24"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_ded_24_21" model="account.tax.code.template">
+            <field name="name">Base operaciones interiores bienes inversión (21%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_ded_24"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <!-- Base EN LAS IMPORTACIONES DE BIENES CORRIENTES-->
+        <record id="iva_ded_26" model="account.tax.code.template">
+            <field name="name">Base importaciones bienes y servicios corrientes</field>
+            <field name="code">[26]</field>
+            <field name="parent_id" ref="iva_ded_base_total"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_ded_26_4" model="account.tax.code.template">
+            <field name="name">Base importaciones bienes y servicios corrientes (4%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_ded_26"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_ded_26_10" model="account.tax.code.template">
+            <field name="name">Base importaciones bienes y servicios corrientes (10%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_ded_26"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_ded_26_21" model="account.tax.code.template">
+            <field name="name">Base importaciones bienes y servicios corrientes (21%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_ded_26"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <!-- Base EN LAS IMPORTACIONES DE BIENES DE INVERSIÓN-->
+        <record id="iva_ded_28" model="account.tax.code.template">
+            <field name="name">Base importaciones bienes inversión</field>
+            <field name="code">[28]</field>
+            <field name="parent_id" ref="iva_ded_base_total"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_ded_28_4" model="account.tax.code.template">
+            <field name="name">Base importaciones bienes inversión (4%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_ded_28"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_ded_28_10" model="account.tax.code.template">
+            <field name="name">Base importaciones bienes inversión (10%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_ded_28"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_ded_28_21" model="account.tax.code.template">
+            <field name="name">Base importaciones bienes inversión (21%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_ded_28"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <!-- ADQUISICIONES INTRACOMUNITARIAS DE BIENES CORRIENTES-->
+        <record id="iva_ded_30" model="account.tax.code.template">
+            <field name="name">Base adquisiciones intracomunitarias bienes y servicios corrientes</field>
+            <field name="code">[30]</field>
+            <field name="parent_id" ref="iva_ded_base_total"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_ded_30_4" model="account.tax.code.template">
+            <field name="name">Base adquisiciones intracomunitarias bienes y servicios corrientes (4%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_ded_30"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_ded_30_10" model="account.tax.code.template">
+            <field name="name">Base adquisiciones intracomunitarias bienes y servicios corrientes (10%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_ded_30"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_ded_30_21" model="account.tax.code.template">
+            <field name="name">Base adquisiciones intracomunitarias bienes y servicios corrientes (21%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_ded_30"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <!-- ADQUISICIONES INTRACOMUNITARIAS DE BIENES DE INVERSIÓN-->
+        <record id="iva_ded_32" model="account.tax.code.template">
+            <field name="name">Base adquisiciones intracomunitarias bienes inversión</field>
+            <field name="code">[32]</field>
+            <field name="parent_id" ref="iva_ded_base_total"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_ded_32_4" model="account.tax.code.template">
+            <field name="name">Base adquisiciones intracomunitarias bienes inversión (4%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_ded_32"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_ded_32_10" model="account.tax.code.template">
+            <field name="name">Base adquisiciones intracomunitarias bienes inversión (10%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_ded_32"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_ded_32_21" model="account.tax.code.template">
+            <field name="name">Base adquisiciones intracomunitarias bienes inversión (21%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_ded_32"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <!-- BASE RECARGO DE EQUIVALENCIA-->
+        <record id="iva_ded_10" model="account.tax.code.template">
+            <field name="name">Recargo equivalencia ded. Base imponible 0.5%</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_ded_base_total"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_ded_13_14" model="account.tax.code.template">
+            <field name="name">Recargo equivalencia ded. Base imponible 1.4%</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_ded_base_total"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_ded_16_52" model="account.tax.code.template">
+            <field name="name">Recargo equivalencia ded. Base imponible 5.2%</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_ded_base_total"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <!-- IVA DEDUCIBLE Cuotas-->
+        <!-- *********************************************** -->
+
+        <record id="iva_ded_cuota_total" model="account.tax.code.template">
+            <field name="name">IVA deducible (Cuota)- Total a deducir [Mod.303]</field>
+            <field name="code">[37]</field>
+            <field name="parent_id" ref="vat_code_chart_root"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <!-- Cuotas en REGIMEN ESPECIAL A., G. y P. -->
+        <record id="iva_ded_34" model="account.tax.code.template">
+            <field name="name">Compensaciones Régimen Especial A., G. y P. 12%</field>
+            <field name="code">34</field>
+            <field name="parent_id" ref="iva_ded_cuota_total"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <!-- Cuotas en OPERACIONES INTERIORES CORRIENTES-->
+        <record id="iva_ded_23" model="account.tax.code.template">
+            <field name="name">Cuotas soportadas operaciones interiores corrientes</field>
+            <field name="code">[23]</field>
+            <field name="parent_id" ref="iva_ded_cuota_total"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_ded_23_4" model="account.tax.code.template">
+            <field name="name">Cuotas soportadas operaciones interiores corrientes (4%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_ded_23"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_ded_23_10" model="account.tax.code.template">
+            <field name="name">Cuotas soportadas operaciones interiores corrientes (10%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_ded_23"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_ded_23_21" model="account.tax.code.template">
+            <field name="name">Cuotas soportadas operaciones interiores corrientes (21%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_ded_23"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <!-- Cuotas en OPERACIONES INTERIORES CON BIENES DE INVERSIÓN-->
+        <record id="iva_ded_25" model="account.tax.code.template">
+            <field name="name">Cuotas soportadas operaciones interiores bienes inversión</field>
+            <field name="code">[25]</field>
+            <field name="parent_id" ref="iva_ded_cuota_total"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_ded_25_4" model="account.tax.code.template">
+            <field name="name">Cuotas soportadas operaciones interiores bienes inversión (4%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_ded_25"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_ded_25_10" model="account.tax.code.template">
+            <field name="name">Cuotas soportadas operaciones interiores bienes inversión (10%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_ded_25"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_ded_25_21" model="account.tax.code.template">
+            <field name="name">Cuotas soportadas operaciones interiores bienes inversión (21%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_ded_25"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <!-- Cuotas devengadas EN LAS IMPORTACIONES DE BIENES CORRIENTES-->
+        <record id="iva_ded_27" model="account.tax.code.template">
+            <field name="name">Cuotas devengadas importaciones bienes y servicios corrientes</field>
+            <field name="code">[27]</field>
+            <field name="parent_id" ref="iva_ded_cuota_total"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_ded_27_4" model="account.tax.code.template">
+            <field name="name">Cuotas devengadas importaciones bienes y servicios corrientes (4%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_ded_27"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_ded_27_10" model="account.tax.code.template">
+            <field name="name">Cuotas devengadas importaciones bienes y servicios corrientes (10%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_ded_27"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_ded_27_21" model="account.tax.code.template">
+            <field name="name">Cuotas devengadas importaciones bienes y servicios corrientes (21%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_ded_27"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <!-- Cuotas devengadas EN LAS IMPORTACIONES DE BIENES DE INVERSIÓN-->
+        <record id="iva_ded_29" model="account.tax.code.template">
+            <field name="name">Cuotas devengadas importaciones bienes inversión</field>
+            <field name="code">[29]</field>
+            <field name="parent_id" ref="iva_ded_cuota_total"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_ded_29_4" model="account.tax.code.template">
+            <field name="name">Cuotas devengadas importaciones bienes inversión (4%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_ded_29"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_ded_29_10" model="account.tax.code.template">
+            <field name="name">Cuotas devengadas importaciones bienes inversión (10%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_ded_29"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_ded_29_21" model="account.tax.code.template">
+            <field name="name">Cuotas devengadas importaciones bienes inversión (21%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_ded_29"/>
+            <field name="sign">1.0</field>
+        </record>
+        <!-- ADQUISICIONES INTRACOMUNITARIAS DE BIENES CORRIENTES-->
+        <record id="iva_ded_31" model="account.tax.code.template">
+            <field name="name">En adquisiciones intracomunitarias bienes y servicios corrientes</field>
+            <field name="code">[31]</field>
+            <field name="parent_id" ref="iva_ded_cuota_total"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_ded_31_4" model="account.tax.code.template">
+            <field name="name">En adquisiciones intracomunitarias bienes y servicios corrientes (4%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_ded_31"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_ded_31_10" model="account.tax.code.template">
+            <field name="name">En adquisiciones intracomunitarias bienes y servicios corrientes (10%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_ded_31"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_ded_31_21" model="account.tax.code.template">
+            <field name="name">En adquisiciones intracomunitarias bienes y servicios corrientes (21%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_ded_31"/>
+            <field name="sign">1.0</field>
+        </record>
+        <!-- ADQUISICIONES INTRACOMUNITARIAS DE BIENES DE INVERSIÓN-->
+        <record id="iva_ded_33" model="account.tax.code.template">
+            <field name="name">En adquisiciones intracomunitarias bienes inversión</field>
+            <field name="code">[33]</field>
+            <field name="parent_id" ref="iva_ded_cuota_total"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_ded_33_4" model="account.tax.code.template">
+            <field name="name">En adquisiciones intracomunitarias bienes inversión (4%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_ded_33"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_ded_33_10" model="account.tax.code.template">
+            <field name="name">En adquisiciones intracomunitarias bienes inversión (10%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_ded_33"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_ded_33_21" model="account.tax.code.template">
+            <field name="name">En adquisiciones intracomunitarias bienes inversión (21%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_ded_33"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <!--Otros Códigos de Impuestos-->
+        <record id="base_intra_42" model="account.tax.code.template">
+            <field name="name">Entregas intracomunitarias</field>
+            <field name="code">[42]</field>
+            <field name="parent_id" ref="vat_code_chart_root"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="base_extra_43" model="account.tax.code.template">
+            <field name="name">Exportaciones y operaciones asimiladas</field>
+            <field name="code">[43]</field>
+            <field name="parent_id" ref="vat_code_chart_root"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="base_extra_44" model="account.tax.code.template">
+            <field name="name">Inversión del sujeto pasivo</field>
+            <field name="code">[44]</field>
+            <field name="parent_id" ref="vat_code_chart_root"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <!--Cuota Recargo de Equivalencia-->
+        <record id="iva_ded_12" model="account.tax.code.template">
+            <field name="name">Recargo equivalencia ded. Cuota 0.5%</field>
+            <field name="code">[12]</field>
+            <field name="parent_id" ref="iva_ded_cuota_total"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_ded_15_14" model="account.tax.code.template">
+            <field name="name">Recargo equivalencia ded. Cuota 1.4%</field>
+            <field name="code">[15]</field>
+            <field name="parent_id" ref="iva_ded_cuota_total"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_ded_18_52" model="account.tax.code.template">
+            <field name="name">Recargo equivalencia ded. Cuota 5.2%</field>
+            <field name="code">[18]</field>
+            <field name="parent_id" ref="iva_ded_cuota_total"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <!-- ********************************************************************
+        RETENCIONES DE IRPF: Hacienda pública, retenciones a cuenta como clientes 
+        
+        ********************************************************************* -->
+
+        <!--Base imponible-->
+        <record id="irpf_base_sale" model="account.tax.code.template">
+            <field name="name">IRPF retenciones a cuenta. Base imponible</field>
+            <field name="code">B.IRPF AC</field>
+            <field name="sign">1.0</field>
+            <field name="parent_id" ref="vat_code_chart_root"/>
+        </record>
+        <record id="irpf_base_sale_1" model="account.tax.code.template">
+            <field name="name">IRPF retenciones a cuenta. Base imponible 1%</field>
+            <field name="code">B.IRPF1 AC</field>
+            <field name="parent_id" ref="irpf_base_sale"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="irpf_base_sale_2" model="account.tax.code.template">
+            <field name="name">IRPF retenciones a cuenta. Base imponible 2%</field>
+            <field name="code">B.IRPF2 AC</field>
+            <field name="parent_id" ref="irpf_base_sale"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="irpf_base_sale_7" model="account.tax.code.template">
+            <field name="name">IRPF retenciones a cuenta. Base imponible 7%</field>
+            <field name="code">B.IRPF7 AC</field>
+            <field name="parent_id" ref="irpf_base_sale"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="irpf_base_sale_9" model="account.tax.code.template">
+            <field name="name">IRPF retenciones a cuenta. Base imponible 9%</field>
+            <field name="code">B.IRPF9 AC</field>
+            <field name="parent_id" ref="irpf_base_sale"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="irpf_base_sale_15" model="account.tax.code.template">
+            <field name="name">IRPF retenciones a cuenta. Base imponible 15%</field>
+            <field name="code">B.IRPF15 AC</field>
+            <field name="parent_id" ref="irpf_base_sale"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="irpf_base_sale_20" model="account.tax.code.template">
+            <field name="name">IRPF retenciones a cuenta. Base imponible 20%</field>
+            <field name="code">B.IRPF20 AC</field>
+            <field name="parent_id" ref="irpf_base_sale"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="irpf_base_sale_21" model="account.tax.code.template">
+            <field name="name">IRPF retenciones a cuenta. Base imponible 21%</field>
+            <field name="code">B.IRPF21 AC</field>
+            <field name="parent_id" ref="irpf_base_sale"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <!--Cuotas-->
+        <record id="irpf_cuota_sale_total" model="account.tax.code.template">
+            <field name="name">IRPF retenciones a cuenta. Total cuota</field>
+            <field name="code">IRPF AC</field>
+            <field name="parent_id" ref="vat_code_chart_root"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="irpf_cuota_sale_1" model="account.tax.code.template">
+            <field name="name">IRPF retenciones a cuenta. Cuota 1%</field>
+            <field name="code">IRPF1 AC</field>
+            <field name="parent_id" ref="irpf_cuota_sale_total"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="irpf_cuota_sale_2" model="account.tax.code.template">
+            <field name="name">IRPF retenciones a cuenta. Cuota 2%</field>
+            <field name="code">IRPF2 AC</field>
+            <field name="parent_id" ref="irpf_cuota_sale_total"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="irpf_cuota_sale_7" model="account.tax.code.template">
+            <field name="name">IRPF retenciones a cuenta. Cuota 7%</field>
+            <field name="code">IRPF7 AC</field>
+            <field name="parent_id" ref="irpf_cuota_sale_total"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="irpf_cuota_sale_9" model="account.tax.code.template">
+            <field name="name">IRPF retenciones a cuenta. Cuota 9%</field>
+            <field name="code">IRPF9 AC</field>
+            <field name="parent_id" ref="irpf_cuota_sale_total"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="irpf_cuota_sale_15" model="account.tax.code.template">
+            <field name="name">IRPF retenciones a cuenta. Cuota 15%</field>
+            <field name="code">IRPF15 AC</field>
+            <field name="parent_id" ref="irpf_cuota_sale_total"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="irpf_cuota_sale_20" model="account.tax.code.template">
+            <field name="name">IRPF retenciones a cuenta. Cuota 20%</field>
+            <field name="code">IRPF20 AC</field>
+            <field name="parent_id" ref="irpf_cuota_sale_total"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="irpf_cuota_sale_21" model="account.tax.code.template">
+            <field name="name">IRPF retenciones a cuenta. Cuota 21%</field>
+            <field name="code">IRPF21 AC</field>
+            <field name="parent_id" ref="irpf_cuota_sale_total"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <!-- *************************************************************************************
+        RETENCIONES DE IRPF: Hacienda pública, acreedora por retenciones practicadas a proveedores 
+        
+        ************************************************************************************** -->
+
+        <!--Base imponible-->
+        <record id="irpf_base" model="account.tax.code.template">
+            <field name="name">IRPF retenciones practicadas. Base imponible</field>
+            <field name="code">B.IRPF</field>
+            <field name="sign">1.0</field>
+            <field name="parent_id" ref="vat_code_chart_root"/>
+        </record>
+        <record id="irpf_base_1" model="account.tax.code.template">
+            <field name="name">IRPF retenciones practicadas. Base imponible 1%</field>
+            <field name="code">B.IRPF1</field>
+            <field name="parent_id" ref="irpf_base"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="irpf_base_2" model="account.tax.code.template">
+            <field name="name">IRPF retenciones practicadas. Base imponible 2%</field>
+            <field name="code">B.IRPF2</field>
+            <field name="parent_id" ref="irpf_base"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="irpf_base_7" model="account.tax.code.template">
+            <field name="name">IRPF retenciones practicadas. Base imponible 7%</field>
+            <field name="code">B.IRPF7</field>
+            <field name="parent_id" ref="irpf_base"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="irpf_base_9" model="account.tax.code.template">
+            <field name="name">IRPF retenciones practicadas. Base imponible 9%</field>
+            <field name="code">B.IRPF9</field>
+            <field name="parent_id" ref="irpf_base"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="irpf_base_15" model="account.tax.code.template">
+            <field name="name">IRPF retenciones practicadas. Base imponible 15%</field>
+            <field name="code">B.IRPF15</field>
+            <field name="parent_id" ref="irpf_base"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="irpf_base_20" model="account.tax.code.template">
+            <field name="name">IRPF retenciones practicadas. Base imponible 20%</field>
+            <field name="code">B.IRPF20</field>
+            <field name="parent_id" ref="irpf_base"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="irpf_base_21" model="account.tax.code.template">
+            <field name="name">IRPF retenciones practicadas. Base imponible 21%</field>
+            <field name="code">B.IRPF21</field>
+            <field name="parent_id" ref="irpf_base"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <!--Cuotas-->
+        <record id="irpf_cuota_total" model="account.tax.code.template">
+            <field name="name">IRPF retenciones practicadas. Total cuota</field>
+            <field name="code">IRPF</field>
+            <field name="parent_id" ref="vat_code_chart_root"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="irpf_cuota_1" model="account.tax.code.template">
+            <field name="name">IRPF retenciones practicadas. Cuota 1%</field>
+            <field name="code">IRPF1</field>
+            <field name="parent_id" ref="irpf_cuota_total"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="irpf_cuota_2" model="account.tax.code.template">
+            <field name="name">IRPF retenciones practicadas. Cuota 2%</field>
+            <field name="code">IRPF2</field>
+            <field name="parent_id" ref="irpf_cuota_total"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="irpf_cuota_7" model="account.tax.code.template">
+            <field name="name">IRPF retenciones practicadas. Cuota 7%</field>
+            <field name="code">IRPF7</field>
+            <field name="parent_id" ref="irpf_cuota_total"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="irpf_cuota_9" model="account.tax.code.template">
+            <field name="name">IRPF retenciones practicadas. Cuota 9%</field>
+            <field name="code">IRPF9</field>
+            <field name="parent_id" ref="irpf_cuota_total"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="irpf_cuota_15" model="account.tax.code.template">
+            <field name="name">IRPF retenciones practicadas. Cuota 15%</field>
+            <field name="code">IRPF15</field>
+            <field name="parent_id" ref="irpf_cuota_total"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="irpf_cuota_20" model="account.tax.code.template">
+            <field name="name">IRPF retenciones practicadas. Cuota 20%</field>
+            <field name="code">IRPF20</field>
+            <field name="parent_id" ref="irpf_cuota_total"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="irpf_cuota_21" model="account.tax.code.template">
+            <field name="name">IRPF retenciones practicadas. Cuota 21%</field>
+            <field name="code">IRPF21</field>
+            <field name="parent_id" ref="irpf_cuota_total"/>
+            <field name="sign">1.0</field>
+        </record>
+        
+    </data>
+</openerp>

addons/l10n_tr/account_chart_template.xml

@@ -12,7 +12,7 @@
             <field name="property_account_payable" ref="tr320"/>
             <field name="property_account_expense_categ" ref="tr150"/>
             <field name="property_account_income_categ" ref="tr600"/>
-            <field name="currency_id" ref="base.TRL"/>
+            <field name="currency_id" ref="base.TRY"/>
         </record>
 
 

addons/mail/mail_thread.py

@@ -714,7 +714,7 @@ class mail_thread(osv.AbstractModel):
         s = ', '.join([decode(message.get(h)) for h in header_fields if message.get(h)])
         return filter(lambda x: x, self._find_partner_from_emails(cr, uid, None, tools.email_split(s), context=context))
 
-    def message_route_verify(self, cr, uid, message, message_dict, route, update_author=True, assert_model=True, create_fallback=True, context=None):
+    def message_route_verify(self, cr, uid, message, message_dict, route, update_author=True, assert_model=True, create_fallback=True, allow_private=False, context=None):
         """ Verify route validity. Check and rules:
             1 - if thread_id -> check that document effectively exists; otherwise
                 fallback on a message_new by resetting thread_id
@@ -835,6 +835,9 @@ class mail_thread(osv.AbstractModel):
             _create_bounce_email()
             return ()
 
+        if not model and not thread_id and not alias and not allow_private:
+            return ()
+
         return (model, thread_id, route[2], route[3], route[4])
 
     def message_route(self, cr, uid, message, message_dict, model=None, thread_id=None,
@@ -886,22 +889,23 @@ class mail_thread(osv.AbstractModel):
         thread_references = references or in_reply_to
 
         # 1. message is a reply to an existing message (exact match of message_id)
+        ref_match = thread_references and tools.reference_re.search(thread_references)
         msg_references = thread_references.split()
         mail_message_ids = mail_msg_obj.search(cr, uid, [('message_id', 'in', msg_references)], context=context)
-        if mail_message_ids:
+        if ref_match and mail_message_ids:
             original_msg = mail_msg_obj.browse(cr, SUPERUSER_ID, mail_message_ids[0], context=context)
             model, thread_id = original_msg.model, original_msg.res_id
-            _logger.info(
-                'Routing mail from %s to %s with Message-Id %s: direct reply to msg: model: %s, thread_id: %s, custom_values: %s, uid: %s',
-                email_from, email_to, message_id, model, thread_id, custom_values, uid)
             route = self.message_route_verify(
                 cr, uid, message, message_dict,
                 (model, thread_id, custom_values, uid, None),
-                update_author=True, assert_model=True, create_fallback=True, context=context)
-            return route and [route] or []
+                update_author=True, assert_model=False, create_fallback=True, context=context)
+            if route:
+                _logger.info(
+                    'Routing mail from %s to %s with Message-Id %s: direct reply to msg: model: %s, thread_id: %s, custom_values: %s, uid: %s',
+                    email_from, email_to, message_id, model, thread_id, custom_values, uid)
+                return [route]
 
         # 2. message is a reply to an existign thread (6.1 compatibility)
-        ref_match = thread_references and tools.reference_re.search(thread_references)
         if ref_match:
             reply_thread_id = int(ref_match.group(1))
             reply_model = ref_match.group(2) or fallback_model
@@ -919,14 +923,15 @@ class mail_thread(osv.AbstractModel):
                             ('res_id', '=', thread_id),
                         ], context=context)
                     if compat_mail_msg_ids and model_obj.exists(cr, uid, thread_id) and hasattr(model_obj, 'message_update'):
-                        _logger.info(
-                            'Routing mail from %s to %s with Message-Id %s: direct thread reply (compat-mode) to model: %s, thread_id: %s, custom_values: %s, uid: %s',
-                            email_from, email_to, message_id, model, thread_id, custom_values, uid)
                         route = self.message_route_verify(
                             cr, uid, message, message_dict,
                             (model, thread_id, custom_values, uid, None),
                             update_author=True, assert_model=True, create_fallback=True, context=context)
-                        return route and [route] or []
+                        if route:
+                            _logger.info(
+                                'Routing mail from %s to %s with Message-Id %s: direct thread reply (compat-mode) to model: %s, thread_id: %s, custom_values: %s, uid: %s',
+                                email_from, email_to, message_id, model, thread_id, custom_values, uid)
+                            return [route]
 
         # 2. Reply to a private message
         if in_reply_to:
@@ -936,12 +941,14 @@ class mail_thread(osv.AbstractModel):
                             ], limit=1, context=context)
             if mail_message_ids:
                 mail_message = mail_msg_obj.browse(cr, uid, mail_message_ids[0], context=context)
-                _logger.info('Routing mail from %s to %s with Message-Id %s: direct reply to a private message: %s, custom_values: %s, uid: %s',
-                                email_from, email_to, message_id, mail_message.id, custom_values, uid)
                 route = self.message_route_verify(cr, uid, message, message_dict,
                                 (mail_message.model, mail_message.res_id, custom_values, uid, None),
-                                update_author=True, assert_model=True, create_fallback=True, context=context)
-                return route and [route] or []
+                                update_author=True, assert_model=True, create_fallback=True, allow_private=True, context=context)
+                if route:
+                    _logger.info(
+                        'Routing mail from %s to %s with Message-Id %s: direct reply to a private message: %s, custom_values: %s, uid: %s',
+                        email_from, email_to, message_id, mail_message.id, custom_values, uid)
+                    return [route]
 
         # 3. Look for a matching mail.alias entry
         # Delivered-To is a safe bet in most modern MTAs, but we have to fallback on To + Cc values
@@ -969,11 +976,12 @@ class mail_thread(osv.AbstractModel):
                         user_id = uid
                         _logger.info('No matching user_id for the alias %s', alias.alias_name)
                     route = (alias.alias_model_id.model, alias.alias_force_thread_id, eval(alias.alias_defaults), user_id, alias)
-                    _logger.info('Routing mail from %s to %s with Message-Id %s: direct alias match: %r',
-                                email_from, email_to, message_id, route)
                     route = self.message_route_verify(cr, uid, message, message_dict, route,
                                 update_author=True, assert_model=True, create_fallback=True, context=context)
                     if route:
+                        _logger.info(
+                            'Routing mail from %s to %s with Message-Id %s: direct alias match: %r',
+                            email_from, email_to, message_id, route)
                         routes.append(route)
                 return routes
 
@@ -987,15 +995,16 @@ class mail_thread(osv.AbstractModel):
                 thread_id = int(thread_id)
             except:
                 thread_id = False
-        _logger.info('Routing mail from %s to %s with Message-Id %s: fallback to model:%s, thread_id:%s, custom_values:%s, uid:%s',
-                    email_from, email_to, message_id, fallback_model, thread_id, custom_values, uid)
         route = self.message_route_verify(cr, uid, message, message_dict,
                         (fallback_model, thread_id, custom_values, uid, None),
                         update_author=True, assert_model=True, context=context)
         if route:
+            _logger.info(
+                'Routing mail from %s to %s with Message-Id %s: fallback to model:%s, thread_id:%s, custom_values:%s, uid:%s',
+                email_from, email_to, message_id, fallback_model, thread_id, custom_values, uid)
             return [route]
 
-        # AssertionError if no routes found and if no bounce occured
+        # ValueError if no routes found and if no bounce occured
         raise ValueError(
                 'No possible route found for incoming message from %s to %s (Message-Id %s:). '
                 'Create an appropriate mail.alias or force the destination model.' %
@@ -1165,7 +1174,14 @@ class mail_thread(osv.AbstractModel):
         body = u''
         if save_original:
             attachments.append(('original_email.eml', message.as_string()))
-        if not message.is_multipart() or 'text/' in message.get('content-type', ''):
+
+        # Be careful, content-type may contain tricky content like in the
+        # following example so test the MIME type with startswith()
+        #
+        # Content-Type: multipart/related;
+        #   boundary="_004_3f1e4da175f349248b8d43cdeb9866f1AMSPR06MB343eurprd06pro_";
+        #   type="text/html"
+        if not message.is_multipart() or message.get('content-type', '').startswith("text/"):
             encoding = message.get_content_charset()
             body = message.get_payload(decode=True)
             body = tools.ustr(body, encoding, errors='replace')

addons/mail/wizard/mail_compose_message.py

@@ -267,7 +267,10 @@ class mail_compose_message(osv.TransientModel):
             # mass mailing: rendering override wizard static values
             if mass_mail_mode and wizard.model:
                 # always keep a copy, reset record name (avoid browsing records)
-                mail_values.update(notification=True, model=wizard.model, res_id=res_id, record_name=False)
+                mail_values.update(notification=True, record_name=False)
+                if hasattr(self.pool[wizard.model], 'message_new'):
+                    mail_values['model'] = wizard.model
+                    mail_values['res_id'] = res_id
                 # auto deletion of mail_mail
                 if 'mail_auto_delete' in context:
                     mail_values['auto_delete'] = context.get('mail_auto_delete')

addons/mass_mailing/controllers/main.py

@@ -67,7 +67,8 @@ class MassMailController(http.Controller):
 
         contact_ids = Contacts.search(cr, SUPERUSER_ID, [('list_id', '=', int(list_id)), ('email', '=', email)], context=context)
         if not contact_ids:
-            Contacts.name_create(cr, SUPERUSER_ID, email, context=context)
+            contact_ng = Contacts.name_create(cr, SUPERUSER_ID, email, context=context)
+            Contacts.write(cr, SUPERUSER_ID, [contact_ng[0]], {'list_id': int(list_id)}, context=context)
         # add email to session
         request.session['mass_mailing_email'] = email
         return True

addons/mass_mailing/data/mass_mailing_demo.xml

@@ -31,6 +31,63 @@
             <field name="opt_out" eval="True"/>
         </record>
 
+        <!-- Demo newsletter template -->
+       <!--Email template -->
+        <record id="newsletter_template" model="email.template">
+            <field name="name">Newsletter</field>
+            <field name="subject">Newsletter</field>
+            <field name="model_id" ref="mass_mailing.model_mail_mass_mailing_contact"/>
+            <field name="use_default_to" eval="True"/>
+            <field name="auto_delete" eval="True"/>
+            <field name="body_html"><![CDATA[<div data-snippet-id="big-picture" style="padding:0px; margin:0px">
+<table cellpadding="0" cellspacing="0" style="margin:10px 0px 0px;vertical-align:top;padding:0px;font-family:arial;font-size:12px;color:rgb(51,51,51)">
+    <tbody>
+        <tr>
+            <td style="width:600px" valign="top">
+            <h2 style="text-align: center; padding:0px 5px">A Punchy Headline</h2>
+            </td>
+        </tr>
+        <tr>
+            <td style="width:600px" valign="top"><img src="/website/static/src/img/big_picture.png" style="display:block;border:none;min-height:250px;margin:0 auto;" width="500"></td>
+        </tr>
+        <tr>
+            <td style="width:600px" valign="top">
+            <p style="text-align: center; overflow:hidden"></p>
+
+            <h3 style="text-align: center; padding:0px 5px">A Small Subtitle for ${object.name}</h3>
+
+            <p></p>
+
+            <p style="text-align: center; overflow:hidden">Choose a vibrant image and write an inspiring paragraph about it. It does not have to be long, but it should reinforce your image.</p>
+            </td>
+        </tr>
+    </tbody>
+</table>
+</div>
+<div data-snippet-id="three-columns" style="padding:0px; margin:0px">
+<table cellpadding="0" cellspacing="0" style="margin:10px 0px 0px;vertical-align:top;padding:0px;font-family:arial;font-size:12px;color:rgb(51,51,51)">
+    <tbody>
+        <tr>
+            <td style="width:300px" valign="top"><img src="/website/static/src/img/desert_thumb.jpg" style="display:block;border:none;min-height:50px" width="275"></td>
+            <td style="width:300px" valign="top"><img src="/website/static/src/img/deers_thumb.jpg" style="display:block;border:none;min-height:50px" width="275"></td>
+        </tr>
+        <tr>
+            <td style="width:300px" valign="top">
+            <h3 style="text-align: center; padding:0px 5px">Feature One</h3>
+
+            <p style="overflow:hidden">Choose a vibrant image and write an inspiring paragraph about it. It does not have to be long, but it should reinforce your image.</p>
+            </td>
+            <td style="width:300px" valign="top">
+            <h3 style="text-align: center; padding:0px 5px">Feature Two</h3>
+
+            <p style="overflow:hidden">Choose a vibrant image and write an inspiring paragraph about it. It does not have to be long, but it should reinforce your image.</p>
+            </td>
+        </tr>
+    </tbody>
+</table>
+</div>]]></field>
+        </record>
+
         <!-- Create campaign and mailings -->
         <record id="mass_mail_category_1" model="mail.mass_mailing.category">
             <field name="name">Marketing</field>

addons/mass_mailing/models/mass_mailing.py

@@ -480,9 +480,14 @@ class MassMailing(osv.Model):
     def on_change_model_and_list(self, cr, uid, ids, mailing_model, list_ids, context=None):
         value = {}
         if mailing_model == 'mail.mass_mailing.contact':
-            list_ids = map(lambda item: item if isinstance(item, (int, long)) else [lid for lid in item[2]], list_ids)
-            if list_ids:
-                value['mailing_domain'] = "[('list_id', 'in', %s)]" % list_ids
+            mailing_list_ids = set()
+            for item in list_ids:
+                if isinstance(item, (int, long)):
+                    mailing_list_ids.add(item)
+                elif len(item) == 3:
+                    mailing_list_ids |= set(item[2])
+            if mailing_list_ids:
+                value['mailing_domain'] = "[('list_id', 'in', %s)]" % list(mailing_list_ids)
             else:
                 value['mailing_domain'] = "[('list_id', '=', False)]"
         else:
@@ -532,8 +537,12 @@ class MassMailing(osv.Model):
     #------------------------------------------------------
 
     def get_recipients(self, cr, uid, mailing, context=None):
-        domain = eval(mailing.mailing_domain)
-        res_ids = self.pool[mailing.mailing_model].search(cr, uid, domain, context=context)
+        if mailing.mailing_domain:
+            domain = eval(mailing.mailing_domain)
+            res_ids = self.pool[mailing.mailing_model].search(cr, uid, domain, context=context)
+        else:
+            res_ids = []
+            domain = [('id', 'in', res_ids)]
 
         # randomly choose a fragment
         if mailing.contact_ab_pc < 100:
@@ -567,6 +576,7 @@ class MassMailing(osv.Model):
                 'composition_mode': 'mass_mail',
                 'mass_mailing_id': mailing.id,
                 'mailing_list_ids': [(4, l.id) for l in mailing.contact_list_ids],
+                'same_thread': mailing.reply_to_mode == 'thread',
             }
             if mailing.reply_to_mode == 'email':
                 composer_values['reply_to'] = mailing.reply_to

addons/mass_mailing/static/src/js/website_mass_mailing.js

@@ -18,9 +18,12 @@
                     .attr("disabled", data.is_subscriber && data.email.length ? "disabled" : false);
                 self.$target.attr("data-subscribe", data.is_subscriber ? 'on' : 'off');
                 self.$target.find('a.js_subscribe_btn')
-                    .val(data.email ? data.email : "")
                     .attr("disabled", data.is_subscriber && data.email.length ? "disabled" : false);
                 self.$target.removeClass("hidden");
+                if (data.is_subscriber) {
+                    self.$target.find('.js_subscribe_btn').addClass('hidden');
+                    self.$target.find('.js_subscribed_btn').removeClass('hidden');
+                }
             });
 
             // not if editable mode to allow designer to edit alert field

addons/mass_mailing/views/mass_mailing.xml

@@ -186,11 +186,17 @@
                 <form string="Mass Mailing" version="7.0">
                     <header>
                         <button name="action_test_mailing" type="object"
-                            class="oe_highlight" string="Test Mailing" states="draft"/>
-                        <button name="send_mail" type="object" states="draft,test"
+                            class="oe_highlight" string="Test Mailing"
+                            attrs="{'invisible': ['|', ('state', '!=', 'draft'), ('body_html', '=', False)]}"/>
+                        <button name="action_test_mailing" type="object"
+                            attrs="{'invisible': ['&amp;', ('state', '=', 'draft'), ('body_html', '!=', False)]}"
+                            string="Test Mailing"/>
+                        <button name="send_mail" type="object"
+                            attrs="{'invisible': ['|', ('state', '=', 'done'), ('body_html', '=', False)]}"
                             class="oe_highlight" string="Send to All"/>
-                        <button name="action_test_mailing" type="object" states="test,done"
-                            string="Send Test Sample"/>
+                        <button name="send_mail" type="object"
+                            attrs="{'invisible': ['&amp;', ('state', '!=', 'done'), ('body_html', '!=', False)]}"
+                            string="Send to All"/>
                         <field name="state" widget="statusbar"/>
                     </header>
                     <div class="oe_form_box_info oe_text_center" attrs="{'invisible': [('scheduled', '=', 0)]}">
@@ -250,9 +256,11 @@
                         </group>
                         <notebook>
                             <page string="Mail Body">
-                                <button name="action_edit_html" type="object" string="Design Email" class="oe_highlight" states="draft"/>
-                                <button name="action_edit_html" type="object" string="Change Email Design" states="test"/>
-                                <div attrs="{'invisible' : ['|', '|', ('state', '=', 'done'), ('body_html','!=',False), ('mailing_domain', '=', False)]}" class="oe_view_nocontent oe_clear">
+                                <button name="action_edit_html" type="object" string="Design Email" class="oe_highlight"
+                                    attrs="{'invisible': [('body_html', '!=', False)]}"/>
+                                <button name="action_edit_html" type="object" string="Change Email Design"
+                                    attrs="{'invisible': [('body_html', '=', False)]}"/>
+                                <div attrs="{'invisible' : ['|', ('state', '=', 'done'), ('body_html','!=',False)]}" class="oe_view_nocontent oe_clear">
                                     <p class="oe_view_nocontent_create oe_edit_only">
                                         Click to design your email.
                                     </p>

addons/mass_mailing/views/snippets.xml

@@ -20,6 +20,7 @@
                       placeholder="your email..."/>
                 <span class="input-group-btn">
                     <a href="#" class="btn btn-primary js_subscribe_btn">Subscribe</a>
+                    <a href="#" class="btn btn-success js_subscribed_btn hidden" disabled="disabled">Thanks</a>
                 </span>
                 <div class="alert alert-success hidden">Thanks for your subscription!</div>
             </div>

addons/mass_mailing/wizard/mail_compose_message.py

@@ -43,10 +43,15 @@ class MailComposeMessage(osv.TransientModel):
                     }, context=context)
                 mass_mailing = self.pool['mail.mass_mailing'].browse(cr, uid, mass_mailing_id, context=context)
             for res_id in res_ids:
-                res[res_id]['mailing_id'] = mass_mailing.id
-                res[res_id]['statistics_ids'] = [(0, 0, {
-                    'model': wizard.model,
-                    'res_id': res_id,
-                    'mass_mailing_id': mass_mailing.id,
-                })]
+                res[res_id].update({
+                    'mailing_id':  mass_mailing.id,
+                    'statistics_ids': [(0, 0, {
+                        'model': wizard.model,
+                        'res_id': res_id,
+                        'mass_mailing_id': mass_mailing.id,
+                    })],
+                    # email-mode: keep original message for routing
+                    'notification': mass_mailing.reply_to_mode == 'thread',
+                    'auto_delete': True,
+                })
         return res

addons/mrp/mrp.py

@@ -325,8 +325,8 @@ class mrp_bom(osv.osv):
                 })
             else:
                 bom_id = self._bom_find(cr, uid, bom_line_id.product_uom.id, product_id=bom_line_id.product_id.id, properties=properties)
-                bom2 = self.browse(cr, uid, bom_id)  
-                if bom2:
+                if bom_id:
+                    bom2 = self.browse(cr, uid, bom_id)  
                     res = self._bom_explode(cr, uid, bom2, bom_line_id.product_id, factor,
                         properties=properties, level=level + 10, previous_products=all_prod, master_bom=master_bom)
                     result = result + res[0]

addons/mrp_byproduct/mrp_byproduct.py

@@ -35,7 +35,7 @@ class mrp_subproduct(osv.osv):
   'Fixed' depicts a situation where the quantity of created byproduct is always equal to the quantity set on the BoM, regardless of how many are created in the production order.\
   By opposition, 'Variable' means that the quantity will be computed as\
     '(quantity of byproduct set on the BoM / quantity of manufactured product set on the BoM * quantity of manufactured product in the production order.)'"),
-        'bom_id': fields.many2one('mrp.bom', 'BoM'),
+        'bom_id': fields.many2one('mrp.bom', 'BoM', ondelete='cascade'),
     }
     _defaults={
         'subproduct_type': 'variable',

addons/point_of_sale/static/src/js/db.js

@@ -29,7 +29,7 @@ function openerp_pos_db(instance, module){
             this.category_parent    = {};
             this.category_search_string = {};
             this.packagings_by_id = {};
-            this.packagings_by_product_id = {};
+            this.packagings_by_product_tmpl_id = {};
             this.packagings_by_ean13 = {};
         },
         /* returns the category object from its id. If you pass a list of id as parameters, you get
@@ -130,7 +130,7 @@ function openerp_pos_db(instance, module){
             if(product.default_code){
                 str += '|' + product.default_code;
             }
-            var packagings = this.packagings_by_product_id[product.id] || [];
+            var packagings = this.packagings_by_product_tmpl_id[product.product_tmpl_id] || [];
             for(var i = 0; i < packagings.length; i++){
                 str += '|' + packagings[i].ean;
             }
@@ -149,6 +149,7 @@ function openerp_pos_db(instance, module){
                 if (product.variants){
                     product.name = product.name+" ("+product.variants+")";
                 }
+                product.product_tmpl_id = product.product_tmpl_id[0];
                 if(!stored_categories[categ_id]){
                     stored_categories[categ_id] = [];
                 }
@@ -186,10 +187,10 @@ function openerp_pos_db(instance, module){
             for(var i = 0, len = packagings.length; i < len; i++){
                 var pack = packagings[i];
                 this.packagings_by_id[pack.id] = pack;
-                if(!this.packagings_by_product_id[pack.product_id[0]]){
-                    this.packagings_by_product_id[pack.product_id[0]] = [];
+                if(!this.packagings_by_product_tmpl_id[pack.product_tmpl_id[0]]){
+                    this.packagings_by_product_tmpl_id[pack.product_tmpl_id[0]] = [];
                 }
-                this.packagings_by_product_id[pack.product_id[0]].push(pack);
+                this.packagings_by_product_tmpl_id[pack.product_tmpl_id[0]].push(pack);
                 if(pack.ean){
                     this.packagings_by_ean13[pack.ean] = pack;
                 }

addons/point_of_sale/static/src/js/models.js

@@ -204,18 +204,19 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
                     self.accounting_precision = precision;
                     console.log("PRECISION",precision);
 */
-                    return self.fetch('product.packaging',['ean','product_id']);
+                    return self.fetch('product.packaging',['ean','product_tmpl_id']);
                 }).then(function(packagings){
                     self.db.add_packagings(packagings);
 
-                    return self.fetch('pos.category', ['id','name','parent_id','child_id','image'])
+                    return self.fetch('pos.category', ['id','name','parent_id','child_id','image']);
                 }).then(function(categories){
                     self.db.add_categories(categories);
 
                     return self.fetch(
-                        'product.product', 
+                        'product.product',
                         ['name', 'list_price','price','pos_categ_id', 'taxes_id', 'ean13', 'default_code', 'variants',
-                         'to_weight', 'uom_id', 'uos_id', 'uos_coeff', 'mes_type', 'description_sale', 'description'],
+                         'to_weight', 'uom_id', 'uos_id', 'uos_coeff', 'mes_type', 'description_sale', 'description',
+                         'product_tmpl_id'],
                         [['sale_ok','=',true],['available_in_pos','=',true]],
                         {pricelist: self.pricelist.id} // context for price
                     );
@@ -230,7 +231,7 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
                 }).then(function(bankstatements){
                     var journals = [];
                     _.each(bankstatements,function(statement) {
-                        journals.push(statement.journal_id[0])
+                        journals.push(statement.journal_id[0]);
                     });
                     self.bankstatements = bankstatements;
                     return self.fetch('account.journal', undefined, [['id','in', journals]]);
@@ -238,7 +239,7 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
                     self.journals = journals; 
 
                     // associate the bank statements with their journals. 
-                    var bankstatements = self.bankstatements
+                    var bankstatements = self.bankstatements;
                     for(var i = 0, ilen = bankstatements.length; i < ilen; i++){
                         for(var j = 0, jlen = journals.length; j < jlen; j++){
                             if(bankstatements[i].journal_id[0] === journals[j].id){

addons/procurement/procurement.py

@@ -276,7 +276,8 @@ class procurement_order(osv.osv):
         @param cr: The current row, from the database cursor,
         @param uid: The current user ID for security checks
         @param ids: List of selected IDs
-        @param use_new_cursor: False or the dbname
+        @param use_new_cursor: if set, use a dedicated cursor and auto-commit after processing each procurement.
+            This is appropriate for batch jobs only.
         @param context: A standard dictionary for contextual values
         @return:  Dictionary of values
         '''
@@ -284,7 +285,7 @@ class procurement_order(osv.osv):
             context = {}
         try:
             if use_new_cursor:
-                cr = openerp.registry(use_new_cursor).cursor()
+                cr = openerp.registry(cr.dbname).cursor()
 
             # Run confirmed procurements
             while True:

addons/product/__openerp__.py

@@ -25,7 +25,7 @@
     'version': '1.1',
     'author': 'OpenERP SA',
     'category': 'Sales Management',
-    'depends': ['base', 'decimal_precision', 'mail'],
+    'depends': ['base', 'decimal_precision', 'mail', 'report'],
     'demo': [
         'product_demo.xml',
         'product_image_demo.xml',

addons/product/pricelist_view.xml

@@ -74,7 +74,7 @@
                     <field name="sequence"/>
                     <field colspan="4" name="name"/>
                     <field name="product_id"/>
-                    <field name="product_tmpl_id" groups="product.group_product_variant"/>
+                    <field name="product_tmpl_id"/>
                     <field name="categ_id"/>
                     <field name="min_quantity"/>
                     <field name="base"/>
@@ -92,7 +92,7 @@
 
                     <group col="4">
                         <field name="product_id" on_change="product_id_change(product_id)"/>
-                        <field name="product_tmpl_id" groups="product.group_product_variant"/>
+                        <field name="product_tmpl_id"/>
                         <field name="categ_id"/>
                         <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                         <field name="min_quantity"/>

addons/product/product.py

@@ -202,6 +202,8 @@ class product_uom(osv.osv):
         return {}
 
     def write(self, cr, uid, ids, vals, context=None):
+        if isinstance(ids, (int, long)):
+            ids = [ids]
         if 'category_id' in vals:
             for uom in self.browse(cr, uid, ids, context=context):
                 if uom.category_id.id != vals['category_id']:
@@ -344,6 +346,8 @@ class product_attribute_value(osv.osv):
         return result
 
     def _set_price_extra(self, cr, uid, id, name, value, args, context=None):
+        if context is None:
+            context = {}
         if 'active_id' not in context:
             return None
         p_obj = self.pool['product.attribute.price']
@@ -351,7 +355,7 @@ class product_attribute_value(osv.osv):
         if p_ids:
             p_obj.write(cr, uid, p_ids, {'price_extra': value}, context=context)
         else:
-            p_obj.create(cr, uid, p_ids, {
+            p_obj.create(cr, uid, {
                     'product_tmpl_id': context['active_id'],
                     'value_id': id,
                     'price_extra': value,
@@ -458,6 +462,8 @@ class product_template(osv.osv):
 
     def _set_standard_price(self, cr, uid, product_tmpl_id, value, context=None):
         ''' Store the standard price change in order to be able to retrieve the cost of a product template for a given date'''
+        if context is None:
+            context = {}
         price_history_obj = self.pool['product.price.history']
         user_company = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.id
         company_id = context.get('force_company', user_company)
@@ -532,10 +538,10 @@ class product_template(osv.osv):
             help="Small-sized image of the product. It is automatically "\
                  "resized as a 64x64px image, with aspect ratio preserved. "\
                  "Use this field anywhere a small image is required."),
-
-        'packaging' : fields.one2many('product.packaging', 'product_id', 'Logistical Units',
-            help="Gives the different ways to package the same product. This has no impact on the picking order and is mainly used if you use the EDI module."),
-        
+        'packaging_ids': fields.one2many(
+            'product.packaging', 'product_tmpl_id', 'Logistical Units',
+            help="Gives the different ways to package the same product. This has no impact on "
+                 "the picking order and is mainly used if you use the EDI module."),
         'seller_ids': fields.one2many('product.supplierinfo', 'product_tmpl_id', 'Supplier'),
         'seller_delay': fields.related('seller_ids','delay', type='integer', string='Supplier Lead Time',
             help="This is the average delay in days between the purchase order confirmation and the reception of goods for this product and for the default supplier. It is used by the scheduler to order requests based on reordering delays."),
@@ -676,7 +682,7 @@ class product_template(osv.osv):
 
     def write(self, cr, uid, ids, vals, context=None):
         ''' Store the standard price change in order to be able to retrieve the cost of a product template for a given date'''
-        if isinstance(id, (int, long)):
+        if isinstance(ids, (int, long)):
             ids = [ids]
         if 'uom_po_id' in vals:
             new_uom = self.pool.get('product.uom').browse(cr, uid, vals['uom_po_id'], context=context)
@@ -879,7 +885,6 @@ class product_product(osv.osv):
         'active': fields.boolean('Active', help="If unchecked, it will allow you to hide the product without removing it."),
         'product_tmpl_id': fields.many2one('product.template', 'Product Template', required=True, ondelete="cascade", select=True),
         'ean13': fields.char('EAN13 Barcode', size=13, help="International Article Number used for product identification."),
-        'packaging': fields.one2many('product.packaging', 'product_id', 'Packaging', help="Gives the different ways to package the same product. This has no impact on the picking order and is mainly used if you use the EDI module."),
         'name_template': fields.related('product_tmpl_id', 'name', string="Template Name", type='char', store={
             'product.template': (_get_name_template_ids, ['name'], 10),
             'product.product': (lambda self, cr, uid, ids, c=None: ids, [], 10),
@@ -1075,7 +1080,7 @@ class product_packaging(osv.osv):
         'ul_container': fields.many2one('product.ul', 'Pallet Logistic Unit'),
         'rows' : fields.integer('Number of Layers', required=True,
             help='The number of layers on a pallet or box'),
-        'product_id' : fields.many2one('product.product', 'Product', select=1, ondelete='cascade', required=True),
+        'product_tmpl_id' : fields.many2one('product.template', 'Product', select=1, ondelete='cascade', required=True),
         'ean' : fields.char('EAN', size=14, help="The EAN code of the package unit."),
         'code' : fields.char('Code', help="The code of the transport unit."),
         'weight': fields.float('Total Package Weight',
@@ -1147,7 +1152,7 @@ class product_supplierinfo(osv.osv):
         'company_id':fields.many2one('res.company','Company',select=1),
     }
     _defaults = {
-        'qty': 0.0,
+        'min_qty': 0.0,
         'sequence': 1,
         'delay': 1,
         'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'product.supplierinfo', context=c),

addons/product/product_demo.xml

@@ -213,6 +213,10 @@ FaceTime HD Camera, 1.2 MP Photos</field>
             <field name="attribute_line_ids" eval="[(6,0,[ref('product.product_attribute_line_1'), ref('product.product_attribute_line_2'), ref('product.product_attribute_line_3')])]"/>
         </record>
         
+        <record id="product_product_4d" model="product.product">
+            <field name="active" eval="False"/>
+        </record>
+        
         <record id="product_attribute_price_1" model="product.attribute.price">
             <field name="product_tmpl_id" ref="product_product_4_product_template"/>
             <field name="value_id" ref="product_attribute_value_2"/>

addons/product/product_view.xml

@@ -270,7 +270,7 @@
                 </form>
                 <field name="name" position="replace">
                     <field name="name" attrs="{'invisible': [('id', '!=', False)]}"/>
-                    <field name="product_tmpl_id" class="oe_inline" readonly="1" attrs="{'invisible': [('id', '=', False)]}"/>
+                    <field name="product_tmpl_id" class="oe_inline" readonly="1" attrs="{'invisible': [('id', '=', False)], 'required': [('id', '!=', False)]}"/>
                 </field>
                 <xpath expr="//div[@class='oe_title']" position="inside">
                     <field name="attribute_value_ids" widget="many2many_tags"/>
@@ -657,7 +657,7 @@
             <field name="arch" type="xml">
                 <form string="Packaging" version="7.0">
                     <group col="4">
-                        <field name="product_id"/>
+                        <field name="product_tmpl_id"/>
                         <newline/>
                         <field name="ean"/>
                         <field name="sequence" invisible="1"/>

addons/product_expiry/product_expiry_demo.xml

@@ -26,7 +26,7 @@
             <field name="ul" ref="product.product_ul_box" />
             <field name="ul_qty">6</field>
             <field name="rows">4</field>
-            <field name="product_id" ref="product_product_jambon" />
+            <field name="product_tmpl_id" ref="product_product_jambon_product_template" />
             <field name="ean"></field>
             <field name="weight">10</field>
         </record>
@@ -54,7 +54,7 @@
             <field name="ul" ref="product.product_ul_box" />
             <field name="ul_qty">6</field>
             <field name="rows">4</field>
-            <field name="product_id" ref="product_product_from" />
+            <field name="product_tmpl_id" ref="product_product_from_product_template" />
             <field name="ean"></field>
             <field name="weight">10</field>
         </record>
@@ -82,7 +82,7 @@
             <field name="ul" ref="product.product_ul_box" />
             <field name="ul_qty">6</field>
             <field name="rows">4</field>
-            <field name="product_id" ref="product_product_pain" />
+            <field name="product_tmpl_id" ref="product_product_pain_product_template" />
             <field name="ean"></field>
             <field name="weight">10</field>
         </record>
@@ -110,7 +110,7 @@
             <field name="ul" ref="product.product_ul_box" />
             <field name="ul_qty">6</field>
             <field name="rows">4</field>
-            <field name="product_id" ref="product_product_lait" />
+            <field name="product_tmpl_id" ref="product_product_lait_product_template" />
             <field name="ean"></field>
             <field name="weight">10</field>
         </record>

addons/purchase/purchase.py

@@ -661,6 +661,8 @@ class purchase_order(osv.osv):
                         _('You must first cancel all invoices related to this purchase order.'))
             self.pool.get('account.invoice') \
                 .signal_invoice_cancel(cr, uid, map(attrgetter('id'), purchase.invoice_ids))
+            self.pool['purchase.order.line'].write(cr, uid, [l.id for l in  purchase.order_line],
+                    {'state': 'cancel'})
         self.write(cr, uid, ids, {'state': 'cancel'})
         self.set_order_line_status(cr, uid, ids, 'cancel', context=context)
         self.signal_purchase_cancel(cr, uid, ids)
@@ -982,6 +984,9 @@ class purchase_order_line(osv.osv):
         return super(purchase_order_line, self).copy_data(cr, uid, id, default, context)
 
     def unlink(self, cr, uid, ids, context=None):
+        for line in self.browse(cr, uid, ids, context=context):
+            if line.state not in ['draft', 'cancel']:
+                raise osv.except_osv(_('Invalid Action!'), _('Cannot delete a purchase order line which is in state \'%s\'.') %(line.state,))
         procurement_obj = self.pool.get('procurement.order')
         procurement_ids_to_cancel = procurement_obj.search(cr, uid, [('purchase_line_id', 'in', ids)], context=context)
         if procurement_ids_to_cancel:

addons/sale/sale.py

@@ -538,14 +538,18 @@ class sale_order(osv.osv):
             if grouped:
                 res = self._make_invoice(cr, uid, val[0][0], reduce(lambda x, y: x + y, [l for o, l in val], []), context=context)
                 invoice_ref = ''
+                origin_ref = ''
                 for o, l in val:
-                    invoice_ref += o.name + '|'
+                    invoice_ref += (o.client_order_ref or o.name) + '|'
+                    origin_ref += (o.origin or o.name) + '|'
                     self.write(cr, uid, [o.id], {'state': 'progress'})
                     cr.execute('insert into sale_order_invoice_rel (order_id,invoice_id) values (%s,%s)', (o.id, res))
                 #remove last '|' in invoice_ref
-                if len(invoice_ref) >= 1: 
+                if len(invoice_ref) >= 1:
                     invoice_ref = invoice_ref[:-1]
-                invoice.write(cr, uid, [res], {'origin': invoice_ref, 'name': invoice_ref})
+                if len(origin_ref) >= 1:
+                    origin_ref = origin_ref[:-1]
+                invoice.write(cr, uid, [res], {'origin': origin_ref, 'name': invoice_ref})
             else:
                 for order, il in val:
                     res = self._make_invoice(cr, uid, order, il, context=context)

addons/sale_stock/sale_stock.py

@@ -277,7 +277,7 @@ class sale_order_line(osv.osv):
             warning_msgs = res.get('warning') and res['warning'].get('message', '') or ''
 
         products = product_obj.browse(cr, uid, product, context=context)
-        if not products.packaging:
+        if not products.packaging_ids:
             packaging = result['product_packaging'] = False
 
         if packaging:

addons/sales_team/sales_team.xml

@@ -126,7 +126,7 @@
                             <div name="options_active"></div>
                         </div>
                         <group>
-                            <group>
+                            <group name="left">
                                 <field name="user_id" context="{'default_groups_ref': ['base.group_user', 'base.group_partner_manager', 'base.group_sale_salesman_all_leads']}"/>
                                 <field name="code"/>
                                 <field name="parent_id"/>

addons/stock/procurement.py

@@ -271,7 +271,8 @@ class procurement_order(osv.osv):
         @param cr: The current row, from the database cursor,
         @param uid: The current user ID for security checks
         @param ids: List of selected IDs
-        @param use_new_cursor: False or the dbname
+        @param use_new_cursor: if set, use a dedicated cursor and auto-commit after processing each procurement.
+            This is appropriate for batch jobs only.
         @param context: A standard dictionary for contextual values
         @return:  Dictionary of values
         '''
@@ -280,7 +281,7 @@ class procurement_order(osv.osv):
             context = {}
         try:
             if use_new_cursor:
-                cr = openerp.registry(use_new_cursor).cursor()
+                cr = openerp.registry(cr.dbname).cursor()
 
             move_obj = self.pool.get('stock.move')
 
@@ -333,15 +334,14 @@ class procurement_order(osv.osv):
     def _procure_orderpoint_confirm(self, cr, uid, use_new_cursor=False, company_id=False, context=None):
         '''
         Create procurement based on Orderpoint
-        use_new_cursor: False or the dbname
 
-        @return:  Dictionary of values
-        """
+        :param bool use_new_cursor: if set, use a dedicated cursor and auto-commit after processing each procurement.
+            This is appropriate for batch jobs only.
         '''
         if context is None:
             context = {}
         if use_new_cursor:
-            cr = openerp.registry(use_new_cursor).db.cursor()
+            cr = openerp.registry(cr.dbname).db.cursor()
         orderpoint_obj = self.pool.get('stock.warehouse.orderpoint')
 
         procurement_obj = self.pool.get('procurement.order')

addons/stock/stock.py

@@ -2282,6 +2282,9 @@ class stock_move(osv.osv):
 
             #Check moves that were pushed
             if move.move_dest_id.state in ('waiting', 'confirmed'):
+                # FIXME is opw 607970 still present with new WMS?
+                # (see commits 1ef2c181033bd200906fb1e5ce35e234bf566ac6
+                # and 41c5ceb8ebb95c1b4e98d8dd1f12b8e547a24b1d)
                 other_upstream_move_ids = self.search(cr, uid, [('id', '!=', move.id), ('state', 'not in', ['done', 'cancel']),
                                             ('move_dest_id', '=', move.move_dest_id.id)], context=context)
                 #If no other moves for the move that got pushed:

addons/web_kanban/static/src/js/kanban.js

@@ -348,10 +348,14 @@ instance.web_kanban.KanbanView = instance.web.View.extend({
     },
     on_groups_started: function() {
         var self = this;
-        if (this.group_by) {
+        if (this.group_by || this.fields_keys.indexOf("sequence") !== -1) {
             // Kanban cards drag'n'drop
-            var prev_widget, is_folded, record;
-            var $columns = this.$el.find('.oe_kanban_column .oe_kanban_column_cards, .oe_kanban_column .oe_kanban_folded_column_cards');
+            var prev_widget, is_folded, record, $columns;
+            if (this.group_by) {
+                $columns = this.$el.find('.oe_kanban_column .oe_kanban_column_cards, .oe_kanban_column .oe_kanban_folded_column_cards');
+            } else {
+                $columns = this.$el.find('.oe_kanban_column_cards');
+            }
             $columns.sortable({
                 handle : '.oe_kanban_draghandle',
                 start: function(event, ui) {
@@ -779,9 +783,9 @@ instance.web_kanban.KanbanGroup = instance.web.Widget.extend({
         });
         var am = instance.webclient.action_manager;
         var form = am.dialog_widget.views.form.controller;
-        form.on("on_button_cancel", am.dialog, am.dialog.close);
+        form.on("on_button_cancel", am.dialog, function() { return am.dialog.$dialog_box.modal('hide'); });
         form.on('record_saved', self, function() {
-            am.dialog.close();
+            am.dialog.$dialog_box.modal('hide');
             self.view.do_reload();
         });
     },

addons/website/views/website_templates.xml

@@ -136,65 +136,7 @@
                     <t t-raw="0"/>
                 </main>
                 <footer>
-                    <div class="container hidden-print" id="footer_container">
-                        <div class="row">
-                            <div class="col-md-3">
-                                <h4>Our products &amp; Services</h4>
-                                <ul class="list-unstyled" name="products">
-                                    <li><a href="/">Home</a></li>
-                                </ul>
-                            </div>
-                            <div class="col-md-3" name="info">
-                                <h4>Connect with us</h4>
-                                <ul class="list-unstyled">
-                                    <li><a href="/page/website.contactus">Contact us</a></li>
-                                </ul>
-                                <ul class="list-unstyled">
-                                    <li t-ignore="true"><i class="fa fa-phone"></i> <span t-field="res_company.phone"></span></li>
-                                    <li t-ignore="true"><i class="fa fa-envelope"></i>  <span t-field="res_company.email"></span></li>
-                                </ul>
-                                <h2>
-                                    <a t-att-href="website.social_facebook" t-if="website.social_facebook"><i class="fa fa-facebook-square"/></a>
-                                    <a t-att-href="website.social_twitter" t-if="website.social_twitter"><i class="fa fa-twitter"/></a>
-                                    <a t-att-href="website.social_linkedin" t-if="website.social_linkedin"><i class="fa fa-linkedin"/></a>
-                                    <a t-att-href="website.social_youtube" t-if="website.social_youtube"><i class="fa fa-youtube-play"/></a>
-                                    <a t-att-href="website.social_googleplus" t-if="website.social_googleplus"><i class="fa fa-google-plus-square"/></a>
-                                    <a t-att-href="website.social_github" t-if="website.social_github"><i class="fa fa-github"/></a>
-                                </h2>
-                            </div>
-                            <div class="col-md-5 col-lg-offset-1">
-                                <div>
-                                    <h4>
-                                        <span t-field="res_company.name">Your Company</span>
-                                        <small> - <a href="/page/website.aboutus">About us</a></small>
-                                    </h4>
-                                    <p>
-                                        We are a team of passionate people whose goal is to improve everyone's
-                                        life through disruptive products. We build great products to solve your
-                                        business problems.
-                                    </p>
-                                    <p>
-                                        Our products are designed for small to medium size companies willing to optimize
-                                        their performance.
-                                    </p>
-                                </div>
-                                <ul class="list-inline js_language_selector mt16" t-if="(request.website_multilang and len(languages) &gt; 1) or editable">
-                                    <li t-foreach="languages" t-as="lg">
-                                        <a t-att-href="url_for(request.httprequest.path + '?' + keep_query(), lang=lg[0])"
-                                           t-att-data-default-lang="editable and 'true' if lg[0] == website.default_lang_code else None">
-                                            <t t-esc="lg[1].split('/').pop()"/>
-                                        </a>
-                                    </li>
-                                    <li groups="base.group_website_publisher">
-                                        <t t-set="url_return" t-value="url_for('', '[lang]') + '?' + keep_query()"/>
-                                        <a t-attf-href="/web#action=base.action_view_base_language_install&amp;website_id=#{website.id}&amp;url_return=#{url_return}">
-                                            <i class="fa fa-plus-circle"/>
-                                            Add a language...
-                                        </a>
-                                    </li>
-                                </ul>
-                            </div>
-                        </div>
+                    <div id="footer_container">
                     </div>
                     <div class="container mt16 mb8">
                         <div class="pull-right" t-ignore="true" t-if="not editable">
@@ -330,8 +272,8 @@
     </xpath>
 </template>
 
-<template id="footer_custom" inherit_id="website.layout" optional="disabled" name="Custom Footer">
-    <xpath expr="//div[@id='footer_container']" position="before">
+<template id="footer_custom" inherit_id="website.layout" name="Footer">
+    <xpath expr="//div[@id='footer_container']" position="replace">
         <div class="oe_structure">
             <section data-snippet-id='three-columns' class="mt16 mb16">
                 <div class="container">
@@ -359,8 +301,69 @@
             </section>
         </div>
     </xpath>
-    <xpath expr="//div[@id='footer_container']" position="attributes">
-        <attribute name="style">display: none</attribute>
+</template>
+
+<template id="footer_default" inherit_id="website.footer_custom" optional="enabled" name="Automatic Footer">
+    <xpath expr="//div[@class='oe_structure']" position="replace">
+        <div class="container hidden-print">
+            <div class="row">
+                <div class="col-md-3">
+                    <h4>Our products &amp; Services</h4>
+                    <ul class="list-unstyled" id="products">
+                        <li><a href="/">Home</a></li>
+                    </ul>
+                </div>
+                <div class="col-md-3" id="info">
+                    <h4>Connect with us</h4>
+                    <ul class="list-unstyled">
+                        <li><a href="/page/website.contactus">Contact us</a></li>
+                    </ul>
+                    <ul class="list-unstyled">
+                        <li t-ignore="true"><i class="fa fa-phone"></i> <span t-field="res_company.phone"></span></li>
+                        <li t-ignore="true"><i class="fa fa-envelope"></i>  <span t-field="res_company.email"></span></li>
+                    </ul>
+                    <h2>
+                        <a t-att-href="website.social_facebook" t-if="website.social_facebook"><i class="fa fa-facebook-square"/></a>
+                        <a t-att-href="website.social_twitter" t-if="website.social_twitter"><i class="fa fa-twitter"/></a>
+                        <a t-att-href="website.social_linkedin" t-if="website.social_linkedin"><i class="fa fa-linkedin"/></a>
+                        <a t-att-href="website.social_youtube" t-if="website.social_youtube"><i class="fa fa-youtube-play"/></a>
+                        <a t-att-href="website.social_googleplus" t-if="website.social_googleplus"><i class="fa fa-google-plus-square"/></a>
+                        <a t-att-href="website.social_github" t-if="website.social_github"><i class="fa fa-github"/></a>
+                    </h2>
+                </div>
+                <div class="col-md-5 col-lg-offset-1">
+                    <div>
+                        <h4>
+                            <span t-field="res_company.name" />
+                            <small> - <a href="/page/website.aboutus">About us</a></small>
+                        </h4>
+                        <p>
+                            We are a team of passionate people whose goal is to improve everyone's
+                            life through disruptive products. We build great products to solve your
+                            business problems.
+                        </p>
+                        <p>
+                            Our products are designed for small to medium size companies willing to optimize
+                            their performance.
+                        </p>
+                    </div>
+                    <ul class="list-inline js_language_selector mt16" t-if="(request.website_multilang and len(languages) &gt; 1) or editable">
+                        <li t-foreach="languages" t-as="lg">
+                            <a t-att-href="url_for(request.httprequest.path + '?' + keep_query(), lang=lg[0])"
+                             t-att-data-default-lang="editable and 'true' if lg[0] == website.default_lang_code else None">
+                             <t t-esc="lg[1].split('/').pop()"/></a>
+                        </li>
+                        <li groups="base.group_website_publisher">
+                            <t t-set="url_return" t-value="url_for('', '[lang]') + '?' + keep_query()"/>
+                            <a t-attf-href="/web#action=base.action_view_base_language_install&amp;website_id=#{website.id}&amp;url_return=#{url_return}">
+                            <i class="fa fa-plus-circle"/>
+                            Add a language...
+                            </a>
+                        </li>
+                    </ul>
+                </div>
+            </div>
+        </div>
     </xpath>
 </template>
 

addons/website_blog/views/website_blog_templates.xml

@@ -10,8 +10,8 @@
 </template>
 
 <!-- Layout add nav and footer -->
-<template id="header_footer_custom" inherit_id="website.layout" name="Footer News Blog Link">
-    <xpath expr="//footer//div[@name='info']/ul" position="inside">
+<template id="header_footer_custom" inherit_id="website.footer_default" name="Footer News Blog Link">
+    <xpath expr="//div[@id='info']/ul" position="inside">
         <li><a t-attf-href="/blog/%(website_blog.blog_blog_1)d">News</a></li>
     </xpath>
 </template>
@@ -187,7 +187,7 @@
                     <span class="fa fa-times"/>
                 </a>
             </div>
-            <div class="cover-storage oe_hidden"></div> 
+            <div class="cover-storage oe_hidden"></div>
             <t t-call="website.publish_management">
                 <t t-set="object" t-value="blog_post"/>
                 <t t-set="publish_edit" t-value="True"/>

addons/website_crm_partner_assign/controllers/main.py

@@ -146,7 +146,7 @@ class WebsiteCrmPartnerAssign(http.Controller):
     # Do not use semantic controller due to SUPERUSER_ID
     @http.route(['/partners/<partner_id>'], type='http', auth="public", website=True)
     def partners_detail(self, partner_id, partner_name='', **post):
-        mo = re.search('-([-0-9]+)$', str(partner_id))
+        mo = re.search('([-0-9]+)$', str(partner_id))
         current_grade, current_country = None, None
         grade_id = post.get('grade_id')
         country_id = post.get('country_id')

addons/website_crm_partner_assign/views/website_crm_partner_assign.xml

@@ -3,13 +3,13 @@
 <data>
 
 <!-- Layout add nav and footer -->
-<template id="footer_custom" inherit_id="website.layout" name="Footer Partners Link">
-    <xpath expr="//footer//div[@name='info']/ul" position="inside">
+<template id="footer_custom" inherit_id="website.footer_default" name="Footer Partners Link">
+    <xpath expr="//div[@id='info']/ul" position="inside">
         <li><a href="/partners">Resellers</a></li>
     </xpath>
 </template>
 
-<!-- Page --> 
+<!-- Page -->
 <template id="layout" name="Partners Layout">
     <t t-call="website.layout">
         <t t-set="additional_title">Resellers</t>
@@ -44,7 +44,7 @@
                         <li t-att-class="grade['active'] and 'active' or ''">
                             <a t-attf-href="/partners#{ grade['grade_id'][0] and '/grade/%s' % grade['grade_id'][0] or '' }#{ current_country and '/country/%s' % slug(current_country) or '' }#{ '?' + (search_path or '') }">
                                 <span class="badge pull-right" t-esc="grade['grade_id_count'] or ''"/>
-                                <t t-esc="grade['grade_id'][1]"/> 
+                                <t t-esc="grade['grade_id'][1]"/>
                             </a>
                         </li>
                     </t>
@@ -54,16 +54,16 @@
                     <li class="nav-header"><h3>Filter by Country</h3></li>
                     <t t-foreach="countries" t-as="country">
                         <li t-if="country['country_id']" t-att-class="country['active'] and 'active' or ''">
-                            <a t-attf-href="/partners#{ current_grade and '/grade/%s' % slug(current_grade) or ''}#{country['country_id'][0] and '/country/%s' % country['country_id'][0] or '' }#{ '?' + (search_path or '') + (country['country_id'][0] == 0 and 'country_all=True' or '')}">
+                            <a t-attf-href="/partners#{ current_grade and '/grade/%s' % slug(current_grade) or ''}#{country['country_id'][0] and '/country/%s' % country['country_id'][0] or '' }#{ '?' + (search_path or '')}">
                                 <span class="badge pull-right" t-esc="country['country_id_count'] or ''"/>
-                                <t t-esc="country['country_id'][1]"/> 
+                                <t t-esc="country['country_id'][1]"/>
                             </a>
                         </li>
                     </t>
                 </ul>
 
             </div>
-            
+
             <div class="col-md-8 col-md-offset-1" id="ref_content">
                 <div class='navbar'>
                     <div>
@@ -115,10 +115,24 @@
 
 <template id="ref_country" inherit_id="website_crm_partner_assign.index" optional="enabled" name="Left World Map">
     <xpath expr="//ul[@id='reseller_countries']" position="after">
-        <h3>World Map</h3>
+        <!-- modal for large map -->
+        <div class="modal fade partner_map_modal" tabindex="-1" role="dialog" aria-labelledby="myLargeModalLabel" aria-hidden="true">
+          <div class="modal-dialog modal-lg">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+                    <h4 class="modal-title">World Map</h4>
+                </div>
+                <iframe t-attf-src="/google_map/?width=898&amp;height=485&amp;partner_ids=#{ google_map_partner_ids }&amp;partner_url=/partners/"
+                style="width:898px; height:485px; border:0; padding:0; margin:0;"></iframe>
+            </div>
+          </div>
+        </div>
+        <!-- modal end -->
+        <h3>World Map<button class="btn btn-link" data-toggle="modal" data-target=".partner_map_modal"><span class="fa fa-external-link" /></button></h3>
         <ul class="nav">
-            <iframe t-attf-src="/google_map/?width=260&amp;height=240&amp;partner_ids=#{ google_map_partner_ids }&amp;partner_url=/partners"
-                style="width:260px; height:260px; border:0; padding:0; margin:0;"></iframe>
+            <iframe t-attf-src="/google_map/?width=260&amp;height=240&amp;partner_ids=#{ google_map_partner_ids }&amp;partner_url=/partners/"
+                style="width:260px; height:240px; border:0; padding:0; margin:0;"></iframe>
         </ul>
     </xpath>
 </template>

addons/website_customer/controllers/main.py

@@ -84,7 +84,7 @@ class WebsiteCustomer(http.Controller):
     # Do not use semantic controller due to SUPERUSER_ID
     @http.route(['/customers/<partner_id>'], type='http', auth="public", website=True)
     def partners_detail(self, partner_id, **post):
-        mo = re.search('-([-0-9]+)$', str(partner_id))
+        mo = re.search('([-0-9]+)$', str(partner_id))
         if mo:
             partner_id = int(mo.group(1))
             partner = request.registry['res.partner'].browse(request.cr, SUPERUSER_ID, partner_id, context=request.context)

addons/website_customer/views/website_customer.xml

@@ -3,8 +3,8 @@
 <data>
 
 <!-- Layout add nav and footer -->
-<template id="footer_custom" inherit_id="website.layout" name="Footer Customer References Link">
-    <xpath expr="//footer//div[@name='info']/ul" position="inside">
+<template id="footer_custom" inherit_id="website.footer_default" name="Footer Customer References Link">
+    <xpath expr="//div[@id='info']/ul" position="inside">
         <li><a href="/customers">Our References</a></li>
     </xpath>
 </template>
@@ -66,11 +66,27 @@
 </template>
 
 <!-- Option: left column: World Map -->
-<template id="opt_country" inherit_id="website_customer.index" optional="disabled" name="Show Map">
+<template id="opt_country" inherit_id="website_customer.index" optional="enabled" name="Show Map">
     <xpath expr="//div[@id='ref_left_column']" position="inside">
-
-        <iframe t-attf-src="/google_map/?partner_ids=#{ google_map_partner_ids }&amp;partner_url=/customers/&amp;output=embed"
-            style="width:100%; border:0; padding:0; margin:0;"></iframe>
+        <!-- modal for large map -->
+        <div class="modal fade customer_map_modal" tabindex="-1" role="dialog" aria-labelledby="myLargeModalLabel" aria-hidden="true">
+          <div class="modal-dialog modal-lg">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+                    <h4 class="modal-title">World Map</h4>
+                </div>
+                <iframe t-attf-src="/google_map/?width=898&amp;height=485&amp;partner_ids=#{ google_map_partner_ids }&amp;partner_url=/customers/"
+                style="width:898px; height:485px; border:0; padding:0; margin:0;"></iframe>
+            </div>
+          </div>
+        </div>
+        <!-- modal end -->
+        <h3>World Map<button class="btn btn-link" data-toggle="modal" data-target=".customer_map_modal"><span class="fa fa-external-link" /></button></h3>
+        <ul class="nav">
+            <iframe t-attf-src="/google_map/?width=260&amp;height=240&amp;partner_ids=#{ google_map_partner_ids }&amp;partner_url=/customers/"
+                style="width:260px; height:240px; border:0; padding:0; margin:0;"></iframe>
+        </ul>
     </xpath>
 </template>
 

addons/website_event/views/website_event.xml

@@ -16,8 +16,8 @@
 </template>
 
 <!-- Layout add nav and footer -->
-<template id="header_footer_custom" inherit_id="website.layout" name="Footer Events Link">
-    <xpath expr="//footer//ul[@name='products']" position="inside">
+<template id="header_footer_custom" inherit_id="website.footer_default" name="Footer Events Link">
+    <xpath expr="//ul[@id='products']" position="inside">
         <li><a href="/event">Events</a></li>
     </xpath>
 </template>
@@ -346,7 +346,7 @@
                     <div t-if="event.twitter_hashtag" class="mt16">
                         <p><strong>Participate on Twitter</strong></p>
                         <p class="text-muted">
-                            Find out what people see and say about this event, 
+                            Find out what people see and say about this event,
                             and join the conversation.
                         </p>
                         <p><strong>Use this tag:

addons/website_forum/views/website_forum.xml

@@ -14,9 +14,9 @@
 </template>
 
 <!-- Layout add nav and footer -->
-<template id="header_footer_custom" inherit_id="website.layout"
+<template id="header_footer_custom" inherit_id="website.footer_default"
     name="Footer Questions Link">
-    <xpath expr="//footer//ul[@name='products']" position="inside">
+    <xpath expr="//ul[@id='products']" position="inside">
         <li><a t-attf-href="/forum/%(website_forum.forum_help)d">Q&amp;A</a></li>
         <li><a href="/forum">Forums</a></li>
     </xpath>
@@ -134,7 +134,7 @@
                             <div class="panel-heading text-center">
                                 <h3 class="panel-title ">Stats</h3>
                             </div>
-                            <div class="panel-body"> 
+                            <div class="panel-body">
                                 <table class="table">
                                     <thead><tr><td> Asked: <strong><span t-field="question.create_date" t-field-options='{"format":"short"}'/></strong></td></tr></thead>
                                     <tr><td> Seen: <strong><t t-raw="question.views"/></strong>
@@ -181,7 +181,7 @@
                     style="display: inline-block;"/>
                 on <span t-field="question.write_date" t-field-options='{"format":"short"}'/>
                 with <b t-field="question.views"/> views
-                <span t-if="question.vote_count&gt;0"> and 
+                <span t-if="question.vote_count&gt;0"> and
                     <b t-esc="question.vote_count or 0"/>
                     <t t-if="question.vote_count&gt;1">votes</t>
                     <t t-if="question.vote_count==1">vote</t>
@@ -414,10 +414,10 @@
 
 <template id="vote">
     <div t-attf-class="box oe_grey">
-        <a t-attf-class="vote_up fa fa-thumbs-up no-decoration #{post.user_vote == 1 and 'text-success' or ''}" 
+        <a t-attf-class="vote_up fa fa-thumbs-up no-decoration #{post.user_vote == 1 and 'text-success' or ''}"
             t-attf-data-href="/forum/#{slug(post.forum_id)}/post/#{slug(post)}/upvote"/>
         <span id="vote_count" t-esc="post.vote_count"/>
-        <a t-attf-class="vote_down fa fa-thumbs-down no-decoration #{post.user_vote == -1 and 'text-warning' or ''}" 
+        <a t-attf-class="vote_down fa fa-thumbs-down no-decoration #{post.user_vote == -1 and 'text-warning' or ''}"
             t-attf-data-href="/forum/#{slug(post.forum_id)}/post/#{slug(post)}/downvote"/>
         <div t-if="vote_count &gt; 1" class="subtitle">
             votes
@@ -654,7 +654,7 @@
                 <a t-attf-href="/forum/#{ slug(forum) }/tag/#{ slug(tag) }/questions?{{ keep_query( filters='tag') }}" class="badge">
                     <span t-field="tag.name"/>
                 </a>
-                <span> 
+                <span>
                     X <t t-esc="tag.posts_count"/>
                 </span>
             </div>
@@ -694,7 +694,7 @@
 
 <template id="badge_user">
     <t t-call="website_forum.header">
-        <h3 class="mt32 mb32"> 
+        <h3 class="mt32 mb32">
             <b>Badge "<span t-field="badge.name"/>"</b>
         </h3>
         <div>
@@ -765,7 +765,7 @@
                 <label class="col-md-2 control-label mb16" for="user.name">Real name</label>
                 <div class="col-md-7 mb16">
                     <input type="text" class="col-md-7 mb16 form-control" name="name" required="True" t-attf-value="#{user.name}"/>
-                </div> 
+                </div>
                 <label class="col-md-2 control-label mb16" for="user.partner_id.website">Website</label>
                 <div class="col-md-7 mb16">
                     <input type="text" class="form-control" name="website" t-attf-value="#{user.partner_id.website or ''}"/>
@@ -790,7 +790,7 @@
                 <!--Note: using website_description fiels instead of using commnt firld of partner-->
                 <label class="col-md-4 control-label mb16" for="user.partner_id.website_description">Biography</label>
                 <div class="col-md-7 mb16">
-                    <textarea name="description" style="min-height: 120px" required="True" 
+                    <textarea name="description" style="min-height: 120px" required="True"
                         class="form-control"><t t-esc="user.partner_id.website_description"/></textarea>
                 </div>
                 <div class="col-sm-offset-4 col-md-4 mb16">
@@ -835,7 +835,7 @@
                         <span t-if="user.city and user.country_id">, </span>
                         <span t-field="user.country_id"/>
                         <t t-if="user.country_id"> <span t-field="user.country_id.image" t-field-options='{"widget": "image", "class": "country_flag"}'/></t>
-                        
+
                     </td>
                 </tr>
                 <tr>
@@ -919,7 +919,7 @@
                         <span t-field="activity.date" t-field-options='{"format": "short"}'/>
                         <span t-esc="activity.subtype_id.name" class="label label-info"/>
                         <t t-set="post" t-value="posts[activity.res_id]"/>
-                        <span t-if="post[1]"> 
+                        <span t-if="post[1]">
                             <a t-attf-href="/forum/#{ slug(forum) }/question/#{ slug(post[0]) }#answer-#{ str(post[1].id) }">
                                 <span t-esc="post[0].name"/>
                             </a>

addons/website_forum_doc/views/website_doc.xml

@@ -3,9 +3,9 @@
     <data>
 
         <!-- Layout add nav and footer -->
-        <template id="header_footer_custom" inherit_id="website.layout"
+        <template id="header_footer_custom" inherit_id="website.footer_default"
             name="Footer Documentation Link">
-            <xpath expr="//footer//ul[@name='products']" position="inside">
+            <xpath expr="//ul[@id='products']" position="inside">
                 <li><a href="/forum/how-to">Documentation</a></li>
             </xpath>
         </template>
@@ -126,7 +126,7 @@
                                 <ul>
                                     <t t-foreach="toc.post_ids" t-as="topic">
                                         <li t-if="post.id != topic.id">
-                                            <a t-attf-href="/forum/how-to/#{slug(toc)}/#{slug(topic)}" t-field="post.name"/>
+                                            <a t-attf-href="/forum/how-to/#{slug(toc)}/#{slug(topic)}" t-field="topic.name"/>
                                         </li>
                                     </t>
                                 </ul>

addons/website_google_map/__init__.py

@@ -1,2 +1 @@
 import controllers
-import models