diff --git a/addons/account/__openerp__.py b/addons/account/__openerp__.py
index d72711424f2..e06e41cf001 100644
--- a/addons/account/__openerp__.py
+++ b/addons/account/__openerp__.py
@@ -99,7 +99,6 @@ for a particular financial year and for preparation of vouchers there is a modul
         'project/wizard/project_account_analytic_line_view.xml',
         'account_end_fy.xml',
         'account_invoice_view.xml',
-        'partner_view.xml',
         'data/account_data.xml',
         'data/data_account_type.xml',
         'data/configurable_account_chart.xml',
@@ -112,6 +111,7 @@ for a particular financial year and for preparation of vouchers there is a modul
         'project/wizard/account_analytic_journal_report_view.xml',
         'project/wizard/account_analytic_cost_ledger_for_journal_report_view.xml',
         'project/wizard/account_analytic_chart_view.xml',
+        'partner_view.xml',
         'product_view.xml',
         'account_assert_test.xml',
         'process/statement_process.xml',
diff --git a/addons/account/account.py b/addons/account/account.py
index 3959799f1bb..e92bd3a7879 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -1670,7 +1670,7 @@ class account_move_reconcile(osv.osv):
                 elif reconcile.line_partial_ids:
                     first_partner = reconcile.line_partial_ids[0].partner_id.id
                     move_lines = reconcile.line_partial_ids
-                if any([line.partner_id.id != first_partner for line in move_lines]):
+                if any([(line.account_id.type in ('receivable', 'payable') and line.partner_id.id != first_partner) for line in move_lines]):
                     return False
         return True
 
diff --git a/addons/account/account_financial_report_data.xml b/addons/account/account_financial_report_data.xml
index 6410a5e887c..e8ff33151c3 100644
--- a/addons/account/account_financial_report_data.xml
+++ b/addons/account/account_financial_report_data.xml
@@ -6,16 +6,19 @@
         -->
         <record id="account_financial_report_profitandloss0" model="account.financial.report">
             <field name="name">Profit and Loss</field>
+            <field name="sign" eval="-1" />
             <field name="type">sum</field>
         </record>
         <record id="account_financial_report_income0" model="account.financial.report">
             <field name="name">Income</field>
+            <field name="sign" eval="-1" />
             <field name="parent_id" ref="account_financial_report_profitandloss0"/>
             <field name="display_detail">detail_with_hierarchy</field>
             <field name="type">account_type</field>
         </record>
         <record id="account_financial_report_expense0" model="account.financial.report">
             <field name="name">Expense</field>
+            <field name="sign" eval="-1" />
             <field name="parent_id" ref="account_financial_report_profitandloss0"/>
             <field name="display_detail">detail_with_hierarchy</field>
             <field name="type">account_type</field>
diff --git a/addons/account/account_installer.xml b/addons/account/account_installer.xml
index 58e824a6250..b03babc63ac 100644
--- a/addons/account/account_installer.xml
+++ b/addons/account/account_installer.xml
@@ -20,10 +20,11 @@
                     </p>
                     <group>
                         <field name="charts" class="oe_inline"/>
+                        <field name="company_id" widget="selection"/><!-- we assume that this wizard will be run only by administrators and as this field may cause problem if hidden (because of the default company of the user removed from the selection because already configured), we simply choosed to remove the group "multi company" of it -->
                     </group>
                     <group string="Configure your Fiscal Year" groups="account.group_account_user">
                         <field name="has_default_company" invisible="1" />
-                        <field name="company_id" colspan="4" widget="selection" attrs="{'invisible' : [('has_default_company', '=', True)]}"/><!-- we assume that this wizard will be run only by administrators and as this field may cause problem if hidden (because of the default company of the user removed from the selection because already configured), we simply choosed to remove the group "multi company" of it -->
+                        
                         <label for="date_start" string="Date Range"/>
                         <div>
                             <field name="date_start" on_change="on_change_start_date(date_start)" class="oe_inline"/> -
diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py
index c47cf70b673..ab6ad97b180 100644
--- a/addons/account/account_invoice.py
+++ b/addons/account/account_invoice.py
@@ -635,6 +635,26 @@ class account_invoice(osv.osv):
         self.create_workflow(cr, uid, ids)
         return True
 
+    # ----------------------------------------
+    # Mail related methods
+    # ----------------------------------------
+
+    def _get_formview_action(self, cr, uid, id, context=None):
+        """ Update form view id of action to open the invoice """
+        action = super(account_invoice, self)._get_formview_action(cr, uid, id, context=context)
+        obj = self.browse(cr, uid, id, context=context)
+        if obj.type == 'in_invoice':
+            model, view_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'account', 'invoice_supplier_form')
+            action.update({
+                'views': [(view_id, 'form')],
+                })
+        else:
+            model, view_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'account', 'invoice_form')
+            action.update({
+                'views': [(view_id, 'form')],
+                })
+        return action
+
     # Workflow stuff
     #################
 
@@ -722,7 +742,7 @@ class account_invoice(osv.osv):
         inv = self.browse(cr, uid, id)
         cur_obj = self.pool.get('res.currency')
 
-        company_currency = inv.company_id.currency_id.id
+        company_currency = self.pool['res.company'].browse(cr, uid, inv.company_id.id).currency_id.id
         if inv.type in ('out_invoice', 'in_refund'):
             sign = 1
         else:
@@ -769,6 +789,7 @@ class account_invoice(osv.osv):
         return move_lines
 
     def check_tax_lines(self, cr, uid, inv, compute_taxes, ait_obj):
+        company_currency = self.pool['res.company'].browse(cr, uid, inv.company_id.id).currency_id
         if not inv.tax_line:
             for tax in compute_taxes.values():
                 ait_obj.create(cr, uid, tax)
@@ -782,7 +803,7 @@ class account_invoice(osv.osv):
                 if not key in compute_taxes:
                     raise osv.except_osv(_('Warning!'), _('Global taxes defined, but they are not in invoice lines !'))
                 base = compute_taxes[key]['base']
-                if abs(base - tax.base) > inv.company_id.currency_id.rounding:
+                if abs(base - tax.base) > company_currency.rounding:
                     raise osv.except_osv(_('Warning!'), _('Tax base different!\nClick on compute to update the tax base.'))
             for key in compute_taxes:
                 if not key in tax_key:
@@ -869,7 +890,7 @@ class account_invoice(osv.osv):
             ctx.update({'lang': inv.partner_id.lang})
             if not inv.date_invoice:
                 self.write(cr, uid, [inv.id], {'date_invoice': fields.date.context_today(self,cr,uid,context=context)}, context=ctx)
-            company_currency = inv.company_id.currency_id.id
+            company_currency = self.pool['res.company'].browse(cr, uid, inv.company_id.id).currency_id.id
             # create the analytical lines
             # one move line per invoice line
             iml = self._get_analytic_lines(cr, uid, inv.id, context=ctx)
@@ -985,7 +1006,8 @@ class account_invoice(osv.osv):
                 'line_id': line,
                 'journal_id': journal_id,
                 'date': date,
-                'narration':inv.comment
+                'narration': inv.comment,
+                'company_id': inv.company_id.id,
             }
             period_id = inv.period_id and inv.period_id.id or False
             ctx.update(company_id=inv.company_id.id)
@@ -1438,6 +1460,7 @@ class account_invoice_line(osv.osv):
         result = {}
         res = self.pool.get('product.product').browse(cr, uid, product, context=context)
 
+        result['name'] = res.partner_ref
         if type in ('out_invoice','out_refund'):
             a = res.property_account_income.id
             if not a:
@@ -1452,19 +1475,21 @@ class account_invoice_line(osv.osv):
 
         if type in ('out_invoice', 'out_refund'):
             taxes = res.taxes_id and res.taxes_id or (a and self.pool.get('account.account').browse(cr, uid, a, context=context).tax_ids or False)
+            if res.description_sale:
+                result['name'] += '\n'+res.description_sale
         else:
             taxes = res.supplier_taxes_id and res.supplier_taxes_id or (a and self.pool.get('account.account').browse(cr, uid, a, context=context).tax_ids or False)
+            if res.description_purchase:
+                result['name'] += '\n'+res.description_purchase
+
         tax_id = fpos_obj.map_tax(cr, uid, fpos, taxes)
 
         if type in ('in_invoice', 'in_refund'):
             result.update( {'price_unit': price_unit or res.standard_price,'invoice_line_tax_id': tax_id} )
         else:
             result.update({'price_unit': res.list_price, 'invoice_line_tax_id': tax_id})
-        result['name'] = res.partner_ref
 
         result['uos_id'] = uom_id or res.uom_id.id
-        if res.description:
-            result['name'] += '\n'+res.description
 
         domain = {'uos_id':[('category_id','=',res.uom_id.category_id.id)]}
 
@@ -1517,8 +1542,7 @@ class account_invoice_line(osv.osv):
         if context is None:
             context = {}
         inv = self.pool.get('account.invoice').browse(cr, uid, invoice_id, context=context)
-        company_currency = inv.company_id.currency_id.id
-
+        company_currency = self.pool['res.company'].browse(cr, uid, inv.company_id.id).currency_id.id
         for line in inv.invoice_line:
             mres = self.move_line_get_item(cr, uid, line, context)
             if not mres:
@@ -1662,8 +1686,7 @@ class account_invoice_tax(osv.osv):
         cur_obj = self.pool.get('res.currency')
         inv = self.pool.get('account.invoice').browse(cr, uid, invoice_id, context=context)
         cur = inv.currency_id
-        company_currency = inv.company_id.currency_id.id
-
+        company_currency = self.pool['res.company'].browse(cr, uid, inv.company_id.id).currency_id.id
         for line in inv.invoice_line:
             for tax in tax_obj.compute_all(cr, uid, line.invoice_line_tax_id, (line.price_unit* (1-(line.discount or 0.0)/100.0)), line.quantity, line.product_id, inv.partner_id)['taxes']:
                 val={}
diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index 006e2c55f5f..d6c25364784 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -626,7 +626,7 @@ class account_move_line(osv.osv):
         (_check_date, 'The date of your Journal Entry is not in the defined period! You should change the date or remove this constraint from the journal.', ['date']),
         (_check_currency, 'The selected account of your Journal Entry forces to provide a secondary currency. You should remove the secondary currency on the account or select a multi-currency view on the journal.', ['currency_id']),
         (_check_currency_and_amount, "You cannot create journal items with a secondary currency without recording both 'currency' and 'amount currency' field.", ['currency_id','amount_currency']),
-        (_check_currency_amount, 'The amount expressed in the secondary currency must be positif when journal item are debit and negatif when journal item are credit.', ['amount_currency']),
+        (_check_currency_amount, 'The amount expressed in the secondary currency must be positive when the journal item is a debit and negative when if it is a credit.', ['amount_currency']),
         (_check_currency_company, "You cannot provide a secondary currency if it is the same than the company one." , ['currency_id']),
     ]
 
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 13bc694a1cc..603c4254b19 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -2111,10 +2111,8 @@
                         <group attrs="{'invisible': [('only_one_chart_template','=',True)]}">
                             <field name="chart_template_id" widget="selection" on_change="onchange_chart_template_id(chart_template_id)" domain="[('visible','=', True)]"/>
                         </group>
-                        <group groups="base.group_multi_company">
-                            <field name="company_id" widget="selection" on_change="onchange_company_id(company_id)"/> <!-- we assume that this wizard will be run only by administrators and as this field may cause problem if hidden (because of the default company of the user removed from the selection because already configured), we simply choosed to remove the group "multi company" of it -->
-                        </group>
                         <group>
+                            <field name="company_id" widget="selection" on_change="onchange_company_id(company_id)"/> <!-- we assume that this wizard will be run only by administrators and as this field may cause problem if hidden (because of the default company of the user removed from the selection because already configured), we simply choosed to remove the group "multi company" of it -->
                             <field name="currency_id" class="oe_inline"/>
                             <field name="sale_tax" attrs="{'invisible': [('complete_tax_set', '!=', True)]}" domain="[('chart_template_id', '=', chart_template_id),('parent_id','=',False),('type_tax_use','in',('sale','all'))]"/>
                             <label for="sale_tax_rate" string="Sale Tax" attrs="{'invisible': [('complete_tax_set', '=', True)]}"/>
diff --git a/addons/account/demo/account_minimal.xml b/addons/account/demo/account_minimal.xml
index ce9a09def08..3940c1e5357 100644
--- a/addons/account/demo/account_minimal.xml
+++ b/addons/account/demo/account_minimal.xml
@@ -313,8 +313,8 @@
             <field name="code">TSAJ</field>
             <field name="type">sale</field>
             <field name="sequence_id" ref="sequence_sale_journal"/>
-            <field model="account.account" name="default_credit_account_id" ref="a_sale"/>
-            <field model="account.account" name="default_debit_account_id" ref="a_sale"/>
+            <field name="default_credit_account_id" ref="a_sale"/>
+            <field name="default_debit_account_id" ref="a_sale"/>
             <field name="analytic_journal_id" ref="cose_journal_sale"/>
             <field name="user_id" ref="base.user_root"/>
         </record>
@@ -323,8 +323,8 @@
             <field name="code">TSCNJ</field>
             <field name="type">sale_refund</field>
             <field name="sequence_id" ref="sequence_refund_sales_journal"/>
-            <field model="account.account" name="default_credit_account_id" ref="a_sale"/>
-            <field model="account.account" name="default_debit_account_id" ref="a_sale"/>
+            <field name="default_credit_account_id" ref="a_sale"/>
+            <field name="default_debit_account_id" ref="a_sale"/>
             <field name="analytic_journal_id" ref="cose_journal_sale"/>
             <field name="user_id" ref="base.user_root"/>
         </record>
@@ -334,8 +334,8 @@
             <field name="code">TEXJ</field>
             <field name="type">purchase</field>
             <field name="sequence_id" ref="sequence_purchase_journal"/>
-            <field model="account.account" name="default_debit_account_id" ref="a_expense"/>
-            <field model="account.account" name="default_credit_account_id" ref="a_expense"/>
+            <field name="default_debit_account_id" ref="a_expense"/>
+            <field name="default_credit_account_id" ref="a_expense"/>
             <field name="analytic_journal_id" ref="exp"/>
             <field name="user_id" ref="base.user_root"/>
         </record>
@@ -344,8 +344,8 @@
             <field name="code">TECNJ</field>
             <field name="type">purchase_refund</field>
             <field name="sequence_id" ref="sequence_refund_purchase_journal"/>
-            <field model="account.account" name="default_debit_account_id" ref="a_expense"/>
-            <field model="account.account" name="default_credit_account_id" ref="a_expense"/>
+            <field name="default_debit_account_id" ref="a_expense"/>
+            <field name="default_credit_account_id" ref="a_expense"/>
             <field name="analytic_journal_id" ref="exp"/>
             <field name="user_id" ref="base.user_root"/>
         </record>
@@ -355,8 +355,8 @@
             <field name="code">TBNK</field>
             <field name="type">bank</field>
             <field name="sequence_id" ref="sequence_bank_journal"/>
-            <field model="account.account" name="default_debit_account_id" ref="bnk"/>
-            <field model="account.account" name="default_credit_account_id" ref="bnk"/>
+            <field name="default_debit_account_id" ref="bnk"/>
+            <field name="default_credit_account_id" ref="bnk"/>
             <field name="analytic_journal_id" ref="sit"/>
             <field name="user_id" ref="base.user_root"/>
         </record>
@@ -365,8 +365,8 @@
             <field name="code">TCHK</field>
             <field name="type">bank</field>
             <field name="sequence_id" ref="sequence_check_journal"/>
-            <field model="account.account" name="default_debit_account_id" ref="cash"/>
-            <field model="account.account" name="default_credit_account_id" ref="cash"/>
+            <field name="default_debit_account_id" ref="cash"/>
+            <field name="default_credit_account_id" ref="cash"/>
             <field name="analytic_journal_id" ref="sit"/>
             <field name="user_id" ref="base.user_root"/>
         </record>
@@ -374,9 +374,9 @@
             <field name="name">Cash Journal - (test)</field>
             <field name="code">TCSH</field>
             <field name="type">cash</field>
-            <field name="profit_account_id" model="account.account" ref="rsa" />
-            <field name="loss_account_id" model="account.account" ref="rsa" />
-            <field name="internal_account_id" model="account.account" ref="rsa" />
+            <field name="profit_account_id" ref="rsa" />
+            <field name="loss_account_id" ref="rsa" />
+            <field name="internal_account_id" ref="rsa" />
             <field name="with_last_closing_balance" eval="True" />
             <!--
                  Usually, cash payment methods requires a control at opening and closing.
@@ -385,8 +385,8 @@
             -->
             <field name="cash_control" eval="False"/>
             <field name="sequence_id" ref="sequence_cash_journal"/>
-            <field model="account.account" name="default_debit_account_id" ref="cash"/>
-            <field model="account.account" name="default_credit_account_id" ref="cash"/>
+            <field name="default_debit_account_id" ref="cash"/>
+            <field name="default_credit_account_id" ref="cash"/>
             <field name="analytic_journal_id" ref="sit"/>
             <field name="user_id" ref="base.user_root"/>
         </record>
@@ -403,8 +403,8 @@
             <field name="code">TOEJ</field>
             <field name="type">situation</field>
             <field name="sequence_id" ref="sequence_opening_journal"/>
-            <field model="account.account" name="default_debit_account_id" ref="o_income"/>
-            <field model="account.account" name="default_credit_account_id" ref="o_expense"/>
+            <field name="default_debit_account_id" ref="o_income"/>
+            <field name="default_credit_account_id" ref="o_expense"/>
             <field eval="True" name="centralisation"/>
             <field name="user_id" ref="base.user_root"/>
         </record>
@@ -413,8 +413,8 @@
             <field name="name">USD Bank Journal - (test)</field>
             <field name="code">TUBK</field>
             <field name="type">bank</field>
-            <field model="account.account" name="default_debit_account_id" ref="usd_bnk"/>
-            <field model="account.account" name="default_credit_account_id" ref="usd_bnk"/>
+            <field name="default_debit_account_id" ref="usd_bnk"/>
+            <field name="default_credit_account_id" ref="usd_bnk"/>
             <field name="currency" ref="base.USD"/>
         </record>
         <!--
diff --git a/addons/account/html/account_illu_01.png b/addons/account/html/account_illu_01.png
new file mode 100644
index 00000000000..2e0dbf4aac2
Binary files /dev/null and b/addons/account/html/account_illu_01.png differ
diff --git a/addons/account/html/account_illu_02.png b/addons/account/html/account_illu_02.png
new file mode 100644
index 00000000000..66e680bc42e
Binary files /dev/null and b/addons/account/html/account_illu_02.png differ
diff --git a/addons/account/html/account_illu_03.png b/addons/account/html/account_illu_03.png
new file mode 100644
index 00000000000..4fff4837faa
Binary files /dev/null and b/addons/account/html/account_illu_03.png differ
diff --git a/addons/account/html/account_sc_00.png b/addons/account/html/account_sc_00.png
new file mode 100644
index 00000000000..9605506c6a5
Binary files /dev/null and b/addons/account/html/account_sc_00.png differ
diff --git a/addons/account/html/account_sc_01.png b/addons/account/html/account_sc_01.png
new file mode 100644
index 00000000000..f5a216ec9e3
Binary files /dev/null and b/addons/account/html/account_sc_01.png differ
diff --git a/addons/account/html/account_sc_02.png b/addons/account/html/account_sc_02.png
new file mode 100644
index 00000000000..709e444ba0d
Binary files /dev/null and b/addons/account/html/account_sc_02.png differ
diff --git a/addons/account/html/account_sc_03.png b/addons/account/html/account_sc_03.png
new file mode 100644
index 00000000000..a3e3afc34c0
Binary files /dev/null and b/addons/account/html/account_sc_03.png differ
diff --git a/addons/account/html/account_sc_04.png b/addons/account/html/account_sc_04.png
new file mode 100644
index 00000000000..458c8280c26
Binary files /dev/null and b/addons/account/html/account_sc_04.png differ
diff --git a/addons/account/html/account_sc_05.png b/addons/account/html/account_sc_05.png
new file mode 100644
index 00000000000..458c8280c26
Binary files /dev/null and b/addons/account/html/account_sc_05.png differ
diff --git a/addons/account/html/account_sc_06.png b/addons/account/html/account_sc_06.png
new file mode 100644
index 00000000000..afe0423504e
Binary files /dev/null and b/addons/account/html/account_sc_06.png differ
diff --git a/addons/account/html/index.html b/addons/account/html/index.html
new file mode 100644
index 00000000000..09a58fb3246
--- /dev/null
+++ b/addons/account/html/index.html
@@ -0,0 +1,205 @@
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan">Accounting Made Easy</h2>
+        <h3 class="oe_slogan">Beautiful, easy, full featured</h3>
+        <div class="oe_span6">
+            <div class="oe_demo oe_picture oe_screenshot">
+                <a href="https://www.openerp.com/saas_master/demo?lang=en_US&module=account">
+                    <img src="account_sc_00.png" alt="Online Demo">
+                </a>
+                <div class="oe_demo_footer oe_centeralign">Online Demo</div>
+            </div>
+        </div>
+        <div class="oe_span6">
+            <p class='oe_mt32'>
+By far the most beautiful and full featured accounting software. OpenERP Accounting allows a better way to collaborate with your accountants, your customers and control your suppliers.</p>
+            <p>
+Activate features on demand, from integrated analytic accounting to budget, assets and multiple companies consolidation.
+            </p>
+            <div class="oe_centeralign oe_websiteonly">
+                <a href="http://www.openerp.com/start" class="oe_button oe_big oe_tacky">Start your <span class="oe_emph">free</span> trial</a>
+            </div>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container oe_dark">
+    <div class="oe_row">
+       <h2 class="oe_slogan">A Smart User Interface</h2>
+       <div class="oe_span6">
+            <p class='oe_mt32'>
+Record transactions in a few clicks and easily manage all financial activities
+in one place. OpenERP's user interface is designed with productivity in mind.
+            </p>
+        </div>
+        <div class="oe_span6">
+            <img class="oe_picture oe_screenshot" src="account_sc_01.png">
+        </div>
+ 
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row">
+        <h2 class="oe_slogan">A Better Way To Work – Together</h2>
+        <div class="oe_span6">
+            <img class="oe_picture oe_screenshot" src="account_sc_02.png">
+        </div>
+        <div class="oe_span6">
+            <p class='oe_mt32'>
+Share access to your latest business numbers with your team and your accountant – so everyone is up to speed. From work, home or on the go.
+            </p>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container oe_dark">
+    <div class="oe_row">
+       <h2 class="oe_slogan">Connect Your Bank Accounts</h2>
+       <div class="oe_span6">
+            <p class='oe_mt32'>
+Import your bank statements and reconcile them in just a few clicks. Prepare payment orders based on your supplier invoices and payment terms.
+            </p>
+        </div>        
+        <div class="oe_span6">
+            <img class="oe_picture" src="account_illu_01.png">
+        </div>
+
+    </div>
+</section>
+
+<section class="oe_container">
+    <h2 class="oe_slogan">Get Paid Faster</h2>
+    <h3 class="oe_slogan">Electronic invoicing and automated follow-ups</h3>
+    <div class="oe_row">
+        <div class="oe_span6">
+            <img class="oe_picture oe_screenshot" src="account_sc_03.png">
+        </div>
+        <div class="oe_span6">
+            <p class='oe_mt32'>
+Create and send professional invoices &amp; get paid online. Get rid of the stress of having to constantly remind your debtors. Simply set-up and automate follow-ups to get paid quickly.
+            </p>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container oe_dark">
+    <div class="oe_row">
+       <h2 class="oe_slogan">Sales Integration</h2>
+       <div class="oe_span6">
+            <p class='oe_mt32'>
+Automatically create invoices from sales orders, delivery orders or base them on time and material. Re-invoice expenses on projects to your customer in just a few clicks.
+            </p>
+        </div>        
+        <div class="oe_span6">
+            <img class="oe_picture oe_screenshot" src="account_sc_04.png">
+        </div>
+
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row">
+        <div class="oe_span6">
+            <img class="oe_picture oe_screenshot" src="account_sc_05.png">
+        </div>
+        <div class="oe_span6">
+        <h2 class="oe_slogan">Purchase Integration</h2>
+            <p class='oe_mt32'>
+Control supplier invocies based on purchase orders. Get real-time inventory valuation reports automatically posted in your accounts.
+            </p>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container oe_dark">
+    <div class="oe_row">
+       <h2 class="oe_slogan">Multi-Level Analytic Accounting</h2>
+       <div class="oe_span6">
+            <p class='oe_mt32'>
+Integrate your analytic accounting operations with timesheets, projects, invoices, expenses, etc. No need to record transactions, all analytic entries are posted automatically following your business rules.
+            </p>
+        </div>        
+        <div class="oe_span6">
+            <img class="oe_picture oe_screenshot" src="account_sc_06.png">
+        </div>
+
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row">
+        <h2 class="oe_slogan">Everything you need to grow</h2>
+        <div class="oe_span6">
+            <img src="account_illu_02.png">
+        </div>
+        <div class="oe_span6"> 
+            <p class='oe_mt32'>
+Manage your assets, track expenses, control budgets, multi-level analytic accounting; OpenERP has all the features you need to sustain all your business activities.
+            </p>
+        </div>
+    </div>
+</section>
+
+
+<section class="oe_container oe_dark">
+    <div class="oe_row"> 
+       <h2 class="oe_slogan">Scale With Your Organization</h2>
+       <h3 class="oe_slogan">Used by very small to very large organizations</h3>
+       <div class="oe_span6">
+            <p class='oe_mt32'>
+OpenERP supports multiple currencies, multiple users with different access rights, multiple companies with real time consolidation and unlimited analytic plans.
+            </p>
+        </div>        
+        <div class="oe_span6">
+            <img class="oe_picture oe_screenshot" src="account_illu_03.png">
+        </div>  
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row">
+        <h2 class="oe_slogan">Dashboard & KPIs</h2>
+        <div class="oe_span6">
+            <img class="oe_picture oe_screenshot" src="account_sc_06.png">
+        </div>
+        <div class="oe_span6">
+            <p class='oe_mt32'>
+Get direct access to key information with dynamic and customizable dashboards. Analyse your financial activities with the drill-up, drill-down, drill-across and filter features. 
+            </p>
+        </div>
+    </div>
+</section>
+<section class="oe_container oe_dark">
+    <div class="oe_row">
+        <div class="oe_span12">
+            <h2 class="oe_slogan">Many companies already enjoy it</h2>
+            <h3 class="oe_slogan">Hear what they have to say !</h3>
+        </div>
+        <div class="oe_span6">
+            <div class="oe_quote">
+                <q>
+                    OpenERP  Accounting is a great way to record all business transactions
+                    right when they happen. Awesome and cost-effective!
+                </q>
+                <cite class="oe_cite oe_clearfix oe_ml64">
+                    <div class="oe_author">Wolfgang Taferner</div>
+                    <div class="oe_job"><a href="http://tapo-it.at/en/" target="_blank">Tapo</a>, Austria.</div>
+                </cite>
+            </div>
+        </div>
+        <div class="oe_span6">
+            <div class="oe_quote">
+                <q>
+                    We have found accounting module of OpenERP to be user
+                    friendly and highly customizable. It proved to be an accounting gem.
+                </q>
+                <cite class="oe_cite oe_clearfix">
+                    <img class="oe_photo" src="testimonial_sunil.jpg">
+                    <div class="oe_author">Col. Sunil Prem.</div>
+                    <div class="oe_job">Director of <a href="http://www.navyuginfo.com" target="_blank">Navyug Infosolutions Pvt. Ltd</a>.</div>
+                </cite>
+            </div>
+        </div>
+    </div>
+</section>
diff --git a/addons/account/html/sc00.png b/addons/account/html/sc00.png
new file mode 100644
index 00000000000..9605506c6a5
Binary files /dev/null and b/addons/account/html/sc00.png differ
diff --git a/addons/account/html/testimonial_sunil.jpg b/addons/account/html/testimonial_sunil.jpg
new file mode 100644
index 00000000000..f2ad6929a2b
Binary files /dev/null and b/addons/account/html/testimonial_sunil.jpg differ
diff --git a/addons/account/i18n/ru.po b/addons/account/i18n/ru.po
index 6ded487f1d9..8f547c224fc 100644
--- a/addons/account/i18n/ru.po
+++ b/addons/account/i18n/ru.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
-"PO-Revision-Date: 2013-03-14 06:41+0000\n"
+"PO-Revision-Date: 2013-05-29 13:04+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@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: 2013-03-16 05:17+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-05-30 05:45+0000\n"
+"X-Generator: Launchpad (build 16652)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -7386,7 +7386,7 @@ msgstr ""
 #. module: account
 #: field:account.config.settings,module_account_voucher:0
 msgid "Manage customer payments"
-msgstr ""
+msgstr "Управление платежами заказчиков"
 
 #. module: account
 #: help:report.invoice.created,origin:0
@@ -7415,7 +7415,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_invoice_tree1
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree1
 msgid "Customer Invoices"
-msgstr "Счета клиенту"
+msgstr "Счета заказчику"
 
 #. module: account
 #: view:account.tax:0
@@ -10543,7 +10543,7 @@ msgstr "Состояние счета - сделано"
 #. module: account
 #: field:account.config.settings,module_account_followup:0
 msgid "Manage customer payment follow-ups"
-msgstr ""
+msgstr "Управление напоминаниями заказчикам об оплатах"
 
 #. module: account
 #: model:ir.model,name:account.model_report_account_sales
@@ -11037,7 +11037,7 @@ msgstr "Счет расходов по шаблону ТМЦ"
 #. module: account
 #: field:res.partner,property_payment_term:0
 msgid "Customer Payment Term"
-msgstr ""
+msgstr "Срок платежа заказчика"
 
 #. module: account
 #: help:accounting.report,label_filter:0
diff --git a/addons/account/partner_view.xml b/addons/account/partner_view.xml
index b6fae3140b5..f6c89a92560 100644
--- a/addons/account/partner_view.xml
+++ b/addons/account/partner_view.xml
@@ -50,11 +50,12 @@
             </field>
         </record>
 
-        <record id="action_account_analytic_account_form" model="ir.actions.act_window">
+        <record id="action_open_partner_analytic_accounts" model="ir.actions.act_window">
             <field name="context">{'search_default_partner_id': [active_id], 'default_partner_id': active_id}</field>
             <field name="name">Contracts/Analytic Accounts</field>
             <field name="res_model">account.analytic.account</field>
-            <field name="view_mode">tree,form</field>
+            <field name="view_id" ref="view_account_analytic_account_tree"/>
+            <field name="search_view_id" ref="view_account_analytic_account_search"/>
         </record>
         <record model="ir.ui.view" id="partner_view_buttons">
             <field name="name">partner.view.buttons</field>
@@ -67,7 +68,7 @@
                         name="%(account.action_invoice_tree)d" 
                         context="{'search_default_partner_id': active_id,'default_partner_id': active_id}" groups="account.group_account_invoice"/>
                     <button type="action" string="Journal Items" name="%(account.action_account_moves_all_tree)d" groups="account.group_account_user"/>
-                    <button type="action" string="Contracts/Analytic Accounts" name="%(account.action_account_analytic_account_form)d" 
+                    <button type="action" string="Contracts/Analytic Accounts" name="%(account.action_open_partner_analytic_accounts)d"
                             groups="analytic.group_analytic_accounting"/>
                 </xpath>
             </field>
diff --git a/addons/account/process/customer_invoice_process.xml b/addons/account/process/customer_invoice_process.xml
index 8971235c1f7..e45f8080518 100644
--- a/addons/account/process/customer_invoice_process.xml
+++ b/addons/account/process/customer_invoice_process.xml
@@ -123,24 +123,24 @@
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Confirm statement&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;The accountant confirms the statement.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_accountingstatemententries0"/>
-            <field model="process.node" name="source_node_id" ref="account.process_node_draftstatement0"/>
+            <field name="target_node_id" ref="process_node_accountingstatemententries0"/>
+            <field name="source_node_id" ref="account.process_node_draftstatement0"/>
         </record>
 
         <record id="process_transition_analyticinvoice0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;From analytic accounts&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Analytic costs (timesheets, some purchased products, ...) come from analytic accounts. These generate draft invoices.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_draftinvoices0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_analytic0"/>
+            <field name="target_node_id" ref="process_node_draftinvoices0"/>
+            <field name="source_node_id" ref="process_node_analytic0"/>
         </record>
 
         <record id="process_transition_customerinvoice0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Validation&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Draft invoices are checked, validated and printed.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_invoiceinvoice0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_draftinvoices0"/>
+            <field name="target_node_id" ref="process_node_invoiceinvoice0"/>
+            <field name="source_node_id" ref="process_node_draftinvoices0"/>
             <field eval="[(6,0,[ref('account.pro2_to_open')])]" name="transition_ids"/>
         </record>
 
@@ -148,40 +148,40 @@
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Validation&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Accountant validates the accounting entries coming from the invoice.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_accountingentries0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_invoiceinvoice0"/>
+            <field name="target_node_id" ref="process_node_accountingentries0"/>
+            <field name="source_node_id" ref="process_node_invoiceinvoice0"/>
         </record>
 
         <record id="process_transition_entriesreconcile0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Accounting entries&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Accounting entries are the first input of the reconciliation.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_reconciliation0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_accountingentries0"/>
+            <field name="target_node_id" ref="process_node_reconciliation0"/>
+            <field name="source_node_id" ref="process_node_accountingentries0"/>
         </record>
 
         <record id="process_transition_statemententries0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Validation&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Manual or automatic creation of payment entries according to the statements&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_paymententries0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_bankstatement0"/>
+            <field name="target_node_id" ref="process_node_paymententries0"/>
+            <field name="source_node_id" ref="process_node_bankstatement0"/>
         </record>
 
         <record id="process_transition_paymentreconcile0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Payment entries&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Payment entries are the second input of the reconciliation.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_reconciliation0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_paymententries0"/>
+            <field name="target_node_id" ref="process_node_reconciliation0"/>
+            <field name="source_node_id" ref="process_node_paymententries0"/>
         </record>
 
         <record id="process_transition_reconcilepaid0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Payment&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;As soon as the reconciliation is done, the invoice can be paid.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_paidinvoice0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_reconciliation0"/>
+            <field name="target_node_id" ref="process_node_paidinvoice0"/>
+            <field name="source_node_id" ref="process_node_reconciliation0"/>
         </record>
 
         <!--
diff --git a/addons/account/process/statement_process.xml b/addons/account/process/statement_process.xml
index 64dd7520bc1..81b1748a6d4 100644
--- a/addons/account/process/statement_process.xml
+++ b/addons/account/process/statement_process.xml
@@ -68,8 +68,8 @@
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Automatic import of the bank statement&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Import of the statement in the system from an electronic file&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_draftstatement0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_electronicfile0"/>
+            <field name="target_node_id" ref="process_node_draftstatement0"/>
+            <field name="source_node_id" ref="process_node_electronicfile0"/>
         </record>
 
         <record id="process_transition_invoicemanually0" model="process.transition">
@@ -77,17 +77,17 @@
             <field eval="&quot;&quot;&quot;Manual entry&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;A statement with manual entries becomes a draft statement.&quot;&quot;&quot;" name="note"/>
 
-            <field model="process.node" name="target_node_id" ref="process_node_draftstatement0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_manually0"/>
+            <field name="target_node_id" ref="process_node_draftstatement0"/>
+            <field name="source_node_id" ref="process_node_manually0"/>
         </record>
 
         <record id="process_transition_invoiceimport0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Import from invoice or payment&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Import of the statement in the system from a supplier or customer invoice&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_draftstatement0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_importinvoice0"/>
+            <field name="target_node_id" ref="process_node_draftstatement0"/>
+            <field name="source_node_id" ref="process_node_importinvoice0"/>
         </record>
 
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/account/process/supplier_invoice_process.xml b/addons/account/process/supplier_invoice_process.xml
index 58b98220f95..b1d9de904aa 100644
--- a/addons/account/process/supplier_invoice_process.xml
+++ b/addons/account/process/supplier_invoice_process.xml
@@ -111,16 +111,16 @@
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;From analytic accounts&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Analytic costs (timesheets, some purchased products, ...) come from analytic accounts. These generate draft supplier invoices.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_supplierdraftinvoices0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_analyticcost0"/>
+            <field name="target_node_id" ref="process_node_supplierdraftinvoices0"/>
+            <field name="source_node_id" ref="process_node_analyticcost0"/>
         </record>
 
         <record id="process_transition_suppliercustomerinvoice0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Validation&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Draft invoices are validated. &quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_supplierinvoiceinvoice0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_supplierdraftinvoices0"/>
+            <field name="target_node_id" ref="process_node_supplierinvoiceinvoice0"/>
+            <field name="source_node_id" ref="process_node_supplierdraftinvoices0"/>
             <field eval="[(6,0,[ref('account.pro2_to_open')])]" name="transition_ids"/>
         </record>
 
@@ -128,40 +128,40 @@
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Validation&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Accountant validates the accounting entries coming from the invoice. &quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_supplieraccountingentries0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_supplierinvoiceinvoice0"/>
+            <field name="target_node_id" ref="process_node_supplieraccountingentries0"/>
+            <field name="source_node_id" ref="process_node_supplierinvoiceinvoice0"/>
         </record>
 
         <record id="process_transition_supplierentriesreconcile0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Accounting entries&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Accounting entries are an input of the reconciliation.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_supplierreconciliation0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_supplieraccountingentries0"/>
+            <field name="target_node_id" ref="process_node_supplierreconciliation0"/>
+            <field name="source_node_id" ref="process_node_supplieraccountingentries0"/>
         </record>
 
         <record id="process_transition_paymentorderbank0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Payment entries&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;The payment order is sent to the bank.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_supplierbankstatement0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_supplierpaymentorder0"/>
+            <field name="target_node_id" ref="process_node_supplierbankstatement0"/>
+            <field name="source_node_id" ref="process_node_supplierpaymentorder0"/>
         </record>
 
         <record id="process_transition_paymentorderreconcilation0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Validation&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Bank statements are entered in the system.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_supplierreconciliation0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_supplierbankstatement0"/>
+            <field name="target_node_id" ref="process_node_supplierreconciliation0"/>
+            <field name="source_node_id" ref="process_node_supplierbankstatement0"/>
         </record>
 
         <record id="process_transition_supplierreconcilepaid0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;System payment&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;As soon as the reconciliation is done, the invoice's state turns to “done” (i.e. paid) in the system.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_supplierpaidinvoice0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_supplierreconciliation0"/>
+            <field name="target_node_id" ref="process_node_supplierpaidinvoice0"/>
+            <field name="source_node_id" ref="process_node_supplierreconciliation0"/>
         </record>
 
    </data>
diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index 79a1e76c7e7..4dbdf41abf0 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -77,6 +77,7 @@
             <field name="name">Analytic Accounts</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">account.analytic.account</field>
+            <field name="context">{}</field> <!-- repair invalid context by setting empty one -->
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="view_account_analytic_account_tree"/>
diff --git a/addons/account/report/account_general_ledger.py b/addons/account/report/account_general_ledger.py
index 498cb1369a8..4f712ad58cc 100644
--- a/addons/account/report/account_general_ledger.py
+++ b/addons/account/report/account_general_ledger.py
@@ -23,7 +23,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
 ##############################################################################
 
diff --git a/addons/account/report/account_invoice_report.py b/addons/account/report/account_invoice_report.py
index 799b9b1c9fb..d8dc45f9a3b 100644
--- a/addons/account/report/account_invoice_report.py
+++ b/addons/account/report/account_invoice_report.py
@@ -99,12 +99,13 @@ class account_invoice_report(osv.osv):
         'partner_bank_id': fields.many2one('res.partner.bank', 'Bank Account',readonly=True),
         'residual': fields.float('Total Residual', readonly=True),
         'user_currency_residual': fields.function(_compute_amounts_in_user_currency, string="Total Residual", type='float', digits_compute=dp.get_precision('Account'), multi="_compute_amounts"),
+        'country_id': fields.many2one('res.country', 'Country of the Partner Company'),
     }
     _order = 'date desc'
 
     def _select(self):
         select_str = """
-            SELECT sub.id, sub.date, sub.year, sub.month, sub.day, sub.product_id, sub.partner_id,
+            SELECT sub.id, sub.date, sub.year, sub.month, sub.day, sub.product_id, sub.partner_id, sub.country_id,
                 sub.payment_term, sub.period_id, sub.uom_name, sub.currency_id, sub.journal_id,
                 sub.fiscal_position, sub.user_id, sub.company_id, sub.nbr, sub.type, sub.state,
                 sub.categ_id, sub.date_due, sub.account_id, sub.account_line_id, sub.partner_bank_id,
@@ -172,7 +173,8 @@ class account_invoice_report(osv.osv):
                                       WHERE a.id = ai.id)
                                ELSE 1::bigint
                           END::numeric AS residual,
-                    ai.commercial_partner_id as commercial_partner_id
+                    ai.commercial_partner_id as commercial_partner_id,
+                    partner.country_id
         """
         return select_str
 
@@ -180,6 +182,7 @@ class account_invoice_report(osv.osv):
         from_str = """
                 FROM account_invoice_line ail
                 JOIN account_invoice ai ON ai.id = ail.invoice_id
+                JOIN res_partner partner ON ai.commercial_partner_id = partner.id
                 LEFT JOIN product_product pr ON pr.id = ail.product_id
                 left JOIN product_template pt ON pt.id = pr.product_tmpl_id
                 LEFT JOIN product_uom u ON u.id = ail.uos_id
@@ -195,7 +198,7 @@ class account_invoice_report(osv.osv):
                     ai.partner_id, ai.payment_term, ai.period_id, u.name, ai.currency_id, ai.journal_id,
                     ai.fiscal_position, ai.user_id, ai.company_id, ai.type, ai.state, pt.categ_id,
                     ai.date_due, ai.account_id, ail.account_id, ai.partner_bank_id, ai.residual,
-                    ai.amount_total, u.uom_type, u.category_id, ai.commercial_partner_id
+                    ai.amount_total, u.uom_type, u.category_id, ai.commercial_partner_id, partner.country_id
         """
         return group_by_str
 
diff --git a/addons/account/report/account_invoice_report_view.xml b/addons/account/report/account_invoice_report_view.xml
index 96dc948b09a..5f38db5e71f 100644
--- a/addons/account/report/account_invoice_report_view.xml
+++ b/addons/account/report/account_invoice_report_view.xml
@@ -15,6 +15,7 @@
                 <field name="company_id" invisible="1"/>
                 <field name="partner_id" invisible="1"/>
                 <field name="commercial_partner_id" invisible="1"/>
+                <field name="country_id" invisible="1"/>
                 <field name="product_id" invisible="1"/>
                 <field name="uom_name" invisible="not context.get('set_visible',False)"/>
                 <field name="categ_id" invisible="1"/>
@@ -68,6 +69,7 @@
                 <group expand="1" string="Group By...">
                     <filter string="Partner" name="partner_id" context="{'group_by':'partner_id','residual_visible':True}"/>
                     <filter string="Commercial Partner" name="commercial_partner_id" context="{'group_by':'commercial_partner_id','residual_visible':True}"/>
+                    <filter string="Commercial Partner's Country" name="country_id" context="{'group_by':'country_id'}"/>
                     <filter string="Salesperson" name='user' icon="terp-personal" context="{'group_by':'user_id'}"/>
                     <filter string="Due Date" icon="terp-go-today" context="{'group_by':'date_due'}"/>
                     <filter string="Period" icon="terp-go-month" context="{'group_by':'period_id'}" name="period"/>
diff --git a/addons/account/res_config.py b/addons/account/res_config.py
index 53c604161ea..89d238b16e9 100644
--- a/addons/account/res_config.py
+++ b/addons/account/res_config.py
@@ -25,6 +25,7 @@ from dateutil.relativedelta import relativedelta
 from operator import itemgetter
 from os.path import join as opj
 
+from openerp.tools import DEFAULT_SERVER_DATE_FORMAT, DEFAULT_SERVER_DATETIME_FORMAT as DF
 from openerp.tools.translate import _
 from openerp.osv import fields, osv
 from openerp import tools
@@ -132,12 +133,43 @@ class account_config_settings(osv.osv_memory):
         count = self.pool.get('res.company').search_count(cr, uid, [], context=context)
         return bool(count == 1)
 
+    def _get_default_fiscalyear_data(self, cr, uid, company_id, context=None):
+        """Compute default period, starting and ending date for fiscalyear
+        - if in a fiscal year, use its period, starting and ending date
+        - if past fiscal year, use its period, and new dates [ending date of the latest +1 day ; ending date of the latest +1 year]
+        - if no fiscal year, use monthly, 1st jan, 31th dec of this year
+        :return: (date_start, date_stop, period) at format DEFAULT_SERVER_DATETIME_FORMAT
+        """
+        fiscalyear_ids = self.pool.get('account.fiscalyear').search(cr, uid,
+                [('date_start', '<=', time.strftime(DF)), ('date_stop', '>=', time.strftime(DF)),
+                 ('company_id', '=', company_id)])
+        if fiscalyear_ids:
+            # is in a current fiscal year, use this one
+            fiscalyear = self.pool.get('account.fiscalyear').browse(cr, uid, fiscalyear_ids[0], context=context)
+            if len(fiscalyear.period_ids) == 5:  # 4 periods of 3 months + opening period
+                period = '3months'
+            else:
+                period = 'month'
+            return (fiscalyear.date_start, fiscalyear.date_stop, period)
+        else:
+            past_fiscalyear_ids = self.pool.get('account.fiscalyear').search(cr, uid,
+                [('date_stop', '<=', time.strftime(DF)), ('company_id', '=', company_id)])
+            if past_fiscalyear_ids:
+                # use the latest fiscal, sorted by (start_date, id)
+                latest_year = self.pool.get('account.fiscalyear').browse(cr, uid, past_fiscalyear_ids[-1], context=context)
+                latest_stop = datetime.datetime.strptime(latest_year.date_stop, DF)
+                if len(latest_year.period_ids) == 5:
+                    period = '3months'
+                else:
+                    period = 'month'
+                return ((latest_stop+datetime.timedelta(days=1)).strftime(DF), latest_stop.replace(year=latest_stop.year+1).strftime(DF), period)
+            else:
+                return (time.strftime('%Y-01-01'), time.strftime('%Y-12-31'), 'month')
+
+
     _defaults = {
         'company_id': _default_company,
         'has_default_company': _default_has_default_company,
-        'date_start': lambda *a: time.strftime('%Y-01-01'),
-        'date_stop': lambda *a: time.strftime('%Y-12-31'),
-        'period': 'month',
     }
 
     def create(self, cr, uid, values, context=None):
@@ -161,6 +193,7 @@ class account_config_settings(osv.osv_memory):
             fiscalyear_count = self.pool.get('account.fiscalyear').search_count(cr, uid,
                 [('date_start', '<=', time.strftime('%Y-%m-%d')), ('date_stop', '>=', time.strftime('%Y-%m-%d')),
                  ('company_id', '=', company_id)])
+            date_start, date_stop, period = self._get_default_fiscalyear_data(cr, uid, company_id, context=context)
             values = {
                 'expects_chart_of_accounts': company.expects_chart_of_accounts,
                 'currency_id': company.currency_id.id,
@@ -170,6 +203,9 @@ class account_config_settings(osv.osv_memory):
                 'has_fiscal_year': bool(fiscalyear_count),
                 'chart_template_id': False,
                 'tax_calculation_rounding_method': company.tax_calculation_rounding_method,
+                'date_start': date_start,
+                'date_stop': date_stop,
+                'period': period,
             }
             # update journals and sequences
             for journal_type in ('sale', 'sale_refund', 'purchase', 'purchase_refund'):
@@ -302,4 +338,10 @@ class account_config_settings(osv.osv_memory):
         dp = self.pool.get('ir.model.data').get_object(cr, uid, 'product','decimal_account')
         dp.write({'digits': config.decimal_precision})
 
+    def onchange_analytic_accounting(self, cr, uid, ids, analytic_accounting, context=None):
+        if analytic_accounting:
+            return {'value': {
+                'module_account_accountant': True,
+                }}
+        return {}
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/res_config_view.xml b/addons/account/res_config_view.xml
index 7977c0fc505..ce8b41fc2da 100644
--- a/addons/account/res_config_view.xml
+++ b/addons/account/res_config_view.xml
@@ -130,7 +130,7 @@
                                 <label for="module_account_accountant"/>
                             </div>
                             <div>
-                                <field name="group_analytic_accounting" class="oe_inline"/>
+                                <field name="group_analytic_accounting" class="oe_inline" on_change="onchange_analytic_accounting(group_analytic_accounting, context)"/>
                                 <label for="group_analytic_accounting"/>
                             </div>
                             <div>
diff --git a/addons/account/wizard/pos_box.py b/addons/account/wizard/pos_box.py
index 874a8e3b7c9..bd38e6bbed6 100644
--- a/addons/account/wizard/pos_box.py
+++ b/addons/account/wizard/pos_box.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 from openerp.osv import fields, osv
 import openerp.addons.decimal_precision as dp
 from openerp.tools.translate import _
diff --git a/addons/account_analytic_analysis/account_analytic_analysis.py b/addons/account_analytic_analysis/account_analytic_analysis.py
index 33ab3be209c..e493f364a0e 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis.py
+++ b/addons/account_analytic_analysis/account_analytic_analysis.py
@@ -259,17 +259,14 @@ class account_analytic_account(osv.osv):
             return res
 
         if child_ids:
-            cr.execute("SELECT account_analytic_line.account_id, COALESCE(SUM(amount), 0.0) \
-                    FROM account_analytic_line \
-                    JOIN account_analytic_journal \
-                        ON account_analytic_line.journal_id = account_analytic_journal.id  \
-                    WHERE account_analytic_line.account_id IN %s \
-                        AND account_analytic_journal.type = 'sale' \
-                    GROUP BY account_analytic_line.account_id", (child_ids,))
-            for account_id, sum in cr.fetchall():
-                res[account_id] = round(sum,2)
+            #Search all invoice lines not in cancelled state that refer to this analytic account
+            inv_line_obj = self.pool.get("account.invoice.line")
+            inv_lines = inv_line_obj.search(cr, uid, ['&', ('account_analytic_id', 'in', child_ids), ('invoice_id.state', '!=', 'cancel')], context=context)
+            for line in inv_line_obj.browse(cr, uid, inv_lines, context=context):
+                res[line.account_analytic_id.id] += line.price_subtotal
         for acc in self.browse(cr, uid, res.keys(), context=context):
             res[acc.id] = res[acc.id] - (acc.timesheet_ca_invoiced or 0.0)
+
         res_final = res
         return res_final
 
@@ -481,7 +478,7 @@ class account_analytic_account(osv.osv):
         'remaining_hours': fields.function(_remaining_hours_calc, type='float', string='Remaining Time',
             help="Computed using the formula: Maximum Time - Total Worked Time"),
         'remaining_hours_to_invoice': fields.function(_remaining_hours_to_invoice_calc, type='float', string='Remaining Time',
-            help="Computed using the formula: Maximum Time - Total Invoiced Time"),
+            help="Computed using the formula: Expected on timesheets - Total invoiced on timesheets"),
         'fix_price_to_invoice': fields.function(_fix_price_to_invoice_calc, type='float', string='Remaining Time',
             help="Sum of quotations for this contract."),
         'timesheet_ca_invoiced': fields.function(_timesheet_ca_invoiced_calc, type='float', string='Remaining Time',
@@ -633,6 +630,21 @@ class account_analytic_account(osv.osv):
             pass
         return result
 
+
+    def hr_to_invoice_timesheets(self, cr, uid, ids, context=None):
+        domain = [('invoice_id','=',False),('to_invoice','!=',False), ('journal_id.type', '=', 'general'), ('account_id', 'in', ids)]
+        names = [record.name for record in self.browse(cr, uid, ids, context=context)]
+        name = _('Timesheets to Invoice of %s') % ','.join(names)
+        return {
+            'type': 'ir.actions.act_window',
+            'name': name,
+            'view_type': 'form',
+            'view_mode': 'tree,form',
+            'domain' : domain,
+            'res_model': 'account.analytic.line',
+            'nodestroy': True,
+        }
+
     def _prepare_invoice(self, cr, uid, contract, context=None):
         context = context or {}
 
diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index d31746e7e70..cd4be740815 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -98,8 +98,8 @@
                                 <field class="oe_inline" name="ca_to_invoice" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
                             </td><td class="oe_timesheet_action" attrs="{'invisible': ['|',('invoice_on_timesheets','=',False),('type','=','template')]}">
                                 <span attrs="{'invisible': [('ca_to_invoice','=',0.0)]}" class="oe_grey">
-                                    <button name="%(hr_timesheet_invoice.action_hr_timesheet_invoice_create_final)d"
-                                        type="action"
+                                    <button name="hr_to_invoice_timesheets"
+                                        type="object"
                                         class="oe_link"
                                         string="⇒ Invoice"/>
                                     or view 
diff --git a/addons/account_analytic_analysis/i18n/ru.po b/addons/account_analytic_analysis/i18n/ru.po
index 3944c48afb6..339d425c717 100644
--- a/addons/account_analytic_analysis/i18n/ru.po
+++ b/addons/account_analytic_analysis/i18n/ru.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
-"PO-Revision-Date: 2011-02-19 12:16+0000\n"
+"PO-Revision-Date: 2013-05-31 07:35+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@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: 2013-03-16 05:25+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-06-01 05:16+0000\n"
+"X-Generator: Launchpad (build 16660)\n"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -73,7 +73,7 @@ msgstr ""
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "⇒ Invoice"
-msgstr ""
+msgstr "⇒ Счет"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,ca_invoiced:0
@@ -196,6 +196,8 @@ msgid ""
 "{'required': [('type','=','contract')], 'invisible': [('type','in',['view', "
 "'normal','template'])]}"
 msgstr ""
+"{'required': [('type','=','contract')], 'invisible': [('type','in',['view', "
+"'normal','template'])]}"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,real_margin_rate:0
@@ -335,7 +337,7 @@ msgstr "Теоретическая выручка"
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "To Renew"
-msgstr ""
+msgstr "К продлению"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -431,7 +433,7 @@ msgstr ""
 #. module: account_analytic_analysis
 #: field:account.analytic.account,toinvoice_total:0
 msgid "Total to Invoice"
-msgstr ""
+msgstr "Всего в счет"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -546,18 +548,18 @@ msgstr "Дата последней операции по этому счету.
 #. module: account_analytic_analysis
 #: model:ir.model,name:account_analytic_analysis.model_sale_config_settings
 msgid "sale.config.settings"
-msgstr ""
+msgstr "sale.config.settings"
 
 #. module: account_analytic_analysis
 #: field:sale.config.settings,group_template_required:0
 msgid "Mandatory use of templates."
-msgstr ""
+msgstr "Обязательное использование шаблонов."
 
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_template_of_contract_action
 msgid "Contract Template"
-msgstr ""
+msgstr "Шаблон контракта"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -612,7 +614,7 @@ msgstr ""
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Total"
-msgstr ""
+msgstr "Итого"
 
 #~ msgid "Hours summary by user"
 #~ msgstr "Итого часов по пользователям"
diff --git a/addons/account_analytic_default/security/account_analytic_default_security.xml b/addons/account_analytic_default/security/account_analytic_default_security.xml
index 63c6e30eb22..cdce2a9955e 100644
--- a/addons/account_analytic_default/security/account_analytic_default_security.xml
+++ b/addons/account_analytic_default/security/account_analytic_default_security.xml
@@ -4,7 +4,7 @@
 
     <record id="analytic_default_comp_rule" model="ir.rule">
         <field name="name">Analytic Default multi company rule</field>
-        <field model="ir.model" name="model_id" ref="model_account_analytic_default"/>
+        <field name="model_id" ref="model_account_analytic_default"/>
         <field eval="True" name="global"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
diff --git a/addons/account_analytic_plans/i18n/ru.po b/addons/account_analytic_plans/i18n/ru.po
index ba32246e8d6..29cb3ea910f 100644
--- a/addons/account_analytic_plans/i18n/ru.po
+++ b/addons/account_analytic_plans/i18n/ru.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-12-28 10:00+0000\n"
+"PO-Revision-Date: 2013-05-31 07:41+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@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: 2013-03-16 05:26+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-06-01 05:16+0000\n"
+"X-Generator: Launchpad (build 16660)\n"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account4_ids:0
@@ -48,7 +48,7 @@ msgstr "Ставка (%)"
 #: code:addons/account_analytic_plans/account_analytic_plans.py:234
 #, python-format
 msgid "The total should be between %s and %s."
-msgstr ""
+msgstr "Итог должен быть между %s и %s."
 
 #. module: account_analytic_plans
 #: view:account.analytic.plan:0
@@ -131,7 +131,7 @@ msgstr "Не показывать пустые строки"
 #: code:addons/account_analytic_plans/wizard/account_crossovered_analytic.py:61
 #, python-format
 msgid "There are no analytic lines related to account %s."
-msgstr ""
+msgstr "Нет позиций аналитики относящихся к счету %s."
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account3_ids:0
@@ -315,7 +315,7 @@ msgstr "Журнал аналитики"
 #: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:38
 #, python-format
 msgid "Please put a name and a code before saving the model."
-msgstr ""
+msgstr "Пожалуйста, введите имя и код перед сохранением модели."
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
@@ -347,7 +347,7 @@ msgstr "Журнал"
 #: code:addons/account_analytic_plans/account_analytic_plans.py:486
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal."
-msgstr ""
+msgstr "Вы должны определить журнал аналитики для журнала '%s'"
 
 #. module: account_analytic_plans
 #: code:addons/account_analytic_plans/account_analytic_plans.py:342
@@ -375,7 +375,7 @@ msgstr "Позиция счета"
 #: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:41
 #, python-format
 msgid "There is no analytic plan defined."
-msgstr ""
+msgstr "Аналитический план счетов не определен."
 
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_bank_statement
@@ -402,7 +402,7 @@ msgstr "Разнесение аналитики"
 #: code:addons/account_analytic_plans/account_analytic_plans.py:221
 #, python-format
 msgid "A model with this name and code already exists."
-msgstr ""
+msgstr "Модель с таким названием и кодом уже существует."
 
 #. module: account_analytic_plans
 #: help:account.analytic.plan.line,root_analytic_id:0
diff --git a/addons/account_asset/i18n/ru.po b/addons/account_asset/i18n/ru.po
index a0950a98370..d6bc83aacb5 100644
--- a/addons/account_asset/i18n/ru.po
+++ b/addons/account_asset/i18n/ru.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
-"PO-Revision-Date: 2011-07-12 12:04+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2013-05-31 08:06+0000\n"
+"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: Russian <ru@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: 2013-03-16 05:50+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-06-01 05:16+0000\n"
+"X-Generator: Launchpad (build 16660)\n"
 
 #. module: account_asset
 #: view:account.asset.asset:0
@@ -148,7 +148,7 @@ msgstr ""
 #. module: account_asset
 #: help:account.asset.asset,method_period:0
 msgid "The amount of time between two depreciations, in months"
-msgstr ""
+msgstr "Количество времени между амортизациями, в месяцах"
 
 #. module: account_asset
 #: field:account.asset.depreciation.line,depreciation_date:0
@@ -160,7 +160,7 @@ msgstr "Дата амортизации"
 #. module: account_asset
 #: constraint:account.asset.asset:0
 msgid "Error ! You cannot create recursive assets."
-msgstr ""
+msgstr "Ошибка! Нельзя создавать рекурсивные активы."
 
 #. module: account_asset
 #: field:asset.asset.report,posted_value:0
@@ -205,7 +205,7 @@ msgstr "# позиций амортизации"
 #. module: account_asset
 #: field:account.asset.asset,method_period:0
 msgid "Number of Months in a Period"
-msgstr ""
+msgstr "Количество месяцев в периоде"
 
 #. module: account_asset
 #: view:asset.asset.report:0
@@ -234,7 +234,7 @@ msgstr "Счет активов"
 #: model:ir.actions.act_window,name:account_asset.action_asset_depreciation_confirmation_wizard
 #: model:ir.ui.menu,name:account_asset.menu_asset_depreciation_confirmation_wizard
 msgid "Compute Assets"
-msgstr ""
+msgstr "Вычислить активы"
 
 #. module: account_asset
 #: field:account.asset.category,method_period:0
@@ -265,12 +265,12 @@ msgstr "Изменить длительность"
 #: help:account.asset.category,method_number:0
 #: help:account.asset.history,method_number:0
 msgid "The number of depreciations needed to depreciate your asset"
-msgstr ""
+msgstr "Количество амортизаций необходимых для обесценивания актива"
 
 #. module: account_asset
 #: view:account.asset.category:0
 msgid "Analytic Information"
-msgstr ""
+msgstr "Аналитическая информация"
 
 #. module: account_asset
 #: field:account.asset.category,account_analytic_id:0
@@ -293,7 +293,7 @@ msgstr ""
 #. module: account_asset
 #: field:account.asset.depreciation.line,remaining_value:0
 msgid "Next Period Depreciation"
-msgstr ""
+msgstr "Следующий период амортизации"
 
 #. module: account_asset
 #: help:account.asset.history,method_period:0
@@ -344,7 +344,7 @@ msgstr "Поиск категории актива"
 #. module: account_asset
 #: view:asset.modify:0
 msgid "months"
-msgstr ""
+msgstr "месяцы"
 
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_account_invoice_line
@@ -372,7 +372,7 @@ msgstr ""
 #: view:asset.depreciation.confirmation.wizard:0
 #: view:asset.modify:0
 msgid "or"
-msgstr ""
+msgstr "или"
 
 #. module: account_asset
 #: field:account.asset.asset,note:0
@@ -406,7 +406,7 @@ msgstr ""
 #. module: account_asset
 #: view:asset.asset.report:0
 msgid "Assets in running state"
-msgstr ""
+msgstr "Активы в рабочем состоянии"
 
 #. module: account_asset
 #: view:account.asset.asset:0
@@ -427,7 +427,7 @@ msgstr ""
 #: field:account.asset.asset,state:0
 #: field:asset.asset.report,state:0
 msgid "Status"
-msgstr ""
+msgstr "Статус"
 
 #. module: account_asset
 #: field:account.asset.asset,partner_id:0
@@ -474,12 +474,12 @@ msgstr "Вычислить"
 #. module: account_asset
 #: view:account.asset.history:0
 msgid "Asset History"
-msgstr ""
+msgstr "История актива"
 
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_asset_depreciation_confirmation_wizard
 msgid "asset.depreciation.confirmation.wizard"
-msgstr ""
+msgstr "asset.depreciation.confirmation.wizard"
 
 #. module: account_asset
 #: field:account.asset.asset,active:0
@@ -505,7 +505,7 @@ msgstr "История"
 #. module: account_asset
 #: view:asset.depreciation.confirmation.wizard:0
 msgid "Compute Asset"
-msgstr ""
+msgstr "Вычислить актив"
 
 #. module: account_asset
 #: field:asset.depreciation.confirmation.wizard,period_id:0
@@ -521,7 +521,7 @@ msgstr "Общий"
 #: field:account.asset.asset,prorata:0
 #: field:account.asset.category,prorata:0
 msgid "Prorata Temporis"
-msgstr ""
+msgstr "По истечении срока"
 
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_account_invoice
@@ -553,7 +553,7 @@ msgstr "Элементы журнала"
 #. module: account_asset
 #: view:asset.modify:0
 msgid "Asset Durations to Modify"
-msgstr ""
+msgstr "Актив - интервал времени для изменения"
 
 #. module: account_asset
 #: field:account.asset.asset,purchase_date:0
@@ -574,6 +574,8 @@ msgid ""
 "Choose the period for which you want to automatically post the depreciation "
 "lines of running assets"
 msgstr ""
+"Выберите период, за который вы хотите автоматически создавать записи "
+"амортизации  для актива"
 
 #. module: account_asset
 #: view:account.asset.asset:0
@@ -588,12 +590,12 @@ msgstr "Метод амортизации"
 #. module: account_asset
 #: field:account.asset.depreciation.line,amount:0
 msgid "Current Depreciation"
-msgstr ""
+msgstr "Текущая аммортизация"
 
 #. module: account_asset
 #: field:account.asset.asset,name:0
 msgid "Asset Name"
-msgstr ""
+msgstr "Название актива"
 
 #. module: account_asset
 #: field:account.asset.category,open_asset:0
@@ -618,7 +620,7 @@ msgstr "Журнал"
 #. module: account_asset
 #: field:account.asset.history,name:0
 msgid "History name"
-msgstr ""
+msgstr "Название истории"
 
 #. module: account_asset
 #: field:account.asset.depreciation.line,depreciated_value:0
@@ -657,7 +659,7 @@ msgstr ""
 #. module: account_asset
 #: field:account.asset.asset,purchase_value:0
 msgid "Gross Value"
-msgstr ""
+msgstr "Валовая стоимость"
 
 #. module: account_asset
 #: field:account.asset.category,name:0
@@ -703,12 +705,12 @@ msgstr ""
 #. module: account_asset
 #: field:account.asset.depreciation.line,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Нумерация"
 
 #. module: account_asset
 #: help:account.asset.category,method_period:0
 msgid "State here the time between 2 depreciations, in months"
-msgstr ""
+msgstr "Время между двумя амортизациями в месяцах"
 
 #. module: account_asset
 #: field:account.asset.history,date:0
@@ -729,7 +731,7 @@ msgstr "Число амортизаций"
 #. module: account_asset
 #: view:account.asset.asset:0
 msgid "Create Move"
-msgstr ""
+msgstr "Создать перемещение"
 
 #. module: account_asset
 #: view:account.asset.asset:0
diff --git a/addons/account_asset/i18n/th.po b/addons/account_asset/i18n/th.po
new file mode 100644
index 00000000000..fdc6c7b4754
--- /dev/null
+++ b/addons/account_asset/i18n/th.po
@@ -0,0 +1,741 @@
+# Thai 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: 2012-12-21 17:04+0000\n"
+"PO-Revision-Date: 2013-05-15 10:09+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Thai <th@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: 2013-05-16 05:12+0000\n"
+"X-Generator: Launchpad (build 16626)\n"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Assets in draft and open states"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.category,method_end:0
+#: field:account.asset.history,method_end:0
+#: field:asset.modify,method_end:0
+msgid "Ending date"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,value_residual:0
+msgid "Residual Value"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.category,account_expense_depreciation_id:0
+msgid "Depr. Expense Account"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Group By..."
+msgstr ""
+
+#. module: account_asset
+#: field:asset.asset.report,gross_value:0
+msgid "Gross Amount"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+#: field:account.asset.depreciation.line,asset_id:0
+#: field:account.asset.history,asset_id:0
+#: field:account.move.line,asset_id:0
+#: view:asset.asset.report:0
+#: field:asset.asset.report,asset_id:0
+#: model:ir.model,name:account_asset.model_account_asset_asset
+msgid "Asset"
+msgstr ""
+
+#. module: account_asset
+#: help:account.asset.asset,prorata:0
+#: help:account.asset.category,prorata:0
+msgid ""
+"Indicates that the first depreciation entry for this asset have to be done "
+"from the purchase date instead of the first January"
+msgstr ""
+
+#. module: account_asset
+#: selection:account.asset.asset,method:0
+#: selection:account.asset.category,method:0
+msgid "Linear"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,company_id:0
+#: field:account.asset.category,company_id:0
+#: view:asset.asset.report:0
+#: field:asset.asset.report,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.modify:0
+msgid "Modify"
+msgstr ""
+
+#. module: account_asset
+#: selection:account.asset.asset,state:0
+#: view:asset.asset.report:0
+#: selection:asset.asset.report,state:0
+msgid "Running"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Set to Draft"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0
+#: model:ir.actions.act_window,name:account_asset.action_asset_asset_report
+#: model:ir.model,name:account_asset.model_asset_asset_report
+#: model:ir.ui.menu,name:account_asset.menu_action_asset_asset_report
+msgid "Assets Analysis"
+msgstr ""
+
+#. module: account_asset
+#: field:asset.modify,name:0
+msgid "Reason"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,method_progress_factor:0
+#: field:account.asset.category,method_progress_factor:0
+msgid "Degressive Factor"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_list_normal
+#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_list_normal
+msgid "Asset Categories"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+#: field:account.asset.asset,account_move_line_ids:0
+#: field:account.move.line,entry_ids:0
+#: model:ir.actions.act_window,name:account_asset.act_entries_open
+msgid "Entries"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+#: field:account.asset.asset,depreciation_line_ids:0
+msgid "Depreciation Lines"
+msgstr ""
+
+#. module: account_asset
+#: help:account.asset.asset,salvage_value:0
+msgid "It is the amount you plan to have that you cannot depreciate."
+msgstr ""
+
+#. module: account_asset
+#: help:account.asset.asset,method_period:0
+msgid "The amount of time between two depreciations, in months"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,depreciation_date:0
+#: view:asset.asset.report:0
+#: field:asset.asset.report,depreciation_date:0
+msgid "Depreciation Date"
+msgstr ""
+
+#. module: account_asset
+#: constraint:account.asset.asset:0
+msgid "Error ! You cannot create recursive assets."
+msgstr ""
+
+#. module: account_asset
+#: field:asset.asset.report,posted_value:0
+msgid "Posted Amount"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+#: view:asset.asset.report:0
+#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_form
+#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_form
+#: model:ir.ui.menu,name:account_asset.menu_finance_assets
+#: model:ir.ui.menu,name:account_asset.menu_finance_config_assets
+msgid "Assets"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.category,account_depreciation_id:0
+msgid "Depreciation Account"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+#: view:account.asset.category:0
+#: view:account.asset.history:0
+#: view:asset.modify:0
+#: field:asset.modify,note:0
+msgid "Notes"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,move_id:0
+msgid "Depreciation Entry"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0
+#: field:asset.asset.report,nbr:0
+msgid "# of Depreciation Lines"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,method_period:0
+msgid "Number of Months in a Period"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Assets in draft state"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,method_end:0
+#: selection:account.asset.asset,method_time:0
+#: selection:account.asset.category,method_time:0
+#: selection:account.asset.history,method_time:0
+msgid "Ending Date"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,code:0
+msgid "Reference"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Account Asset"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.actions.act_window,name:account_asset.action_asset_depreciation_confirmation_wizard
+#: model:ir.ui.menu,name:account_asset.menu_asset_depreciation_confirmation_wizard
+msgid "Compute Assets"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.category,method_period:0
+#: field:account.asset.history,method_period:0
+#: field:asset.modify,method_period:0
+msgid "Period Length"
+msgstr ""
+
+#. module: account_asset
+#: selection:account.asset.asset,state:0
+#: view:asset.asset.report:0
+#: selection:asset.asset.report,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Date of asset purchase"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Change Duration"
+msgstr ""
+
+#. module: account_asset
+#: help:account.asset.asset,method_number:0
+#: help:account.asset.category,method_number:0
+#: help:account.asset.history,method_number:0
+msgid "The number of depreciations needed to depreciate your asset"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.category:0
+msgid "Analytic Information"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.category,account_analytic_id:0
+msgid "Analytic account"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,method:0
+#: field:account.asset.category,method:0
+msgid "Computation Method"
+msgstr ""
+
+#. module: account_asset
+#: constraint:account.asset.asset:0
+msgid ""
+"Prorata temporis can be applied only for time method \"number of "
+"depreciations\"."
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,remaining_value:0
+msgid "Next Period Depreciation"
+msgstr ""
+
+#. module: account_asset
+#: help:account.asset.history,method_period:0
+msgid "Time in month between two depreciations"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.modify:0
+#: model:ir.actions.act_window,name:account_asset.action_asset_modify
+#: model:ir.model,name:account_asset.model_asset_modify
+msgid "Modify Asset"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,salvage_value:0
+msgid "Salvage Value"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,category_id:0
+#: view:account.asset.category:0
+#: field:account.invoice.line,asset_category_id:0
+#: view:asset.asset.report:0
+msgid "Asset Category"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Assets in closed state"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,parent_id:0
+msgid "Parent Asset"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.history:0
+#: model:ir.model,name:account_asset.model_account_asset_history
+msgid "Asset history"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.category:0
+msgid "Search Asset Category"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.modify:0
+msgid "months"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.model,name:account_asset.model_account_invoice_line
+msgid "Invoice Line"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Depreciation Board"
+msgstr ""
+
+#. module: account_asset
+#: field:asset.asset.report,unposted_value:0
+msgid "Unposted Amount"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,method_time:0
+#: field:account.asset.category,method_time:0
+#: field:account.asset.history,method_time:0
+msgid "Time Method"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.depreciation.confirmation.wizard:0
+#: view:asset.modify:0
+msgid "or"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,note:0
+#: field:account.asset.category,note:0
+#: field:account.asset.history,note:0
+msgid "Note"
+msgstr ""
+
+#. module: account_asset
+#: help:account.asset.history,method_time:0
+msgid ""
+"The method to use to compute the dates and number of depreciation lines.\n"
+"Number of Depreciations: Fix the number of depreciation lines and the time "
+"between 2 depreciations.\n"
+"Ending Date: Choose the time between 2 depreciations and the date the "
+"depreciations won't go beyond."
+msgstr ""
+
+#. module: account_asset
+#: help:account.asset.asset,method_time:0
+#: help:account.asset.category,method_time:0
+msgid ""
+"Choose the method to use to compute the dates and number of depreciation "
+"lines.\n"
+"  * Number of Depreciations: Fix the number of depreciation lines and the "
+"time between 2 depreciations.\n"
+"  * Ending Date: Choose the time between 2 depreciations and the date the "
+"depreciations won't go beyond."
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Assets in running state"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Closed"
+msgstr ""
+
+#. module: account_asset
+#: help:account.asset.asset,state:0
+msgid ""
+"When an asset is created, the status is 'Draft'.\n"
+"If the asset is confirmed, the status goes in 'Running' and the depreciation "
+"lines can be posted in the accounting.\n"
+"You can manually close an asset when the depreciation is over. If the last "
+"line of depreciation is posted, the asset automatically goes in that status."
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,state:0
+#: field:asset.asset.report,state:0
+msgid "Status"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,partner_id:0
+#: field:asset.asset.report,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Posted depreciation lines"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,child_ids:0
+msgid "Children Assets"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Date of depreciation"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.history,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.category,account_asset_id:0
+msgid "Asset Account"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+#: view:asset.depreciation.confirmation.wizard:0
+msgid "Compute"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.history:0
+msgid "Asset History"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.model,name:account_asset.model_asset_depreciation_confirmation_wizard
+msgid "asset.depreciation.confirmation.wizard"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,active:0
+msgid "Active"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,parent_state:0
+msgid "State of Asset"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,name:0
+msgid "Depreciation Name"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+#: field:account.asset.asset,history_ids:0
+msgid "History"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.depreciation.confirmation.wizard:0
+msgid "Compute Asset"
+msgstr ""
+
+#. module: account_asset
+#: field:asset.depreciation.confirmation.wizard,period_id:0
+msgid "Period"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "General"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,prorata:0
+#: field:account.asset.category,prorata:0
+msgid "Prorata Temporis"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.model,name:account_asset.model_account_invoice
+msgid "Invoice"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Set to Close"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.depreciation.confirmation.wizard:0
+#: view:asset.modify:0
+msgid "Cancel"
+msgstr ""
+
+#. module: account_asset
+#: selection:account.asset.asset,state:0
+#: selection:asset.asset.report,state:0
+msgid "Close"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.model,name:account_asset.model_account_move_line
+msgid "Journal Items"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.modify:0
+msgid "Asset Durations to Modify"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,purchase_date:0
+#: view:asset.asset.report:0
+#: field:asset.asset.report,purchase_date:0
+msgid "Purchase Date"
+msgstr ""
+
+#. module: account_asset
+#: selection:account.asset.asset,method:0
+#: selection:account.asset.category,method:0
+msgid "Degressive"
+msgstr ""
+
+#. module: account_asset
+#: help:asset.depreciation.confirmation.wizard,period_id:0
+msgid ""
+"Choose the period for which you want to automatically post the depreciation "
+"lines of running assets"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Current"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.category:0
+msgid "Depreciation Method"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,amount:0
+msgid "Current Depreciation"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,name:0
+msgid "Asset Name"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.category,open_asset:0
+msgid "Skip Draft State"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.category:0
+msgid "Depreciation Dates"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.category,journal_id:0
+msgid "Journal"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.history,name:0
+msgid "History name"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,depreciated_value:0
+msgid "Amount Already Depreciated"
+msgstr ""
+
+#. module: account_asset
+#: help:account.asset.asset,method:0
+#: help:account.asset.category,method:0
+msgid ""
+"Choose the method to use to compute the amount of depreciation lines.\n"
+"  * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n"
+"  * Degressive: Calculated on basis of: Residual Value * Degressive Factor"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,move_check:0
+#: view:asset.asset.report:0
+#: field:asset.asset.report,move_check:0
+msgid "Posted"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.actions.act_window,help:account_asset.action_asset_asset_report
+msgid ""
+"<p>\n"
+"            From this report, you can have an overview on all depreciation. "
+"The\n"
+"            tool search can also be used to personalise your Assets reports "
+"and\n"
+"            so, match this analysis to your needs;\n"
+"          </p>\n"
+"        "
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,purchase_value:0
+msgid "Gross Value"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.category,name:0
+msgid "Name"
+msgstr ""
+
+#. module: account_asset
+#: help:account.asset.category,open_asset:0
+msgid ""
+"Check this if you want to automatically confirm the assets of this category "
+"when created by invoices."
+msgstr ""
+
+#. module: account_asset
+#: field:asset.asset.report,name:0
+msgid "Year"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.model,name:account_asset.model_account_asset_depreciation_line
+msgid "Asset depreciation line"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.category:0
+#: field:asset.asset.report,asset_category_id:0
+#: model:ir.model,name:account_asset.model_account_asset_category
+msgid "Asset category"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0
+#: field:asset.asset.report,depreciation_value:0
+msgid "Amount of Depreciation Lines"
+msgstr ""
+
+#. module: account_asset
+#: code:addons/account_asset/wizard/wizard_asset_compute.py:49
+#, python-format
+msgid "Created Asset Moves"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: account_asset
+#: help:account.asset.category,method_period:0
+msgid "State here the time between 2 depreciations, in months"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.history,date:0
+msgid "Date"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,method_number:0
+#: selection:account.asset.asset,method_time:0
+#: field:account.asset.category,method_number:0
+#: selection:account.asset.category,method_time:0
+#: field:account.asset.history,method_number:0
+#: selection:account.asset.history,method_time:0
+#: field:asset.modify,method_number:0
+msgid "Number of Depreciations"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Create Move"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Confirm Asset"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_tree
+#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_tree
+msgid "Asset Hierarchy"
+msgstr ""
diff --git a/addons/account_asset/security/ir.model.access.csv b/addons/account_asset/security/ir.model.access.csv
old mode 100755
new mode 100644
diff --git a/addons/account_asset/wizard/__init__.py b/addons/account_asset/wizard/__init__.py
old mode 100755
new mode 100644
diff --git a/addons/account_asset/wizard/account_asset_change_duration.py b/addons/account_asset/wizard/account_asset_change_duration.py
old mode 100755
new mode 100644
diff --git a/addons/account_asset/wizard/wizard_asset_compute.py b/addons/account_asset/wizard/wizard_asset_compute.py
old mode 100755
new mode 100644
diff --git a/addons/account_cancel/i18n/th.po b/addons/account_cancel/i18n/th.po
new file mode 100644
index 00000000000..eabcc0814dd
--- /dev/null
+++ b/addons/account_cancel/i18n/th.po
@@ -0,0 +1,23 @@
+# Thai 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: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2013-05-15 07:04+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Thai <th@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: 2013-05-16 05:12+0000\n"
+"X-Generator: Launchpad (build 16626)\n"
+
+#. module: account_cancel
+#: view:account.invoice:0
+msgid "Cancel"
+msgstr ""
diff --git a/addons/account_check_writing/i18n/ru.po b/addons/account_check_writing/i18n/ru.po
index ba474c72a22..8e68dd7152a 100644
--- a/addons/account_check_writing/i18n/ru.po
+++ b/addons/account_check_writing/i18n/ru.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-12-11 13:00+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2013-06-03 07:47+0000\n"
+"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: Russian <ru@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: 2013-03-16 05:51+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-06-04 05:20+0000\n"
+"X-Generator: Launchpad (build 16660)\n"
 
 #. module: account_check_writing
 #: selection:res.company,check_layout:0
@@ -25,13 +25,13 @@ msgstr ""
 #. module: account_check_writing
 #: report:account.print.check.top:0
 msgid "Open Balance"
-msgstr ""
+msgstr "Открытый баланс"
 
 #. module: account_check_writing
 #: view:account.check.write:0
 #: view:account.voucher:0
 msgid "Print Check"
-msgstr ""
+msgstr "Напечатать чек"
 
 #. module: account_check_writing
 #: selection:res.company,check_layout:0
@@ -82,7 +82,7 @@ msgstr "Описание"
 #. module: account_check_writing
 #: model:ir.model,name:account_check_writing.model_account_journal
 msgid "Journal"
-msgstr ""
+msgstr "Журнал"
 
 #. module: account_check_writing
 #: model:ir.actions.act_window,name:account_check_writing.action_write_check
@@ -95,14 +95,14 @@ msgstr ""
 #: report:account.print.check.middle:0
 #: report:account.print.check.top:0
 msgid "Discount"
-msgstr ""
+msgstr "Скидка"
 
 #. module: account_check_writing
 #: report:account.print.check.bottom:0
 #: report:account.print.check.middle:0
 #: report:account.print.check.top:0
 msgid "Original Amount"
-msgstr ""
+msgstr "Первоначальная сумма"
 
 #. module: account_check_writing
 #: field:res.company,check_layout:0
@@ -119,7 +119,7 @@ msgstr ""
 #: report:account.print.check.middle:0
 #: report:account.print.check.top:0
 msgid "Payment"
-msgstr ""
+msgstr "Платеж"
 
 #. module: account_check_writing
 #: field:account.journal,use_preprint_check:0
@@ -153,7 +153,7 @@ msgstr ""
 #: report:account.print.check.middle:0
 #: report:account.print.check.top:0
 msgid "Due Date"
-msgstr ""
+msgstr "Дата исполнения"
 
 #. module: account_check_writing
 #: model:ir.actions.report.xml,name:account_check_writing.account_print_check_middle
@@ -163,13 +163,13 @@ msgstr ""
 #. module: account_check_writing
 #: model:ir.model,name:account_check_writing.model_res_company
 msgid "Companies"
-msgstr ""
+msgstr "Компании"
 
 #. module: account_check_writing
 #: code:addons/account_check_writing/wizard/account_check_batch_printing.py:59
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Ошибка!"
 
 #. module: account_check_writing
 #: help:account.check.write,check_number:0
@@ -202,12 +202,12 @@ msgstr ""
 #. module: account_check_writing
 #: view:account.check.write:0
 msgid "or"
-msgstr ""
+msgstr "или"
 
 #. module: account_check_writing
 #: field:account.voucher,amount_in_word:0
 msgid "Amount in Word"
-msgstr ""
+msgstr "Сумма прописью"
 
 #. module: account_check_writing
 #: model:ir.model,name:account_check_writing.model_account_check_write
@@ -217,7 +217,7 @@ msgstr ""
 #. module: account_check_writing
 #: view:account.check.write:0
 msgid "Cancel"
-msgstr ""
+msgstr "Отмена"
 
 #. module: account_check_writing
 #: field:account.check.write,check_number:0
diff --git a/addons/account_followup/account_followup.py b/addons/account_followup/account_followup.py
index 036feaaf0e5..715860cab83 100644
--- a/addons/account_followup/account_followup.py
+++ b/addons/account_followup/account_followup.py
@@ -165,9 +165,8 @@ class res_partner(osv.osv):
             else:
                 action_text = partner.latest_followup_level_id_without_lit.manual_action_note or ''
 
-            #Check date: put the minimum date if it existed already
-            action_date = (partner.payment_next_action_date and min(partner.payment_next_action_date, fields.date.context_today(self, cr, uid, context=context))
-                           ) or fields.date.context_today(self, cr, uid, context=context)
+            #Check date: only change when it did not exist already
+            action_date = partner.payment_next_action_date or fields.date.context_today(self, cr, uid, context=context)
 
             # Check responsible: if partner has not got a responsible already, take from follow-up
             responsible_id = False
diff --git a/addons/account_followup/i18n/ru.po b/addons/account_followup/i18n/ru.po
index f6cb2cf0412..b57c8e4315e 100644
--- a/addons/account_followup/i18n/ru.po
+++ b/addons/account_followup/i18n/ru.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2011-11-11 15:21+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2013-05-31 10:28+0000\n"
+"Last-Translator: Chertykov Denis <chertykov@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: 2013-03-16 05:11+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-06-01 05:16+0000\n"
+"X-Generator: Launchpad (build 16660)\n"
 
 #. module: account_followup
 #: model:email.template,subject:account_followup.email_template_account_followup_default
@@ -22,7 +22,7 @@ msgstr ""
 #: model:email.template,subject:account_followup.email_template_account_followup_level1
 #: model:email.template,subject:account_followup.email_template_account_followup_level2
 msgid "${user.company_id.name} Payment Reminder"
-msgstr ""
+msgstr "${user.company_id.name} напоминание о платеже"
 
 #. module: account_followup
 #: help:res.partner,latest_followup_level_id:0
@@ -43,12 +43,12 @@ msgstr "Дальнейшие действия"
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid "%(date)s"
-msgstr ""
+msgstr "%(date)s"
 
 #. module: account_followup
 #: field:res.partner,payment_next_action_date:0
 msgid "Next Action Date"
-msgstr ""
+msgstr "Дата следующего действия"
 
 #. module: account_followup
 #: view:account_followup.followup.line:0
@@ -64,7 +64,7 @@ msgstr ""
 #. module: account_followup
 #: view:res.partner:0
 msgid "⇾ Mark as Done"
-msgstr ""
+msgstr "⇾ отметить как сделанное"
 
 #. module: account_followup
 #: field:account_followup.followup.line,manual_action_note:0
@@ -94,7 +94,7 @@ msgstr "Тема эл.письма"
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid "%(user_signature)s"
-msgstr ""
+msgstr "%(user_signature)s"
 
 #. module: account_followup
 #: view:account_followup.followup.line:0
@@ -109,19 +109,19 @@ msgstr ""
 #. module: account_followup
 #: field:account_followup.print,email_body:0
 msgid "Email Body"
-msgstr ""
+msgstr "Тело эл. письма"
 
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.action_account_followup_print
 msgid "Send Follow-Ups"
-msgstr ""
+msgstr "Послать напоминания"
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
 #: code:addons/account_followup/account_followup.py:263
 #, python-format
 msgid "Amount"
-msgstr ""
+msgstr "Сумма"
 
 #. module: account_followup
 #: help:res.partner,payment_next_action:0
@@ -133,7 +133,7 @@ msgstr ""
 #. module: account_followup
 #: view:res.partner:0
 msgid "No Responsible"
-msgstr ""
+msgstr "Нет ответственного"
 
 #. module: account_followup
 #: model:account_followup.followup.line,description:account_followup.demo_followup_line2
@@ -209,17 +209,17 @@ msgstr "Всего по дебету"
 #. module: account_followup
 #: field:res.partner,payment_next_action:0
 msgid "Next Action"
-msgstr ""
+msgstr "Следующее действие"
 
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid ": Partner Name"
-msgstr ""
+msgstr ": Название партнера"
 
 #. module: account_followup
 #: field:account_followup.followup.line,manual_action_responsible_id:0
 msgid "Assign a Responsible"
-msgstr ""
+msgstr "Назначить ответственного"
 
 #. module: account_followup
 #: view:account_followup.followup:0
@@ -305,7 +305,7 @@ msgstr ""
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid "%(partner_name)s"
-msgstr ""
+msgstr "%(partner_name)s"
 
 #. module: account_followup
 #: model:email.template,body_html:account_followup.email_template_account_followup_level1
@@ -377,7 +377,7 @@ msgstr "Определяет порядок вывода списка напом
 #: code:addons/account_followup/wizard/account_followup_print.py:166
 #, python-format
 msgid " will be sent"
-msgstr ""
+msgstr " будет отправлен"
 
 #. module: account_followup
 #: view:account_followup.followup.line:0
@@ -388,7 +388,7 @@ msgstr ""
 #: view:account_followup.followup.line:0
 #: field:account_followup.followup.line,send_letter:0
 msgid "Send a Letter"
-msgstr ""
+msgstr "Отправить письмо"
 
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.action_account_followup_definition_form
@@ -466,7 +466,7 @@ msgstr "Напечатанное сообщение"
 #: code:addons/account_followup/wizard/account_followup_print.py:155
 #, python-format
 msgid "Anybody"
-msgstr ""
+msgstr "Кто угодно"
 
 #. module: account_followup
 #: help:account_followup.followup.line,send_email:0
@@ -528,7 +528,7 @@ msgstr ""
 #. module: account_followup
 #: view:res.partner:0
 msgid "Search Partner"
-msgstr ""
+msgstr "Поиск партнера"
 
 #. module: account_followup
 #: model:ir.ui.menu,name:account_followup.account_followup_print_menu
@@ -554,7 +554,7 @@ msgstr ""
 #. module: account_followup
 #: view:account_followup.print:0
 msgid "or"
-msgstr ""
+msgstr "или"
 
 #. module: account_followup
 #: view:res.partner:0
diff --git a/addons/account_followup/security/account_followup_security.xml b/addons/account_followup/security/account_followup_security.xml
index 1586403d701..69c9a44a1b9 100644
--- a/addons/account_followup/security/account_followup_security.xml
+++ b/addons/account_followup/security/account_followup_security.xml
@@ -4,7 +4,7 @@
 
     <record id="account_followup_comp_rule" model="ir.rule">
         <field name="name">Account Follow-up multi company rule</field>
-        <field model="ir.model" name="model_id" ref="model_account_followup_followup"/>
+        <field name="model_id" ref="model_account_followup_followup"/>
         <field eval="True" name="global"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
diff --git a/addons/account_payment/security/account_payment_security.xml b/addons/account_payment/security/account_payment_security.xml
index 4bca00eaa6d..fbe29699e86 100644
--- a/addons/account_payment/security/account_payment_security.xml
+++ b/addons/account_payment/security/account_payment_security.xml
@@ -15,21 +15,21 @@
 
     <record id="payment_mode_comp_rule" model="ir.rule">
         <field name="name">Payment Mode company rule</field>
-        <field model="ir.model" name="model_id" ref="model_payment_mode"/>
+        <field name="model_id" ref="model_payment_mode"/>
         <field eval="True" name="global"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
     <record id="payment_order_comp_rule" model="ir.rule">
         <field name="name">Payment order multi company rule</field>
-        <field model="ir.model" name="model_id" ref="model_payment_order"/>
+        <field name="model_id" ref="model_payment_order"/>
         <field eval="True" name="global"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
     <record id="payment_line_comp_rule" model="ir.rule">
         <field name="name">Payment line multi company rule</field>
-        <field model="ir.model" name="model_id" ref="model_payment_line"/>
+        <field name="model_id" ref="model_payment_line"/>
         <field eval="True" name="global"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
diff --git a/addons/account_test/account_test.py b/addons/account_test/account_test.py
index 98e27380837..cc60108bf20 100644
--- a/addons/account_test/account_test.py
+++ b/addons/account_test/account_test.py
@@ -24,7 +24,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
 ##############################################################################
 
diff --git a/addons/account_voucher/__openerp__.py b/addons/account_voucher/__openerp__.py
index a6cbc9a3e40..0659e4f4bae 100644
--- a/addons/account_voucher/__openerp__.py
+++ b/addons/account_voucher/__openerp__.py
@@ -68,6 +68,7 @@ This module manages:
         'test/sales_payment.yml',
         'test/account_voucher_report.yml',
         'test/case1_usd_usd.yml',
+        'test/case1_usd_usd_payment_rate.yml',
         'test/case2_usd_eur_debtor_in_eur.yml',
         'test/case2_usd_eur_debtor_in_usd.yml',
         'test/case3_eur_eur.yml',
diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index b176c3b8fd9..850162ccf84 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -26,6 +26,19 @@ from openerp.osv import fields, osv
 import openerp.addons.decimal_precision as dp
 from openerp.tools.translate import _
 from openerp.tools import float_compare
+from openerp.report import report_sxw
+
+class res_currency(osv.osv):
+    _inherit = "res.currency"
+
+    def _get_current_rate(self, cr, uid, ids, name, arg, context=None):
+        if context is None:
+            context = {}
+        res = super(res_currency, self)._get_current_rate(cr, uid, ids, name, arg, context=context)
+        if context.get('voucher_special_currency') in ids and context.get('voucher_special_currency_rate'):
+            res[context.get('voucher_special_currency')] = context.get('voucher_special_currency_rate')
+        return res
+
 
 class res_company(osv.osv):
     _inherit = "res.company"
@@ -153,7 +166,7 @@ class account_voucher(osv.osv):
             journal = journal_pool.browse(cr, uid, journal_id, context=context)
             if journal.currency:
                 return journal.currency.id
-        return False
+        return self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.currency_id.id
 
     def _get_partner(self, cr, uid, context=None):
         if context is None: context = {}
@@ -222,26 +235,26 @@ class account_voucher(osv.osv):
     def onchange_line_ids(self, cr, uid, ids, line_dr_ids, line_cr_ids, amount, voucher_currency, type, context=None):
         context = context or {}
         if not line_dr_ids and not line_cr_ids:
-            return {'value':{}}
+            return {'value':{'writeoff_amount': 0.0}}
         line_osv = self.pool.get("account.voucher.line")
         line_dr_ids = resolve_o2m_operations(cr, uid, line_osv, line_dr_ids, ['amount'], context)
         line_cr_ids = resolve_o2m_operations(cr, uid, line_osv, line_cr_ids, ['amount'], context)
-
         #compute the field is_multi_currency that is used to hide/display options linked to secondary currency on the voucher
         is_multi_currency = False
-        if voucher_currency:
-            # if the voucher currency is not False, it means it is different than the company currency and we need to display the options
-            is_multi_currency = True
-        else:
-            #loop on the voucher lines to see if one of these has a secondary currency. If yes, we need to define the options
-            for voucher_line in line_dr_ids+line_cr_ids:
-                company_currency = False
-                company_currency = voucher_line.get('move_line_id', False) and self.pool.get('account.move.line').browse(cr, uid, voucher_line.get('move_line_id'), context=context).company_id.currency_id.id
-                if voucher_line.get('currency_id', company_currency) != company_currency:
-                    is_multi_currency = True
-                    break
+        #loop on the voucher lines to see if one of these has a secondary currency. If yes, we need to see the options
+        for voucher_line in line_dr_ids+line_cr_ids:
+            line_id = voucher_line.get('id') and self.pool.get('account.voucher.line').browse(cr, uid, voucher_line['id'], context=context).move_line_id.id or voucher_line.get('move_line_id')
+            if line_id and self.pool.get('account.move.line').browse(cr, uid, line_id, context=context).currency_id:
+                is_multi_currency = True
+                break
         return {'value': {'writeoff_amount': self._compute_writeoff_amount(cr, uid, line_dr_ids, line_cr_ids, amount, type), 'is_multi_currency': is_multi_currency}}
 
+    def _get_journal_currency(self, cr, uid, ids, name, args, context=None):
+        res = {}
+        for voucher in self.browse(cr, uid, ids, context=context):
+            res[voucher.id] = voucher.journal_id.currency and voucher.journal_id.currency.id or voucher.company_id.currency_id.id
+        return res
+
     def _get_writeoff_amount(self, cr, uid, ids, name, args, context=None):
         if not ids: return {}
         currency_obj = self.pool.get('res.currency')
@@ -258,20 +271,48 @@ class account_voucher(osv.osv):
         return res
 
     def _paid_amount_in_company_currency(self, cr, uid, ids, name, args, context=None):
-        if not ids: return {}
+        if context is None:
+            context = {}
+        res = {}
+        ctx = context.copy()
+        for v in self.browse(cr, uid, ids, context=context):
+            ctx.update({'date': v.date})
+            #make a new call to browse in order to have the right date in the context, to get the right currency rate
+            voucher = self.browse(cr, uid, v.id, context=ctx)
+            ctx.update({
+              'voucher_special_currency': voucher.payment_rate_currency_id and voucher.payment_rate_currency_id.id or False,
+              'voucher_special_currency_rate': voucher.currency_id.rate * voucher.payment_rate,})
+            res[voucher.id] =  self.pool.get('res.currency').compute(cr, uid, voucher.currency_id.id, voucher.company_id.currency_id.id, voucher.amount, context=ctx)
+        return res
+
+    def _get_currency_help_label(self, cr, uid, currency_id, payment_rate, payment_rate_currency_id, context=None):
+        """
+        This function builds a string to help the users to understand the behavior of the payment rate fields they can specify on the voucher. 
+        This string is only used to improve the usability in the voucher form view and has no other effect.
+
+        :param currency_id: the voucher currency
+        :type currency_id: integer
+        :param payment_rate: the value of the payment_rate field of the voucher
+        :type payment_rate: float
+        :param payment_rate_currency_id: the value of the payment_rate_currency_id field of the voucher
+        :type payment_rate_currency_id: integer
+        :return: translated string giving a tip on what's the effect of the current payment rate specified
+        :rtype: str
+        """
+        rml_parser = report_sxw.rml_parse(cr, uid, 'currency_help_label', context=context)
+        currency_pool = self.pool.get('res.currency')
+        currency_str = payment_rate_str = ''
+        if currency_id:
+            currency_str = rml_parser.formatLang(1, currency_obj=currency_pool.browse(cr, uid, currency_id, context=context))
+        if payment_rate_currency_id:
+            payment_rate_str  = rml_parser.formatLang(payment_rate, currency_obj=currency_pool.browse(cr, uid, payment_rate_currency_id, context=context))
+        currency_help_label = _('At the operation date, the exchange rate was\n%s = %s') % (currency_str, payment_rate_str)
+        return currency_help_label
+
+    def _fnct_currency_help_label(self, cr, uid, ids, name, args, context=None):
         res = {}
-        rate = 1.0
         for voucher in self.browse(cr, uid, ids, context=context):
-            if voucher.currency_id:
-                if voucher.company_id.currency_id.id == voucher.payment_rate_currency_id.id:
-                    rate =  1 / voucher.payment_rate
-                else:
-                    ctx = context.copy()
-                    ctx.update({'date': voucher.date})
-                    voucher_rate = self.browse(cr, uid, voucher.id, context=ctx).currency_id.rate
-                    company_currency_rate = voucher.company_id.currency_id.rate
-                    rate = voucher_rate * company_currency_rate
-            res[voucher.id] =  voucher.amount / rate
+            res[voucher.id] = self._get_currency_help_label(cr, uid, voucher.currency_id.id, voucher.payment_rate, voucher.payment_rate_currency_id.id, context=context)
         return res
 
     _name = 'account.voucher'
@@ -304,8 +345,7 @@ class account_voucher(osv.osv):
             domain=[('type','=','dr')], context={'default_type':'dr'}, readonly=True, states={'draft':[('readonly',False)]}),
         'period_id': fields.many2one('account.period', 'Period', required=True, readonly=True, states={'draft':[('readonly',False)]}),
         'narration':fields.text('Notes', readonly=True, states={'draft':[('readonly',False)]}),
-#        'currency_id':fields.many2one('res.currency', 'Currency', required=True, readonly=True, states={'draft':[('readonly',False)]}),
-        'currency_id': fields.related('journal_id','currency', type='many2one', relation='res.currency', string='Currency', readonly=True),
+        'currency_id': fields.function(_get_journal_currency, type='many2one', relation='res.currency', string='Currency', readonly=True, required=True),
         'company_id': fields.many2one('res.company', 'Company', required=True, readonly=True, states={'draft':[('readonly',False)]}),
         'state':fields.selection(
             [('draft','Draft'),
@@ -346,6 +386,7 @@ class account_voucher(osv.osv):
             help='The specific rate that will be used, in this voucher, between the selected currency (in \'Payment Rate Currency\' field)  and the voucher currency.'),
         'paid_amount_in_company_currency': fields.function(_paid_amount_in_company_currency, string='Paid Amount in Company Currency', type='float', readonly=True),
         'is_multi_currency': fields.boolean('Multi Currency Voucher', help='Fields with internal purpose only that depicts if the voucher is a multi currency one or not'),
+        'currency_help_label': fields.function(_fnct_currency_help_label, type='text', string="Helping Sentence", help="This sentence helps you to know how to specify the payment rate by giving you the direct effect it has"), 
     }
     _defaults = {
         'active': True,
@@ -422,6 +463,8 @@ class account_voucher(osv.osv):
         partner_pool = self.pool.get('res.partner')
         position_pool = self.pool.get('account.fiscal.position')
         line_pool = self.pool.get('account.voucher.line')
+        if not line_ids:
+            line_ids = []
         res = {
             'tax_amount': False,
             'amount': False,
@@ -516,23 +559,26 @@ class account_voucher(osv.osv):
         return default
 
     def onchange_rate(self, cr, uid, ids, rate, amount, currency_id, payment_rate_currency_id, company_id, context=None):
-        res =  {'value': {'paid_amount_in_company_currency': amount}}
-        company_currency = self.pool.get('res.company').browse(cr, uid, company_id, context=context).currency_id
-        if rate and amount and currency_id:# and currency_id == payment_rate_currency_id:
-            voucher_rate = self.pool.get('res.currency').browse(cr, uid, currency_id, context).rate
-            if company_currency.id == payment_rate_currency_id:
-                company_rate = rate
-            else:
-                company_rate = self.pool.get('res.company').browse(cr, uid, company_id, context=context).currency_id.rate
-            res['value']['paid_amount_in_company_currency'] = amount / voucher_rate * company_rate
+        res =  {'value': {'paid_amount_in_company_currency': amount, 'currency_help_label': self._get_currency_help_label(cr, uid, currency_id, rate, payment_rate_currency_id, context=context)}}
+        if rate and amount and currency_id:
+            company_currency = self.pool.get('res.company').browse(cr, uid, company_id, context=context).currency_id
+            #context should contain the date, the payment currency and the payment rate specified on the voucher
+            amount_in_company_currency = self.pool.get('res.currency').compute(cr, uid, currency_id, company_currency.id, amount, context=context)
+            res['value']['paid_amount_in_company_currency'] = amount_in_company_currency
         return res
 
     def onchange_amount(self, cr, uid, ids, amount, rate, partner_id, journal_id, currency_id, ttype, date, payment_rate_currency_id, company_id, context=None):
         if context is None:
             context = {}
-        res = self.recompute_voucher_lines(cr, uid, ids, partner_id, journal_id, amount, currency_id, ttype, date, context=context)
         ctx = context.copy()
         ctx.update({'date': date})
+        #read the voucher rate with the right date in the context
+        currency_id = currency_id or self.pool.get('res.company').browse(cr, uid, company_id, context=ctx).currency_id.id
+        voucher_rate = self.pool.get('res.currency').read(cr, uid, currency_id, ['rate'], context=ctx)['rate']
+        ctx.update({
+            'voucher_special_currency': payment_rate_currency_id,
+            'voucher_special_currency_rate': rate * voucher_rate})
+        res = self.recompute_voucher_lines(cr, uid, ids, partner_id, journal_id, amount, currency_id, ttype, date, context=ctx)
         vals = self.onchange_rate(cr, uid, ids, rate, amount, currency_id, payment_rate_currency_id, company_id, context=ctx)
         for key in vals.keys():
             res[key].update(vals[key])
@@ -546,6 +592,7 @@ class account_voucher(osv.osv):
         journal = self.pool.get('account.journal').browse(cr, uid, journal_id, context=context)
         company_id = journal.company_id.id
         payment_rate = 1.0
+        currency_id = currency_id or journal.company_id.currency_id.id
         payment_rate_currency_id = currency_id
         ctx = context.copy()
         ctx.update({'date': date})
@@ -561,24 +608,62 @@ class account_voucher(osv.osv):
                     # is not in the voucher currency
                     payment_rate_currency_id = voucher_line['currency_id']
                     tmp = currency_obj.browse(cr, uid, payment_rate_currency_id, context=ctx).rate
-                    voucher_currency_id = currency_id or journal.company_id.currency_id.id
-                    payment_rate = tmp / currency_obj.browse(cr, uid, voucher_currency_id, context=ctx).rate
+                    payment_rate = tmp / currency_obj.browse(cr, uid, currency_id, context=ctx).rate
                     break
+        vals['value'].update({
+            'payment_rate': payment_rate,
+            'currency_id': currency_id,
+            'payment_rate_currency_id': payment_rate_currency_id
+        })
+        #read the voucher rate with the right date in the context
+        voucher_rate = self.pool.get('res.currency').read(cr, uid, currency_id, ['rate'], context=ctx)['rate']
+        ctx.update({
+            'voucher_special_currency_rate': payment_rate * voucher_rate,
+            'voucher_special_currency': payment_rate_currency_id})
         res = self.onchange_rate(cr, uid, ids, payment_rate, amount, currency_id, payment_rate_currency_id, company_id, context=ctx)
         for key in res.keys():
             vals[key].update(res[key])
-        vals['value'].update({'payment_rate': payment_rate})
-        if payment_rate_currency_id:
-            vals['value'].update({'payment_rate_currency_id': payment_rate_currency_id})
         return vals
 
+    def basic_onchange_partner(self, cr, uid, ids, partner_id, journal_id, ttype, context=None):
+        partner_pool = self.pool.get('res.partner')
+        journal_pool = self.pool.get('account.journal')
+        res = {'value': {'account_id': False}}
+        if not partner_id or not journal_id:
+            return res
+
+        journal = journal_pool.browse(cr, uid, journal_id, context=context)
+        partner = partner_pool.browse(cr, uid, partner_id, context=context)
+        account_id = False
+        if journal.type in ('sale','sale_refund'):
+            account_id = partner.property_account_receivable.id
+        elif journal.type in ('purchase', 'purchase_refund','expense'):
+            account_id = partner.property_account_payable.id
+        else:
+            account_id = journal.default_credit_account_id.id or journal.default_debit_account_id.id
+
+        res['value']['account_id'] = account_id
+        return res
+
     def onchange_partner_id(self, cr, uid, ids, partner_id, journal_id, amount, currency_id, ttype, date, context=None):
         if not journal_id:
             return {}
-        res = self.recompute_voucher_lines(cr, uid, ids, partner_id, journal_id, amount, currency_id, ttype, date, context=context)
-        vals = self.recompute_payment_rate(cr, uid, ids, res, currency_id, date, ttype, journal_id, amount, context=context)
+        if context is None:
+            context = {}
+        #TODO: comment me and use me directly in the sales/purchases views
+        res = self.basic_onchange_partner(cr, uid, ids, partner_id, journal_id, ttype, context=context)
+        if ttype in ['sale', 'purchase']:
+            return res
+        ctx = context.copy()
+        # not passing the payment_rate currency and the payment_rate in the context but it's ok because they are reset in recompute_payment_rate
+        ctx.update({'date': date})
+        vals = self.recompute_voucher_lines(cr, uid, ids, partner_id, journal_id, amount, currency_id, ttype, date, context=ctx)
+        vals2 = self.recompute_payment_rate(cr, uid, ids, vals, currency_id, date, ttype, journal_id, amount, context=context)
         for key in vals.keys():
             res[key].update(vals[key])
+        for key in vals2.keys():
+            res[key].update(vals2[key])
+        #TODO: can probably be removed now
         #TODO: onchange_partner_id() should not returns [pre_line, line_dr_ids, payment_rate...] for type sale, and not 
         # [pre_line, line_cr_ids, payment_rate...] for type purchase.
         # We should definitively split account.voucher object in two and make distinct on_change functions. In the 
@@ -621,8 +706,6 @@ class account_voucher(osv.osv):
         if context is None:
             context = {}
         context_multi_currency = context.copy()
-        if date:
-            context_multi_currency.update({'date': date})
 
         currency_pool = self.pool.get('res.currency')
         move_line_pool = self.pool.get('account.move.line')
@@ -646,18 +729,6 @@ class account_voucher(osv.osv):
         journal = journal_pool.browse(cr, uid, journal_id, context=context)
         partner = partner_pool.browse(cr, uid, partner_id, context=context)
         currency_id = currency_id or journal.company_id.currency_id.id
-        account_id = False
-        if journal.type in ('sale','sale_refund'):
-            account_id = partner.property_account_receivable.id
-        elif journal.type in ('purchase', 'purchase_refund','expense'):
-            account_id = partner.property_account_payable.id
-        else:
-            account_id = journal.default_credit_account_id.id or journal.default_debit_account_id.id
-
-        default['value']['account_id'] = account_id
-
-        if journal.type not in ('cash', 'bank'):
-            return default
 
         total_credit = 0.0
         total_debit = 0.0
@@ -715,12 +786,13 @@ class account_voucher(osv.osv):
             if _remove_noise_in_o2m():
                 continue
 
-            if line.currency_id and currency_id==line.currency_id.id:
+            if line.currency_id and currency_id == line.currency_id.id:
                 amount_original = abs(line.amount_currency)
                 amount_unreconciled = abs(line.amount_residual_currency)
             else:
-                amount_original = currency_pool.compute(cr, uid, company_currency, currency_id, line.credit or line.debit or 0.0)
-                amount_unreconciled = currency_pool.compute(cr, uid, company_currency, currency_id, abs(line.amount_residual))
+                #always use the amount booked in the company currency as the basis of the conversion into the voucher currency
+                amount_original = currency_pool.compute(cr, uid, company_currency, currency_id, line.credit or line.debit or 0.0, context=context_multi_currency)
+                amount_unreconciled = currency_pool.compute(cr, uid, company_currency, currency_id, abs(line.amount_residual), context=context_multi_currency)
             line_currency_id = line.currency_id and line.currency_id.id or company_currency
             rs = {
                 'name':line.move_id.name,
@@ -766,10 +838,15 @@ class account_voucher(osv.osv):
         if context is None:
             context = {}
         res = {'value': {}}
-        #set the default payment rate of the voucher and compute the paid amount in company currency
-        if currency_id and currency_id == payment_rate_currency_id:
+        if currency_id:
+            #set the default payment rate of the voucher and compute the paid amount in company currency
             ctx = context.copy()
             ctx.update({'date': date})
+            #read the voucher rate with the right date in the context
+            voucher_rate = self.pool.get('res.currency').read(cr, uid, currency_id, ['rate'], context=ctx)['rate']
+            ctx.update({
+                'voucher_special_currency_rate': payment_rate * voucher_rate, 
+                'voucher_special_currency': payment_rate_currency_id})
             vals = self.onchange_rate(cr, uid, ids, payment_rate, amount, currency_id, payment_rate_currency_id, company_id, context=ctx)
             for key in vals.keys():
                 res[key].update(vals[key])
@@ -789,7 +866,8 @@ class account_voucher(osv.osv):
         period_pool = self.pool.get('account.period')
         currency_obj = self.pool.get('res.currency')
         ctx = context.copy()
-        ctx.update({'company_id': company_id})
+        ctx.update({'company_id': company_id, 'account_period_prefer_normal': True})
+        voucher_currency_id = currency_id or self.pool.get('res.company').browse(cr, uid, company_id, context=ctx).currency_id.id
         pids = period_pool.find(cr, uid, date, context=ctx)
         if pids:
             res['value'].update({'period_id':pids[0]})
@@ -798,9 +876,8 @@ class account_voucher(osv.osv):
             payment_rate = 1.0
             if payment_rate_currency_id != currency_id:
                 tmp = currency_obj.browse(cr, uid, payment_rate_currency_id, context=ctx).rate
-                voucher_currency_id = currency_id or self.pool.get('res.company').browse(cr, uid, company_id, context=ctx).currency_id.id
                 payment_rate = tmp / currency_obj.browse(cr, uid, voucher_currency_id, context=ctx).rate
-            vals = self.onchange_payment_rate_currency(cr, uid, ids, currency_id, payment_rate, payment_rate_currency_id, date, amount, company_id, context=context)
+            vals = self.onchange_payment_rate_currency(cr, uid, ids, voucher_currency_id, payment_rate, payment_rate_currency_id, date, amount, company_id, context=context)
             vals['value'].update({'payment_rate': payment_rate})
             for key in vals.keys():
                 res[key].update(vals[key])
@@ -823,7 +900,15 @@ class account_voucher(osv.osv):
         currency_id = False
         if journal.currency:
             currency_id = journal.currency.id
+        else:
+            currency_id = journal.company_id.currency_id.id
         vals['value'].update({'currency_id': currency_id})
+        #in case we want to register the payment directly from an invoice, it's confusing to allow to switch the journal 
+        #without seeing that the amount is expressed in the journal currency, and not in the invoice currency. So to avoid
+        #this common mistake, we simply reset the amount to 0 if the currency is not the invoice currency.
+        if context.get('payment_expected_currency') and currency_id != context.get('payment_expected_currency'):
+            vals['value']['amount'] = 0
+            amount = 0
         res = self.onchange_partner_id(cr, uid, ids, partner_id, journal_id, amount, currency_id, ttype, date, context)
         for key in res.keys():
             vals[key].update(res[key])
@@ -905,8 +990,8 @@ class account_voucher(osv.osv):
         current_currency = self._get_current_currency(cr, uid, voucher_id, context)
         if current_currency <> company_currency:
             context_multi_currency = context.copy()
-            voucher_brw = self.pool.get('account.voucher').browse(cr, uid, voucher_id, context)
-            context_multi_currency.update({'date': voucher_brw.date})
+            voucher = self.pool.get('account.voucher').browse(cr, uid, voucher_id, context)
+            context_multi_currency.update({'date': voucher.date})
             return context_multi_currency
         return context
 
@@ -921,33 +1006,33 @@ class account_voucher(osv.osv):
         :return: mapping between fieldname and value of account move line to create
         :rtype: dict
         '''
-        voucher_brw = self.pool.get('account.voucher').browse(cr,uid,voucher_id,context)
+        voucher = self.pool.get('account.voucher').browse(cr,uid,voucher_id,context)
         debit = credit = 0.0
         # TODO: is there any other alternative then the voucher type ??
         # ANSWER: We can have payment and receipt "In Advance".
         # TODO: Make this logic available.
         # -for sale, purchase we have but for the payment and receipt we do not have as based on the bank/cash journal we can not know its payment or receipt
-        if voucher_brw.type in ('purchase', 'payment'):
-            credit = voucher_brw.paid_amount_in_company_currency
-        elif voucher_brw.type in ('sale', 'receipt'):
-            debit = voucher_brw.paid_amount_in_company_currency
+        if voucher.type in ('purchase', 'payment'):
+            credit = voucher.paid_amount_in_company_currency
+        elif voucher.type in ('sale', 'receipt'):
+            debit = voucher.paid_amount_in_company_currency
         if debit < 0: credit = -debit; debit = 0.0
         if credit < 0: debit = -credit; credit = 0.0
         sign = debit - credit < 0 and -1 or 1
         #set the first line of the voucher
         move_line = {
-                'name': voucher_brw.name or '/',
+                'name': voucher.name or '/',
                 'debit': debit,
                 'credit': credit,
-                'account_id': voucher_brw.account_id.id,
+                'account_id': voucher.account_id.id,
                 'move_id': move_id,
-                'journal_id': voucher_brw.journal_id.id,
-                'period_id': voucher_brw.period_id.id,
-                'partner_id': voucher_brw.partner_id.id,
+                'journal_id': voucher.journal_id.id,
+                'period_id': voucher.period_id.id,
+                'partner_id': voucher.partner_id.id,
                 'currency_id': company_currency <> current_currency and  current_currency or False,
-                'amount_currency': company_currency <> current_currency and sign * voucher_brw.amount or 0.0,
-                'date': voucher_brw.date,
-                'date_maturity': voucher_brw.date_due
+                'amount_currency': company_currency <> current_currency and sign * voucher.amount or 0.0,
+                'date': voucher.date,
+                'date_maturity': voucher.date_due
             }
         return move_line
 
@@ -960,31 +1045,31 @@ class account_voucher(osv.osv):
         :rtype: dict
         '''
         seq_obj = self.pool.get('ir.sequence')
-        voucher_brw = self.pool.get('account.voucher').browse(cr,uid,voucher_id,context)
-        if voucher_brw.number:
-            name = voucher_brw.number
-        elif voucher_brw.journal_id.sequence_id:
-            if not voucher_brw.journal_id.sequence_id.active:
+        voucher = self.pool.get('account.voucher').browse(cr,uid,voucher_id,context)
+        if voucher.number:
+            name = voucher.number
+        elif voucher.journal_id.sequence_id:
+            if not voucher.journal_id.sequence_id.active:
                 raise osv.except_osv(_('Configuration Error !'),
                     _('Please activate the sequence of selected journal !'))
             c = dict(context)
-            c.update({'fiscalyear_id': voucher_brw.period_id.fiscalyear_id.id})
-            name = seq_obj.next_by_id(cr, uid, voucher_brw.journal_id.sequence_id.id, context=c)
+            c.update({'fiscalyear_id': voucher.period_id.fiscalyear_id.id})
+            name = seq_obj.next_by_id(cr, uid, voucher.journal_id.sequence_id.id, context=c)
         else:
             raise osv.except_osv(_('Error!'),
                         _('Please define a sequence on the journal.'))
-        if not voucher_brw.reference:
+        if not voucher.reference:
             ref = name.replace('/','')
         else:
-            ref = voucher_brw.reference
+            ref = voucher.reference
 
         move = {
             'name': name,
-            'journal_id': voucher_brw.journal_id.id,
-            'narration': voucher_brw.narration,
-            'date': voucher_brw.date,
+            'journal_id': voucher.journal_id.id,
+            'narration': voucher.narration,
+            'date': voucher.date,
             'ref': ref,
-            'period_id': voucher_brw.period_id.id,
+            'period_id': voucher.period_id.id,
         }
         return move
 
@@ -1011,7 +1096,10 @@ class account_voucher(osv.osv):
                 raise osv.except_osv(_('Insufficient Configuration!'),_("You should configure the 'Gain Exchange Rate Account' in the accounting settings, to manage automatically the booking of accounting entries related to differences between exchange rates."))
         # Even if the amount_currency is never filled, we need to pass the foreign currency because otherwise
         # the receivable/payable account may have a secondary currency, which render this field mandatory
-        account_currency_id = company_currency <> current_currency and current_currency or False
+        if line.account_id.currency_id:
+            account_currency_id = line.account_id.currency_id.id
+        else:
+            account_currency_id = company_currency <> current_currency and current_currency or False
         move_line = {
             'journal_id': line.voucher_id.journal_id.id,
             'period_id': line.voucher_id.period_id.id,
@@ -1054,16 +1142,11 @@ class account_voucher(osv.osv):
         :return: the amount in the currency of the voucher's company
         :rtype: float
         '''
+        if context is None:
+            context = {}
         currency_obj = self.pool.get('res.currency')
         voucher = self.browse(cr, uid, voucher_id, context=context)
-        res = amount
-        if voucher.payment_rate_currency_id.id == voucher.company_id.currency_id.id:
-            # the rate specified on the voucher is for the company currency
-            res = currency_obj.round(cr, uid, voucher.company_id.currency_id, (amount * voucher.payment_rate))
-        else:
-            # the rate specified on the voucher is not relevant, we use all the rates in the system
-            res = currency_obj.compute(cr, uid, voucher.currency_id.id, voucher.company_id.currency_id.id, amount, context=context)
-        return res
+        return currency_obj.compute(cr, uid, voucher.currency_id.id, voucher.company_id.currency_id.id, amount, context=context)
 
     def voucher_move_line_create(self, cr, uid, voucher_id, line_total, move_id, company_currency, current_currency, context=None):
         '''
@@ -1087,39 +1170,45 @@ class account_voucher(osv.osv):
         tot_line = line_total
         rec_lst_ids = []
 
-        voucher_brw = self.pool.get('account.voucher').browse(cr, uid, voucher_id, context)
+        date = self.read(cr, uid, voucher_id, ['date'], context=context)['date']
         ctx = context.copy()
-        ctx.update({'date': voucher_brw.date})
+        ctx.update({'date': date})
+        voucher = self.pool.get('account.voucher').browse(cr, uid, voucher_id, context=ctx)
+        voucher_currency = voucher.journal_id.currency or voucher.company_id.currency_id
+        ctx.update({
+            'voucher_special_currency_rate': voucher_currency.rate * voucher.payment_rate ,
+            'voucher_special_currency': voucher.payment_rate_currency_id and voucher.payment_rate_currency_id.id or False,})
         prec = self.pool.get('decimal.precision').precision_get(cr, uid, 'Account')
-        for line in voucher_brw.line_ids:
+        for line in voucher.line_ids:
             #create one move line per voucher line where amount is not 0.0
             # AND (second part of the clause) only if the original move line was not having debit = credit = 0 (which is a legal value)
             if not line.amount and not (line.move_line_id and not float_compare(line.move_line_id.debit, line.move_line_id.credit, precision_rounding=prec) and not float_compare(line.move_line_id.debit, 0.0, precision_rounding=prec)):
                 continue
             # convert the amount set on the voucher line into the currency of the voucher's company
-            amount = self._convert_amount(cr, uid, line.untax_amount or line.amount, voucher_brw.id, context=ctx)
+            # this calls res_curreny.compute() with the right context, so that it will take either the rate on the voucher if it is relevant or will use the default behaviour
+            amount = self._convert_amount(cr, uid, line.untax_amount or line.amount, voucher.id, context=ctx)
             # if the amount encoded in voucher is equal to the amount unreconciled, we need to compute the
             # currency rate difference
             if line.amount == line.amount_unreconciled:
                 if not line.move_line_id:
                     raise osv.except_osv(_('Wrong voucher line'),_("The invoice you are willing to pay is not valid anymore."))
-                sign = voucher_brw.type in ('payment', 'purchase') and -1 or 1
+                sign = voucher.type in ('payment', 'purchase') and -1 or 1
                 currency_rate_difference = sign * (line.move_line_id.amount_residual - amount)
             else:
                 currency_rate_difference = 0.0
             move_line = {
-                'journal_id': voucher_brw.journal_id.id,
-                'period_id': voucher_brw.period_id.id,
+                'journal_id': voucher.journal_id.id,
+                'period_id': voucher.period_id.id,
                 'name': line.name or '/',
                 'account_id': line.account_id.id,
                 'move_id': move_id,
-                'partner_id': voucher_brw.partner_id.id,
+                'partner_id': voucher.partner_id.id,
                 'currency_id': line.move_line_id and (company_currency <> line.move_line_id.currency_id.id and line.move_line_id.currency_id.id) or False,
                 'analytic_account_id': line.account_analytic_id and line.account_analytic_id.id or False,
                 'quantity': 1,
                 'credit': 0.0,
                 'debit': 0.0,
-                'date': voucher_brw.date
+                'date': voucher.date
             }
             if amount < 0:
                 amount = -amount
@@ -1135,9 +1224,9 @@ class account_voucher(osv.osv):
                 tot_line -= amount
                 move_line['credit'] = amount
 
-            if voucher_brw.tax_id and voucher_brw.type in ('sale', 'purchase'):
+            if voucher.tax_id and voucher.type in ('sale', 'purchase'):
                 move_line.update({
-                    'account_tax_id': voucher_brw.tax_id.id,
+                    'account_tax_id': voucher.tax_id.id,
                 })
 
             if move_line.get('account_tax_id', False):
@@ -1149,7 +1238,6 @@ class account_voucher(osv.osv):
             foreign_currency_diff = 0.0
             amount_currency = False
             if line.move_line_id:
-                voucher_currency = voucher_brw.currency_id and voucher_brw.currency_id.id or voucher_brw.journal_id.company_id.currency_id.id
                 # We want to set it on the account move line as soon as the original line had a foreign currency
                 if line.move_line_id.currency_id and line.move_line_id.currency_id.id != company_currency:
                     # we compute the amount in that foreign currency.
@@ -1157,22 +1245,19 @@ class account_voucher(osv.osv):
                         # if the voucher and the voucher line share the same currency, there is no computation to do
                         sign = (move_line['debit'] - move_line['credit']) < 0 and -1 or 1
                         amount_currency = sign * (line.amount)
-                    elif line.move_line_id.currency_id.id == voucher_brw.payment_rate_currency_id.id:
-                        # if the rate is specified on the voucher, we must use it
-                        voucher_rate = currency_obj.browse(cr, uid, voucher_currency, context=ctx).rate
-                        amount_currency = (move_line['debit'] - move_line['credit']) * voucher_brw.payment_rate * voucher_rate
                     else:
-                        # otherwise we use the rates of the system (giving the voucher date in the context)
+                        # if the rate is specified on the voucher, it will be used thanks to the special keys in the context
+                        # otherwise we use the rates of the system
                         amount_currency = currency_obj.compute(cr, uid, company_currency, line.move_line_id.currency_id.id, move_line['debit']-move_line['credit'], context=ctx)
-                if line.amount == line.amount_unreconciled and line.move_line_id.currency_id.id == voucher_currency:
-                    sign = voucher_brw.type in ('payment', 'purchase') and -1 or 1
+                if line.amount == line.amount_unreconciled:
+                    sign = voucher.type in ('payment', 'purchase') and -1 or 1
                     foreign_currency_diff = sign * line.move_line_id.amount_residual_currency + amount_currency
 
             move_line['amount_currency'] = amount_currency
             voucher_line = move_line_obj.create(cr, uid, move_line)
             rec_ids = [voucher_line, line.move_line_id.id]
 
-            if not currency_obj.is_zero(cr, uid, voucher_brw.company_id.currency_id, currency_rate_difference):
+            if not currency_obj.is_zero(cr, uid, voucher.company_id.currency_id, currency_rate_difference):
                 # Change difference entry in company currency
                 exch_lines = self._get_exchange_lines(cr, uid, line, move_id, currency_rate_difference, company_currency, current_currency, context=context)
                 new_id = move_line_obj.create(cr, uid, exch_lines[0],context)
@@ -1219,32 +1304,32 @@ class account_voucher(osv.osv):
         currency_obj = self.pool.get('res.currency')
         move_line = {}
 
-        voucher_brw = self.pool.get('account.voucher').browse(cr,uid,voucher_id,context)
-        current_currency_obj = voucher_brw.currency_id or voucher_brw.journal_id.company_id.currency_id
+        voucher = self.pool.get('account.voucher').browse(cr,uid,voucher_id,context)
+        current_currency_obj = voucher.currency_id or voucher.journal_id.company_id.currency_id
 
         if not currency_obj.is_zero(cr, uid, current_currency_obj, line_total):
             diff = line_total
             account_id = False
             write_off_name = ''
-            if voucher_brw.payment_option == 'with_writeoff':
-                account_id = voucher_brw.writeoff_acc_id.id
-                write_off_name = voucher_brw.comment
-            elif voucher_brw.type in ('sale', 'receipt'):
-                account_id = voucher_brw.partner_id.property_account_receivable.id
+            if voucher.payment_option == 'with_writeoff':
+                account_id = voucher.writeoff_acc_id.id
+                write_off_name = voucher.comment
+            elif voucher.type in ('sale', 'receipt'):
+                account_id = voucher.partner_id.property_account_receivable.id
             else:
-                account_id = voucher_brw.partner_id.property_account_payable.id
-            sign = voucher_brw.type == 'payment' and -1 or 1
+                account_id = voucher.partner_id.property_account_payable.id
+            sign = voucher.type == 'payment' and -1 or 1
             move_line = {
                 'name': write_off_name or name,
                 'account_id': account_id,
                 'move_id': move_id,
-                'partner_id': voucher_brw.partner_id.id,
-                'date': voucher_brw.date,
+                'partner_id': voucher.partner_id.id,
+                'date': voucher.date,
                 'credit': diff > 0 and diff or 0.0,
                 'debit': diff < 0 and -diff or 0.0,
-                'amount_currency': company_currency <> current_currency and (sign * -1 * voucher_brw.writeoff_amount) or False,
+                'amount_currency': company_currency <> current_currency and (sign * -1 * voucher.writeoff_amount) or False,
                 'currency_id': company_currency <> current_currency and current_currency or False,
-                'analytic_account_id': voucher_brw.analytic_id and voucher_brw.analytic_id.id or False,
+                'analytic_account_id': voucher.analytic_id and voucher.analytic_id.id or False,
             }
 
         return move_line
@@ -1345,13 +1430,17 @@ class account_voucher_line(osv.osv):
     _order = "move_line_id"
 
     # If the payment is in the same currency than the invoice, we keep the same amount
-    # Otherwise, we compute from company currency to payment currency
+    # Otherwise, we compute from invoice currency to payment currency
     def _compute_balance(self, cr, uid, ids, name, args, context=None):
         currency_pool = self.pool.get('res.currency')
         rs_data = {}
         for line in self.browse(cr, uid, ids, context=context):
             ctx = context.copy()
             ctx.update({'date': line.voucher_id.date})
+            voucher_rate = self.pool.get('res.currency').read(cr, uid, line.voucher_id.currency_id.id, ['rate'], context=ctx)['rate']
+            ctx.update({
+                'voucher_special_currency': line.voucher_id.payment_rate_currency_id and line.voucher_id.payment_rate_currency_id.id or False,
+                'voucher_special_currency_rate': line.voucher_id.payment_rate * voucher_rate})
             res = {}
             company_currency = line.voucher_id.journal_id.company_id.currency_id.id
             voucher_currency = line.voucher_id.currency_id and line.voucher_id.currency_id.id or company_currency
@@ -1361,13 +1450,11 @@ class account_voucher_line(osv.osv):
                 res['amount_original'] = 0.0
                 res['amount_unreconciled'] = 0.0
             elif move_line.currency_id and voucher_currency==move_line.currency_id.id:
-                res['amount_original'] = currency_pool.compute(cr, uid, move_line.currency_id.id, voucher_currency, abs(move_line.amount_currency), context=ctx)
-                res['amount_unreconciled'] = currency_pool.compute(cr, uid, move_line.currency_id and move_line.currency_id.id or company_currency, voucher_currency, abs(move_line.amount_residual_currency), context=ctx)
-            elif move_line and move_line.credit > 0:
-                res['amount_original'] = currency_pool.compute(cr, uid, company_currency, voucher_currency, move_line.credit, context=ctx)
-                res['amount_unreconciled'] = currency_pool.compute(cr, uid, company_currency, voucher_currency, abs(move_line.amount_residual), context=ctx)
+                res['amount_original'] = abs(move_line.amount_currency)
+                res['amount_unreconciled'] = abs(move_line.amount_residual_currency)
             else:
-                res['amount_original'] = currency_pool.compute(cr, uid, company_currency, voucher_currency, move_line.debit, context=ctx)
+                #always use the amount booked in the company currency as the basis of the conversion into the voucher currency
+                res['amount_original'] = currency_pool.compute(cr, uid, company_currency, voucher_currency, move_line.credit or move_line.debit or 0.0, context=ctx)
                 res['amount_unreconciled'] = currency_pool.compute(cr, uid, company_currency, voucher_currency, abs(move_line.amount_residual), context=ctx)
 
             rs_data[line.id] = res
diff --git a/addons/account_voucher/html/account_illu_01.png b/addons/account_voucher/html/account_illu_01.png
new file mode 100644
index 00000000000..2e0dbf4aac2
Binary files /dev/null and b/addons/account_voucher/html/account_illu_01.png differ
diff --git a/addons/account_voucher/html/account_sc_00.png b/addons/account_voucher/html/account_sc_00.png
new file mode 100644
index 00000000000..63332b46575
Binary files /dev/null and b/addons/account_voucher/html/account_sc_00.png differ
diff --git a/addons/account_voucher/html/account_sc_02.png b/addons/account_voucher/html/account_sc_02.png
new file mode 100644
index 00000000000..709e444ba0d
Binary files /dev/null and b/addons/account_voucher/html/account_sc_02.png differ
diff --git a/addons/account_voucher/html/account_sc_03.png b/addons/account_voucher/html/account_sc_03.png
new file mode 100644
index 00000000000..a3e3afc34c0
Binary files /dev/null and b/addons/account_voucher/html/account_sc_03.png differ
diff --git a/addons/account_voucher/html/account_sc_04.png b/addons/account_voucher/html/account_sc_04.png
new file mode 100644
index 00000000000..458c8280c26
Binary files /dev/null and b/addons/account_voucher/html/account_sc_04.png differ
diff --git a/addons/account_voucher/html/account_sc_06.png b/addons/account_voucher/html/account_sc_06.png
new file mode 100644
index 00000000000..9605506c6a5
Binary files /dev/null and b/addons/account_voucher/html/account_sc_06.png differ
diff --git a/addons/account_voucher/html/bazile.png b/addons/account_voucher/html/bazile.png
new file mode 100644
index 00000000000..30f37e70b4a
Binary files /dev/null and b/addons/account_voucher/html/bazile.png differ
diff --git a/addons/account_voucher/html/index.html b/addons/account_voucher/html/index.html
new file mode 100644
index 00000000000..d59c110dde5
--- /dev/null
+++ b/addons/account_voucher/html/index.html
@@ -0,0 +1,140 @@
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan">Invoicing Made Easy</h2>
+        <h3 class="oe_slogan">Send professional invoices &amp; get paid online</h3>
+        <div class="oe_span6">
+            <div class="oe_demo oe_picture oe_screenshot">
+                <a href="https://www.openerp.com/saas_master/demo?lang=en_US&module=account">
+                    <img src="account_sc_00.png" alt="Online Demo">
+                </a>
+                <div class="oe_demo_footer oe_centeralign">Online Demo</div>
+            </div>
+        </div>
+        <div class="oe_span6">
+            <p class='oe_mt32'>
+                Create and send professional looking invoices &amp; get paid
+                online. It automatically integrates with other apps to bill
+                automatically based on your activities.
+            </p>
+            <div class="oe_centeralign oe_websiteonly">
+                <a href="http://www.openerp.com/start" class="oe_button oe_big oe_tacky">Start your <span class="oe_emph">free</span> trial</a>
+            </div>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container oe_dark">
+    <h2 class="oe_slogan">Send Invoices With No Effort</h2>
+    <div class="oe_row">
+        <div class="oe_span6">
+            <p class='oe_mt32'>
+                Send invoices directly to your clients in just a click. The
+                invoice is automatically attached to the email as a PDF file.
+            </p>
+        </div>
+        <div class="oe_span6">
+            <img class="oe_picture oe_screenshot" src="account_sc_03.png">
+        </div>
+    </div>
+</section>
+
+
+<section class="oe_container">
+    <h2 class="oe_slogan">Get Paid Faster</h2>
+    <h3 class="oe_slogan">Electronic invoicing and automated follow-ups</h3>
+    <div class="oe_row">
+        <div class="oe_span6">
+            <img class="oe_picture oe_screenshot" src="account_sc_02.png">
+        </div>
+        <div class="oe_span6">
+            <p class='oe_mt32'>
+Get paid online with paypal or other payment processing service. Get rid of
+the stress of having to constantly remind your debtors. Simply set-up and
+automate follow-ups to get paid quickly.
+            </p>
+        </div>
+    </div>
+</section>
+
+
+<section class="oe_container oe_dark">
+    <div class="oe_row">
+       <h2 class="oe_slogan">Connect Your Bank Accounts</h2>
+       <div class="oe_span6">
+            <p class='oe_mt32'>
+Import your bank statements and reconcile them in just a few clicks. Prepare
+payment orders based on your supplier invoices and payment terms.
+            </p>
+        </div>
+        <div class="oe_span6">
+            <img class="oe_picture" src="account_illu_01.png">
+        </div>
+
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row">
+        <h2 class="oe_slogan">Analyse Your Sales &amp; Costs</h2>
+        <div class="oe_span6">
+            <img class="oe_picture oe_screenshot" src="account_sc_06.png">
+        </div>
+        <div class="oe_span6">
+            <p class='oe_mt32'>
+Get direct access to key information with dynamic and customizable dashboards.
+Analyse your invoicing by product, customer, salesperson, etc.
+            </p>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container oe_dark">
+    <div class="oe_row">
+       <h2 class="oe_slogan">Integration With Other Apps</h2>
+       <div class="oe_span6">
+            <p class='oe_mt32'>
+Bill automatically based on sales orders, delivery orders, contracts or on time and
+material. Define recurrencies to produce recurring invoice automatically.
+            </p>
+        </div>
+        <div class="oe_span6">
+            <img class="oe_picture oe_screenshot" src="account_sc_04.png">
+        </div>
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row">
+        <div class="oe_span12">
+            <h2 class="oe_slogan">Many companies already enjoy it</h2>
+            <h3 class="oe_slogan">Hear what they have to say !</h3>
+        </div>
+        <div class="oe_span6">
+            <div class="oe_quote">
+                <q>
+                    OpenERP allowed us to automate sending 10.000 invoices per month.
+                </q>
+                <cite class="oe_cite oe_clearfix">
+                    <img class="oe_photo" src="bazile.png">
+                    <div class="oe_author">Yves Morel</div>
+                    <div class="oe_job">Director of <a href="http://www.bazile.fr" target="_blank">Bazile Telecom</a>.</div>
+                </cite>
+            </div>
+        </div>
+        <div class="oe_span6">
+            <div class="oe_quote">
+                <q>
+                    We have found invoicing module of OpenERP to be user
+                    friendly and highly customizable.
+                </q>
+                <cite class="oe_cite oe_clearfix">
+                    <img class="oe_photo" src="testimonial_sunil.jpg">
+                    <div class="oe_author">Col. Sunil Prem.</div>
+                    <div class="oe_job">Director of <a href="http://www.navyuginfo.com" target="_blank">Navyug Infosolutions Pvt. Ltd</a>.</div>
+                </cite>
+            </div>
+        </div>
+    </div>
+</section>
+<section class="oe_container oe_separator">
+</section>
diff --git a/addons/account_voucher/html/testimonial_sunil.jpg b/addons/account_voucher/html/testimonial_sunil.jpg
new file mode 100644
index 00000000000..f2ad6929a2b
Binary files /dev/null and b/addons/account_voucher/html/testimonial_sunil.jpg differ
diff --git a/addons/account_voucher/i18n/ru.po b/addons/account_voucher/i18n/ru.po
index 63cad344ed0..ef38a07e478 100644
--- a/addons/account_voucher/i18n/ru.po
+++ b/addons/account_voucher/i18n/ru.po
@@ -7,24 +7,24 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
-"PO-Revision-Date: 2012-05-10 17:46+0000\n"
+"PO-Revision-Date: 2013-05-29 13:17+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@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: 2013-03-16 05:33+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-05-30 05:45+0000\n"
+"X-Generator: Launchpad (build 16652)\n"
 
 #. module: account_voucher
 #: field:account.bank.statement.line,voucher_id:0
 msgid "Reconciliation"
-msgstr ""
+msgstr "Сверка"
 
 #. module: account_voucher
 #: model:ir.model,name:account_voucher.model_account_config_settings
 msgid "account.config.settings"
-msgstr ""
+msgstr "account.config.settings"
 
 #. module: account_voucher
 #: code:addons/account_voucher/account_voucher.py:369
@@ -45,7 +45,7 @@ msgstr "Общая сумма"
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Open Customer Journal Entries"
-msgstr ""
+msgstr "Открыть записи журнала по заказчику"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -63,7 +63,7 @@ msgstr ""
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "(Update)"
-msgstr ""
+msgstr "(Обновить)"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -90,7 +90,7 @@ msgstr "Март"
 #. module: account_voucher
 #: field:account.voucher,message_unread:0
 msgid "Unread Messages"
-msgstr ""
+msgstr "Непрочитанные"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -115,13 +115,13 @@ msgstr "Номер транзакции."
 #. module: account_voucher
 #: view:sale.receipt.report:0
 msgid "Group by year of Invoice Date"
-msgstr ""
+msgstr "Группировать по году в дате счета"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
 #: field:sale.receipt.report,user_id:0
 msgid "Salesperson"
-msgstr ""
+msgstr "Продавец"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -135,6 +135,8 @@ msgid ""
 "You can not change the journal as you already reconciled some statement "
 "lines!"
 msgstr ""
+"Вы не можете изменить журнал, так как вы уже сверили некоторые позиции "
+"документа!"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -145,7 +147,7 @@ msgstr "Утвердить"
 #: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
 #: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
 msgid "Supplier Payments"
-msgstr ""
+msgstr "Оплаты поставщикам"
 
 #. module: account_voucher
 #: model:ir.actions.act_window,help:account_voucher.action_purchase_receipt
@@ -167,7 +169,7 @@ msgstr "Искать ваучеры"
 #. module: account_voucher
 #: field:account.voucher,writeoff_acc_id:0
 msgid "Counterpart Account"
-msgstr ""
+msgstr "Корреспондирующий счет"
 
 #. module: account_voucher
 #: field:account.voucher,account_id:0
@@ -189,7 +191,7 @@ msgstr "OK"
 #. module: account_voucher
 #: field:account.voucher.line,reconcile:0
 msgid "Full Reconcile"
-msgstr ""
+msgstr "Полная сверка"
 
 #. module: account_voucher
 #: field:account.voucher,date_due:0
@@ -207,7 +209,7 @@ msgstr "Примечания"
 #. module: account_voucher
 #: field:account.voucher,message_ids:0
 msgid "Messages"
-msgstr ""
+msgstr "Сообщения"
 
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
@@ -225,7 +227,7 @@ msgstr "Элемент журнала"
 #: code:addons/account_voucher/account_voucher.py:981
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Ошибка!"
 
 #. module: account_voucher
 #: field:account.voucher.line,amount:0
@@ -235,7 +237,7 @@ msgstr "Суммма"
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Payment Options"
-msgstr ""
+msgstr "Варианты оплаты"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -254,6 +256,8 @@ msgstr "Отменено"
 msgid ""
 "You have to configure account base code and account tax code on the '%s' tax!"
 msgstr ""
+"Вы должны настроить код базового счета и код налогового счета для налога "
+"'%s'!"
 
 #. module: account_voucher
 #: model:ir.actions.act_window,help:account_voucher.action_sale_receipt
@@ -271,7 +275,7 @@ msgstr ""
 #. module: account_voucher
 #: help:account.voucher,message_unread:0
 msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "Если отмечено, новые сообщения требуют вашего внимания."
 
 #. module: account_voucher
 #: model:ir.model,name:account_voucher.model_account_bank_statement_line
@@ -294,12 +298,12 @@ msgstr "Налог"
 #: code:addons/account_voucher/account_voucher.py:879
 #, python-format
 msgid "Invalid Action!"
-msgstr ""
+msgstr "Неверное действие!"
 
 #. module: account_voucher
 #: field:account.voucher,comment:0
 msgid "Counterpart Comment"
-msgstr ""
+msgstr "Корреспондирующий коментарий"
 
 #. module: account_voucher
 #: field:account.voucher.line,account_analytic_id:0
@@ -312,6 +316,8 @@ msgid ""
 "Holds the Chatter summary (number of messages, ...). This summary is "
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
+"Содержит сводку по Чаттеру (количество сообщений,...). Эта сводка в формате "
+"html для возможности использования в канбан виде"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -326,7 +332,7 @@ msgstr "Информация о платеже"
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "(update)"
-msgstr ""
+msgstr "(обновить)"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -395,7 +401,7 @@ msgstr "Ваучер поставщика"
 #. module: account_voucher
 #: field:account.voucher,message_follower_ids:0
 msgid "Followers"
-msgstr ""
+msgstr "Подписчики"
 
 #. module: account_voucher
 #: selection:account.voucher.line,type:0
@@ -406,7 +412,7 @@ msgstr "Дебет"
 #: code:addons/account_voucher/account_voucher.py:1547
 #, python-format
 msgid "Unable to change journal !"
-msgstr ""
+msgstr "Невозможно изменить журнал!"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
@@ -446,7 +452,7 @@ msgstr ""
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Open Supplier Journal Entries"
-msgstr ""
+msgstr "Открыть журнал проводок по поставщику"
 
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_review_voucher_list
@@ -461,7 +467,7 @@ msgstr "Памятка"
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Are you sure to unreconcile and cancel this record ?"
-msgstr ""
+msgstr "Вы уверены, что надо отменить сверку и саму запись ?"
 
 #. module: account_voucher
 #: field:account.voucher,is_multi_currency:0
@@ -494,13 +500,13 @@ msgstr ""
 #. module: account_voucher
 #: field:account.voucher,writeoff_amount:0
 msgid "Difference Amount"
-msgstr ""
+msgstr "Сумма разницы"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
 #: field:sale.receipt.report,due_delay:0
 msgid "Avg. Due Delay"
-msgstr ""
+msgstr "Средн. задержка"
 
 #. module: account_voucher
 #: code:addons/account_voucher/invoice.py:34
@@ -554,7 +560,7 @@ msgstr "Оплаченная сумма"
 #. module: account_voucher
 #: field:account.voucher,payment_option:0
 msgid "Payment Difference"
-msgstr ""
+msgstr "Оплата разницы"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -568,7 +574,7 @@ msgstr "Для проверки"
 #: code:addons/account_voucher/account_voucher.py:1194
 #, python-format
 msgid "change"
-msgstr ""
+msgstr "изменить"
 
 #. module: account_voucher
 #: code:addons/account_voucher/account_voucher.py:1014
@@ -599,7 +605,7 @@ msgstr ""
 #. module: account_voucher
 #: view:account.invoice:0
 msgid "Register Payment"
-msgstr ""
+msgstr "Регистрация оплаты"
 
 #. module: account_voucher
 #: field:account.statement.from.invoice.lines,line_ids:0
@@ -614,7 +620,7 @@ msgstr "декабрём"
 #. module: account_voucher
 #: view:sale.receipt.report:0
 msgid "Group by month of Invoice Date"
-msgstr ""
+msgstr "Группировать по месяцу даты счета"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
@@ -647,7 +653,7 @@ msgstr ""
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Are you sure to unreconcile this record?"
-msgstr ""
+msgstr "Вы уверены в отмене сверки"
 
 #. module: account_voucher
 #: field:account.voucher,company_id:0
@@ -665,13 +671,13 @@ msgstr ""
 #. module: account_voucher
 #: selection:account.voucher,payment_option:0
 msgid "Reconcile Payment Balance"
-msgstr ""
+msgstr "Сверка платежного баланса"
 
 #. module: account_voucher
 #: code:addons/account_voucher/account_voucher.py:975
 #, python-format
 msgid "Configuration Error !"
-msgstr ""
+msgstr "Ошибка конфигурации !"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -695,18 +701,18 @@ msgstr ""
 #: field:account.voucher,state:0
 #: view:sale.receipt.report:0
 msgid "Status"
-msgstr ""
+msgstr "Статус"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Allocation"
-msgstr ""
+msgstr "Распределение"
 
 #. module: account_voucher
 #: view:account.statement.from.invoice.lines:0
 #: view:account.voucher:0
 msgid "or"
-msgstr ""
+msgstr "или"
 
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
@@ -716,7 +722,7 @@ msgstr "Август"
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Validate Payment"
-msgstr ""
+msgstr "Утвердить оплату"
 
 #. module: account_voucher
 #: help:account.voucher,audit:0
@@ -724,6 +730,8 @@ msgid ""
 "Check this box if you are unsure of that journal entry and if you want to "
 "note it as 'to be reviewed' by an accounting expert."
 msgstr ""
+"Отметьте, если вы не уверены в этой проводке журнала и хотите отметить её "
+"\"для проверки\" опытному бухгалтеру."
 
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
@@ -734,7 +742,7 @@ msgstr "Октябрь"
 #: code:addons/account_voucher/account_voucher.py:976
 #, python-format
 msgid "Please activate the sequence of selected journal !"
-msgstr ""
+msgstr "Пожалуйста, включите нумерацию выбранного журнала!"
 
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
@@ -749,7 +757,7 @@ msgstr ""
 #. module: account_voucher
 #: field:account.voucher,paid:0
 msgid "Paid"
-msgstr ""
+msgstr "Оплачено"
 
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_sale_receipt
@@ -760,7 +768,7 @@ msgstr ""
 #. module: account_voucher
 #: field:account.voucher,message_is_follower:0
 msgid "Is a Follower"
-msgstr ""
+msgstr "Подписан"
 
 #. module: account_voucher
 #: field:account.voucher,analytic_id:0
@@ -787,7 +795,7 @@ msgstr "Расширенные фильтры..."
 #. module: account_voucher
 #: field:account.voucher,paid_amount_in_company_currency:0
 msgid "Paid Amount in Company Currency"
-msgstr ""
+msgstr "Оплаченная сумма в валюте компании"
 
 #. module: account_voucher
 #: field:account.bank.statement.line,amount_reconciled:0
@@ -814,7 +822,7 @@ msgstr "Предыдущие платежи ?"
 #: code:addons/account_voucher/account_voucher.py:1112
 #, python-format
 msgid "The invoice you are willing to pay is not valid anymore."
-msgstr ""
+msgstr "Счет, который вы готовы платить, уже не актуален ."
 
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
@@ -830,30 +838,30 @@ msgstr "Журнал ваучеров"
 #. module: account_voucher
 #: model:ir.model,name:account_voucher.model_res_company
 msgid "Companies"
-msgstr ""
+msgstr "Компании"
 
 #. module: account_voucher
 #: field:account.voucher,message_summary:0
 msgid "Summary"
-msgstr ""
+msgstr "Итог"
 
 #. module: account_voucher
 #: field:account.voucher,active:0
 msgid "Active"
-msgstr ""
+msgstr "Активно"
 
 #. module: account_voucher
 #: code:addons/account_voucher/account_voucher.py:982
 #, python-format
 msgid "Please define a sequence on the journal."
-msgstr ""
+msgstr "Пожалуйста, определите нумерацию журнала."
 
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.act_pay_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_vendor_receipt
 #: model:ir.ui.menu,name:account_voucher.menu_action_vendor_receipt
 msgid "Customer Payments"
-msgstr ""
+msgstr "Платежи клиентов"
 
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_sale_receipt_report_all
@@ -865,7 +873,7 @@ msgstr ""
 #. module: account_voucher
 #: view:sale.receipt.report:0
 msgid "Group by Invoice Date"
-msgstr ""
+msgstr "Группировать по дате счета"
 
 #. module: account_voucher
 #: view:account.voucher:0
diff --git a/addons/account_voucher/invoice.py b/addons/account_voucher/invoice.py
index 03a3e5fab67..c11f9d532e9 100644
--- a/addons/account_voucher/invoice.py
+++ b/addons/account_voucher/invoice.py
@@ -41,6 +41,7 @@ class invoice(osv.osv):
             'target': 'new',
             'domain': '[]',
             'context': {
+                'payment_expected_currency': inv.currency_id.id,
                 'default_partner_id': self.pool.get('res.partner')._find_accounting_partner(inv.partner_id).id,
                 'default_amount': inv.type in ('out_refund', 'in_refund') and -inv.residual or inv.residual,
                 'default_reference': inv.name,
diff --git a/addons/account_voucher/security/account_voucher_security.xml b/addons/account_voucher/security/account_voucher_security.xml
index 04540fd8aa0..daa5934b256 100644
--- a/addons/account_voucher/security/account_voucher_security.xml
+++ b/addons/account_voucher/security/account_voucher_security.xml
@@ -3,13 +3,13 @@
     <data noupdate="1">
         <record id="voucher_comp_rule" model="ir.rule">
             <field name="name">Voucher multi-company</field>
-            <field model="ir.model" name="model_id" ref="model_account_voucher"/>
+            <field name="model_id" ref="model_account_voucher"/>
             <field eval="True" name="global"/>
             <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
         </record>
         <record id="voucher_line_comp_rule" model="ir.rule">
             <field name="name">Voucher Line multi-company</field>
-            <field model="ir.model" name="model_id" ref="model_account_voucher_line"/>
+            <field name="model_id" ref="model_account_voucher_line"/>
             <field eval="True" name="global"/>
             <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
         </record>
diff --git a/addons/account_voucher/test/account_voucher.yml b/addons/account_voucher/test/account_voucher.yml
index e2df6b8597f..46d3a6a0f5b 100644
--- a/addons/account_voucher/test/account_voucher.yml
+++ b/addons/account_voucher/test/account_voucher.yml
@@ -12,7 +12,7 @@
     account_id: account.cash
     amount: 1000.0
     company_id: base.main_company
-    journal_id: account.bank_journal
+    journal_id: account.sales_journal
     name: Voucher for Axelor
     narration: Basic Pc
     line_cr_ids:
diff --git a/addons/account_voucher/test/case1_usd_usd_payment_rate.yml b/addons/account_voucher/test/case1_usd_usd_payment_rate.yml
new file mode 100644
index 00000000000..037fc1497ec
--- /dev/null
+++ b/addons/account_voucher/test/case1_usd_usd_payment_rate.yml
@@ -0,0 +1,247 @@
+-
+  In order to check the Account_voucher module with multi-currency in OpenERP, 
+  I create 2 Invoices in USD and make 1 Payment in USD based on the currency rating given by the bank which is slightly different that the one encoded in OpenERP
+-
+  I set the income and expense currency accounts on the main company
+-
+  !python {model: res.company}: |
+    from datetime import datetime
+    vals = {
+      'income_currency_exchange_account_id': ref('account.o_expense'),
+      'expense_currency_exchange_account_id': ref('account.o_expense')}
+    self.write(cr, uid, ref('base.main_company'), vals)
+-
+  I create currency USD in OpenERP for January of 1.333333 Rate
+-
+  !python {model: res.currency.rate}: |
+    from datetime import datetime
+    curr_id = self.pool.get('res.currency').search(cr, uid, [('name', '=', 'USD')])[0]
+    date = '%s-01-01' %(datetime.now().year)
+    ids = self.search(cr, uid, [('currency_id','=',curr_id), ('name', '=', date)])
+    self.write(cr, uid, ids, {'rate': 1.333333})
+-
+  I create currency USD in OpenERP for February of 1.250000 Rate
+-
+  !record {model: res.currency.rate, id: feb_usd}:
+    currency_id: base.USD
+    name: !eval "'%s-02-01' %(datetime.now().year)"
+    rate: 1.250000
+
+-
+  I create currency USD in OpenERP for March of 1.111111 Rate
+-
+  !record {model: res.currency.rate, id: mar_usd}:
+    currency_id: base.USD
+    name: !eval "'%s-03-01' %(datetime.now().year)"
+    rate: 1.111111
+
+-
+  I create currency USD in OpenERP for April of 1.052632 Rate
+-
+  !record {model: res.currency.rate, id: apr_usd}:
+    currency_id: base.USD
+    name: !eval "'%s-04-01' %(datetime.now().year)"
+    rate: 1.052632
+
+-
+  I create a cash account with currency USD
+-
+  !record {model: account.account, id: account_cash_usd_id}:
+    currency_id: base.USD
+    name: "cash account in usd"
+    code: "Xcash usd"
+    type: 'liquidity'
+    user_type: "account.data_account_type_cash"
+
+-
+  I create a bank journal with USD as currency
+-
+  !record {model: account.journal, id: bank_journal_USD}:
+    name: Bank Journal(USD)
+    code: BUSD
+    type: bank
+    analytic_journal_id: account.sit
+    sequence_id: account.sequence_bank_journal
+    default_debit_account_id: account_cash_usd_id
+    default_credit_account_id: account_cash_usd_id
+    currency: base.USD
+    company_id: base.main_company
+
+-
+  I create a new partner Kate Mc Kay
+-
+  !record {model: res.partner, id: res_partner_mc_kay}:
+    name: "Mc Kay Kate"
+    property_account_receivable: account.a_recv
+    property_account_payable: account.a_pay
+-
+  I create the first invoice on 1st January  for 200 USD
+-
+  !record {model: account.invoice, id: account_invoice_jan_payment_rate}:
+    account_id: account.a_recv
+    company_id: base.main_company
+    currency_id: base.USD
+    date_invoice: !eval "'%s-01-01' %(datetime.now().year)"
+    period_id: account.period_1
+    invoice_line:
+      - account_id: account.a_sale
+        name: '[PCSC234] PC Assemble SC234'
+        price_unit: 200.0
+        quantity: 1.0
+        product_id: product.product_product_3
+        uos_id: product.product_uom_unit
+    journal_id: account.sales_journal
+    partner_id: res_partner_mc_kay
+    reference_type: none
+-
+  I Validate invoice by clicking on Validate button
+-
+  !workflow {model: account.invoice, action: invoice_open, ref: account_invoice_jan_payment_rate}
+-
+  I check that first invoice move is correct for debtor account (debit - credit == 150.0)
+-
+  !python {model: account.invoice}: |
+    invoice_id = self.browse(cr, uid, ref("account_invoice_jan_payment_rate"))
+    assert invoice_id.move_id, "Move not created for open invoice"
+    move_line_obj = self.pool.get('account.move.line')
+    move_lines = move_line_obj.search(cr, uid, [('move_id', '=', invoice_id.move_id.id), ('account_id', '=', invoice_id.account_id.id)])
+    move_line = move_line_obj.browse(cr, uid, move_lines[0])
+    assert (move_line.debit - move_line.credit == 150.0), "Invoice move is not correct for debtors account"
+-
+  I create the second invoice on 1st February for 100 USD
+-
+  !record {model: account.invoice, id: account_invoice_feb_payment_rate}:
+    account_id: account.a_recv
+    company_id: base.main_company
+    currency_id: base.USD
+    date_invoice: !eval "'%s-02-01' %(datetime.now().year)"
+    period_id: account.period_2
+    invoice_line:
+      - account_id: account.a_sale
+        name: '[PCSC234] PC Assemble SC234'
+        price_unit: 100.0
+        quantity: 1.0
+        product_id: product.product_product_3
+        uos_id: product.product_uom_unit
+    journal_id: account.sales_journal
+    partner_id: res_partner_mc_kay
+    reference_type: none
+-
+  I Validate invoice by clicking on Validate button
+-
+  !workflow {model: account.invoice, action: invoice_open, ref: account_invoice_feb_payment_rate}
+-
+  I check that second invoice move is correct for debtor account (debit - credit == 80)
+-
+  !python {model: account.invoice}: |
+    invoice_id = self.browse(cr, uid, ref("account_invoice_feb_payment_rate"))
+    assert invoice_id.move_id, "Move not created for open invoice"
+    move_line_obj = self.pool.get('account.move.line')
+    move_lines = move_line_obj.search(cr, uid, [('move_id', '=', invoice_id.move_id.id), ('account_id', '=', invoice_id.account_id.id)])
+    move_line = move_line_obj.browse(cr, uid, move_lines[0])
+    assert (move_line.debit - move_line.credit == 80), "Invoice move is not correct for debtors account"
+
+-
+  I set the context that will be used for the encoding of all the vouchers of this file
+-
+  !context
+    'type': 'receipt'
+-
+  On the first March, I create the first voucher of payment with values 240 USD, journal USD, and specifying that $1 = 0.8€
+-
+  !record {model: account.voucher, id: account_voucher_1_case1_payment_rate, view: view_vendor_receipt_form}:
+    account_id: account.cash
+    amount: 240.0
+    company_id: base.main_company
+    journal_id: bank_journal_USD
+    name: 'Payment: Case 1 USD/USD payment rate'
+    partner_id: res_partner_mc_kay
+    period_id: account.period_3
+    date: !eval time.strftime("%Y-03-01")
+    payment_option: 'with_writeoff'
+    writeoff_acc_id: account.a_expense
+    comment: 'Write Off'
+    payment_rate: 0.8
+    payment_rate_currency_id: base.EUR
+
+-
+  I fill amounts 180 for the invoice of 200$ and 70 for the invoice of 100$>
+-
+  !python {model: account.voucher}: |
+    vals = {}
+    voucher_id = self.browse(cr, uid, ref('account_voucher_1_case1_payment_rate'))
+    data = []
+    for item in voucher_id.line_cr_ids:
+        if item.amount_unreconciled == 200.00:
+            data += [(item.id, 180.0)]
+        else:
+            data += [(item.id, 70.0)]
+    for line_id, amount in data:
+        self.pool.get('account.voucher.line').write(cr, uid, [line_id], {'amount': amount})
+    assert (voucher_id.state=='draft'), "Voucher is not in draft state"
+-
+  I check that writeoff amount computed is -10.0
+-
+  !python {model: account.voucher}: |
+    voucher = ref('account_voucher_1_case1_payment_rate') 
+    voucher_id = self.browse(cr, uid, voucher)
+    assert (voucher_id.writeoff_amount == -10.0), "Writeoff amount is not -10.0"
+-
+  I confirm the voucher
+-
+  !python {model: account.voucher}: |
+    voucher = ref('account_voucher_1_case1_payment_rate') 
+    self.signal_proforma_voucher(cr, uid, [voucher])
+-
+  I check that the move of my first voucher is valid
+-
+  !python {model: account.voucher}: |
+    voucher = ref('account_voucher_1_case1_payment_rate') 
+    voucher_id = self.browse(cr, uid, voucher)
+    move_line_obj = self.pool.get('account.move.line')
+    move_lines = move_line_obj.search(cr, uid, [('move_id', '=', voucher_id.move_id.id)])
+    for move_line in move_line_obj.browse(cr, uid, move_lines):
+        assert move_line.state == 'valid', "Voucher move is not valid"
+-
+  I check that my debtor account is correct
+-
+  I check that the debtor account has 2 new lines with -180 and -70 as amount_currency columns and that their credit columns are respectively 144 and 56
+-
+  I check that my write-off is correct. 8 debit and 10 amount_currency
+-
+  !python {model: account.voucher}: |
+    voucher = ref('account_voucher_1_case1_payment_rate') 
+    voucher_id = self.browse(cr, uid, voucher)
+    move_line_obj = self.pool.get('account.move.line')
+    move_lines = move_line_obj.search(cr, uid, [('move_id', '=', voucher_id.move_id.id)])
+    for move_line in move_line_obj.browse(cr, uid, move_lines):
+        if move_line.amount_currency == -180.00:
+            assert move_line.credit == 144.00, "Debtor account has wrong entry."
+        elif move_line.amount_currency == -70.00:
+            assert move_line.credit == 56.00, "Debtor account has wrong entry."
+        elif move_line.amount_currency == 10.00:
+            assert move_line.debit == 8.00, "Writeoff amount is wrong: Got a debit of %s (expected 8,00€)" % (move_line.debit)
+        elif move_line.amount_currency == 240.00:
+            assert move_line.debit == 192.00, "Bank entry is wrong."
+        else:
+            assert False, "Unrecognized journal entry"
+-
+  I check the residual amount of Invoice1, should be 20 in amount_currency and 6 in amount_residual
+-
+  !python {model: account.invoice}: |
+    invoice_id = self.browse(cr, uid, ref("account_invoice_jan_payment_rate"))
+    move_line_obj = self.pool.get('account.move.line')
+    move_lines = move_line_obj.search(cr, uid, [('move_id', '=', invoice_id.move_id.id), ('invoice', '=', invoice_id.id), ('account_id', '=', invoice_id.account_id.id)])
+    move_line = move_line_obj.browse(cr, uid, move_lines[0])
+    assert (move_line.amount_residual == 6.0) , "Residual amount is not correct for first Invoice"
+    assert (move_line.amount_residual_currency == 20.0) , "Residual amount in currency is not correct for first Invoice"
+-
+  I check the residual amuont of Invoice2, should be 30 in residual currency and 24 in amount_residual
+-
+  !python {model: account.invoice}: |
+    invoice_id = self.browse(cr, uid, ref("account_invoice_feb_payment_rate"))
+    move_line_obj = self.pool.get('account.move.line')
+    move_lines = move_line_obj.search(cr, uid, [('move_id', '=', invoice_id.move_id.id), ('invoice', '=', invoice_id.id), ('account_id', '=', invoice_id.account_id.id)])
+    move_line = move_line_obj.browse(cr, uid, move_lines[0])
+    assert (move_line.amount_residual == 24.0) , "Residual amount is not correct for second Invoice"
+    assert (move_line.amount_residual_currency == 30.0) , "Residual amount in currency is not correct for second Invoice"
diff --git a/addons/account_voucher/test/case2_usd_eur_debtor_in_eur.yml b/addons/account_voucher/test/case2_usd_eur_debtor_in_eur.yml
index 02dd82f5c14..f523e312933 100644
--- a/addons/account_voucher/test/case2_usd_eur_debtor_in_eur.yml
+++ b/addons/account_voucher/test/case2_usd_eur_debtor_in_eur.yml
@@ -201,7 +201,7 @@
     move_line_obj = self.pool.get('account.move.line')
     move_lines = move_line_obj.search(cr, uid, [('move_id', '=', invoice_id.move_id.id), ('invoice', '=', invoice_id.id), ('account_id', '=', invoice_id.account_id.id)])
     move_line = move_line_obj.browse(cr, uid, move_lines[0])
-    assert (move_line.amount_residual_currency == 55.56 and move_line.amount_residual == 20) , "Residual amount is not correct for first Invoice"
+    assert (move_line.amount_residual_currency == 55.56 and move_line.amount_residual == 20) , "Residual amount is not correct for first Invoice. Got %s USD (%s EUR)" %(move_line.amount_residual_currency, move_line.amount_residual)
 -
   I check the residual amuont of Invoice2, should be 22.22 in residual currency and 10 in amount_residual
 -
diff --git a/addons/account_voucher/test/case4_cad_chf.yml b/addons/account_voucher/test/case4_cad_chf.yml
index a0ef13d96aa..90c36e371bf 100644
--- a/addons/account_voucher/test/case4_cad_chf.yml
+++ b/addons/account_voucher/test/case4_cad_chf.yml
@@ -161,7 +161,7 @@
 -
   I check that the debtor account has 1 new line with -298.78 as amount_currency columns and 149.39 of credit and currency is CAD.
 -
-  I check that my currency rate difference is correct. 0 in debit with no amount_currency
+  I check that my currency rate difference is correct. 0 in debit with 98.78 CAD as amount_currency
 -
   I check that my writeoff is correct. 11.05 credit and -13.26 amount_currency
 -
@@ -176,7 +176,8 @@
         elif move_line.amount_currency == -298.78:
             assert move_line.credit == 149.39, "Debtor account has wrong entry."
         elif move_line.debit == 0.00 and move_line.credit == 0.00:
-            assert move_line.amount_currency == 0.00, "Incorrect Currency Difference."
+            assert move_line.amount_currency == 98.78, "Incorrect Currency Difference, got %s as amount_currency (expected 98.78)." % (move_line.amount_currency)
+            assert move_line.currency_id.id == ref('base.CAD'), "Incorrect Currency Difference, got %s (expected 'CAD')" % (move_line.currency_id.name)
         elif move_line.credit == 10.61:
             assert move_line.amount_currency == -13.26, "Writeoff amount is wrong."
         else:
diff --git a/addons/account_voucher/test/case_eur_usd.yml b/addons/account_voucher/test/case_eur_usd.yml
index 23a35d8ad24..825fae1d1af 100644
--- a/addons/account_voucher/test/case_eur_usd.yml
+++ b/addons/account_voucher/test/case_eur_usd.yml
@@ -46,7 +46,7 @@
     currency: base.USD
     company_id: base.main_company
 -
-  I create an invoice 
+  On the first of January, I create an invoice of 1000€
 -
   !record {model: account.invoice, id: account_invoice_eur_usd}:
     account_id: account.a_recv
@@ -84,7 +84,7 @@
   !context
     'type': 'receipt'
 -
-  I create the voucher of payment with values 1350 USD, journal USD,
+  On the first of February, I create the voucher of payment with values 1350 USD, journal USD,
 -
   !record {model: account.voucher, id: account_voucher_eur_usd_case, view: view_vendor_receipt_form}:
     account_id: account.cash
diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index 109c2f9aec9..dea94d59f4e 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -46,6 +46,9 @@
                 </search>
             </field>
         </record>
+
+        <!-- TODO: merge the 3 voucher form views of this file into a single view -->
+        <!-- Low priority view... If we open a voucher from a m2o, for example. -->
         <record model="ir.ui.view" id="view_low_priority_payment_form">
             <field name="name">account.voucher.payment.low.priority.form</field>
             <field name="model">account.voucher</field>
@@ -107,7 +110,7 @@
                                 </group>
                                 <group string="Other Information" col="4">
                                     <field name="currency_id" colspan="4" groups="base.group_multi_currency"/>
-                                    <field name="payment_rate" required="1" on_change="onchange_rate(payment_rate, amount, currency_id, payment_rate_currency_id, company_id, context)" colspan="3"/>
+                                    <field name="payment_rate" required="1" colspan="3" on_change="onchange_amount(amount, payment_rate, partner_id, journal_id, currency_id, type, date, payment_rate_currency_id, company_id, context)"/>
                                     <field name="payment_rate_currency_id" colspan="1" nolabel="1" on_change="onchange_payment_rate_currency(currency_id, payment_rate, payment_rate_currency_id, date, amount, company_id, context)" groups="base.group_multi_currency"/>
                                     <field name="paid_amount_in_company_currency" colspan="4" invisible="1"/>
                                     <field name="number" colspan="4"/>
@@ -119,6 +122,7 @@
             </field>
         </record>
 
+        <!-- Supplier Payment -->
         <record model="ir.ui.view" id="view_vendor_payment_form">
             <field name="name">account.voucher.payment.form</field>
             <field name="model">account.voucher</field>
@@ -157,7 +161,7 @@
                     <notebook>
                         <page string="Payment Information">
                         	<label for="line_dr_ids"/>
-                            <field name="line_dr_ids" context="{'journal_id':journal_id, 'type':type, 'partner_id':partner_id}">
+                            <field name="line_dr_ids" context="{'journal_id':journal_id, 'type':type, 'partner_id':partner_id}" on_change="onchange_line_ids(line_dr_ids, line_cr_ids, amount, currency_id, type, context)">
                                 <tree string="Supplier Invoices and Outstanding transactions" editable="bottom" colors="gray:amount==0">
                                     <field name="move_line_id" context="{'journal_id':parent.journal_id, 'partner_id':parent.partner_id}"
                                         on_change="onchange_move_line_id(move_line_id)"
@@ -173,7 +177,7 @@
                                 </tree>
                             </field>
                             <label for="line_cr_ids" attrs="{'invisible': [('pre_line','=',False)]}"/>
-                            <field name="line_cr_ids" attrs="{'invisible': [('pre_line','=',False)]}" context="{'journal_id':journal_id, 'partner_id':partner_id}">
+                            <field name="line_cr_ids" attrs="{'invisible': [('pre_line','=',False)]}" context="{'journal_id':journal_id, 'partner_id':partner_id}" on_change="onchange_line_ids(line_dr_ids, line_cr_ids, amount, currency_id, type, context)">
                                 <tree string="Credits" editable="bottom" colors="gray:amount==0">
                                     <field name="move_line_id" context="{'journal_id':parent.journal_id, 'partner_id':parent.partner_id}"
                                         on_change="onchange_move_line_id(move_line_id)"
@@ -193,12 +197,16 @@
                                     <field name="narration" colspan="2" nolabel="1"/>
                                 </group>
                                 <group>
-                                    <group col="4" attrs="{'invisible':[('currency_id','=',False),('is_multi_currency','=',False)]}">
-                                        <separator string="Currency Options" colspan="4"/>
+                                    <group col="2" attrs="{'invisible':[('is_multi_currency','=',False)]}">
+                                        <separator string="Currency Options" colspan="2"/>
                                         <field name="is_multi_currency" invisible="1"/>
-                                        <field name="payment_rate" required="1" on_change="onchange_rate(payment_rate, amount, currency_id, payment_rate_currency_id, company_id, context)" colspan="3"/>
-                                        <field name="payment_rate_currency_id" colspan="1" nolabel="1" on_change="onchange_payment_rate_currency(currency_id, payment_rate, payment_rate_currency_id, date, amount, company_id, context)" groups="base.group_multi_currency"/>
-                                        <field name="paid_amount_in_company_currency" colspan="4" invisible="1"/>
+					<label for="payment_rate" colspan="1"/>
+					<div>
+                                            <field name="payment_rate" required="1" class="oe_inline" on_change="onchange_amount(amount, payment_rate, partner_id, journal_id, currency_id, type, date, payment_rate_currency_id, company_id, context)"/>
+                                            <field name="payment_rate_currency_id" class="oe_inline" on_change="onchange_payment_rate_currency(currency_id, payment_rate, payment_rate_currency_id, date, amount, company_id, context)" groups="base.group_multi_currency"/>
+                                        </div>
+                                        <field name="currency_help_label" colspan="2" nolabel="1" class="oe_grey"/>
+                                        <field name="paid_amount_in_company_currency" colspan="2" invisible="1"/>
                                     </group>
                                     <group col="2">
                                         <separator string="Payment Options" colspan="2"/>
@@ -282,6 +290,7 @@
         <menuitem action="action_vendor_payment" icon="STOCK_JUSTIFY_FILL" sequence="12"
             id="menu_action_vendor_payment"  parent="account.menu_finance_payables"/>
 
+        <!-- Register Payment Form (old Pay Invoice wizard) -->
         <record model="ir.ui.view" id="view_vendor_receipt_dialog_form">
             <field name="name">account.voucher.receipt.dialog.form</field>
             <field name="model">account.voucher</field>
@@ -305,6 +314,7 @@
                                 on_change="onchange_journal(journal_id, line_cr_ids, False, partner_id, date, amount, type, company_id, context)"
                                 string="Payment Method"/>
                         </group>
+                        
                         <group>
                             <field name="date" invisible="context.get('line_type', False)" on_change="onchange_date(date, currency_id, payment_rate_currency_id, amount, company_id, context)"/>
                             <field name="period_id"/>
@@ -319,6 +329,21 @@
                             <field name="type" invisible="True"/>
                         </group>
                     </group>
+                    <group>
+                        <group>
+                                <field name="writeoff_amount" widget="monetary" options="{'currency_field': 'currency_id'}"/>
+                                <field name="payment_option" required="1"/>
+                                <field name="writeoff_acc_id"
+                                        attrs="{'invisible':[('payment_option','!=','with_writeoff')], 'required':[('payment_option','=','with_writeoff')]}"
+                                        domain="[('type','=','other')]"/>
+                                <field name="comment"
+                                        attrs="{'invisible':[('payment_option','!=','with_writeoff')]}"/>
+                                <field name="analytic_id"
+                                        groups="analytic.group_analytic_accounting"/>
+                            </group>
+                            <group>
+                        </group>
+                    </group>
                     <notebook invisible="1">
                         <page string="Payment Information" groups="base.group_user">
                             <label for="line_cr_ids"/>
@@ -358,23 +383,12 @@
                                 <group>
                                     <field name="narration" colspan="2" nolabel="1"/>
                                 </group>
-                                <group col="4" attrs="{'invisible':[('currency_id','=',False),('is_multi_currency','=',False)]}">
+                                <group col="4" attrs="{'invisible':[('is_multi_currency','=',False)]}">
                                     <field name="is_multi_currency" invisible="1"/>
-                                    <field name="payment_rate" required="1" on_change="onchange_rate(payment_rate, amount, currency_id, payment_rate_currency_id, company_id, context)" colspan="3"/>
+                                    <field name="payment_rate" required="1" colspan="3" on_change="onchange_amount(amount, payment_rate, partner_id, journal_id, currency_id, type, date, payment_rate_currency_id, company_id, context)"/>
                                     <field name="payment_rate_currency_id" colspan="1" nolabel="1" on_change="onchange_payment_rate_currency(currency_id, payment_rate, payment_rate_currency_id, date, amount, company_id, context)" groups="base.group_multi_currency"/>
                                     <field name="paid_amount_in_company_currency" colspan="4" invisible="1"/>
                                 </group>
-                                <group>
-                                    <field name="writeoff_amount" widget="monetary" options="{'currency_field': 'currency_id'}"/>
-                                    <field name="payment_option" required="1"/>
-                                    <field name="writeoff_acc_id"
-                                           attrs="{'invisible':[('payment_option','!=','with_writeoff')], 'required':[('payment_option','=','with_writeoff')]}"
-                                           domain="[('type','=','other')]"/>
-                                    <field name="comment"
-                                           attrs="{'invisible':[('payment_option','!=','with_writeoff')]}"/>
-                                    <field name="analytic_id"
-                                           groups="analytic.group_analytic_accounting"/>
-                                </group>
                             </group>
                         </page>
                     </notebook>
@@ -387,6 +401,7 @@
         </record>
 
 
+        <!-- Customer Payment -->
         <record model="ir.ui.view" id="view_vendor_receipt_form">
             <field name="name">account.voucher.receipt.form</field>
             <field name="model">account.voucher</field>
@@ -467,10 +482,14 @@
                                 <group>
                                     <field name="narration" colspan="2" nolabel="1"/>
                                 </group>
-                                <group col="4" attrs="{'invisible':[('currency_id','=',False),('is_multi_currency','=',False)]}">
+                                <group col="4" attrs="{'invisible':[('is_multi_currency','=',False)]}">
                                     <field name="is_multi_currency" invisible="1"/>
-                                    <field name="payment_rate" required="1" on_change="onchange_rate(payment_rate, amount, currency_id, payment_rate_currency_id, company_id, context)" colspan="3"/>
-                                    <field name="payment_rate_currency_id" colspan="1" nolabel="1" on_change="onchange_payment_rate_currency(currency_id, payment_rate, payment_rate_currency_id, date, amount, company_id, context)" groups="base.group_multi_currency"/>
+				    <label for="payment_rate" colspan="1"/>
+				    <div>
+                                        <field name="payment_rate" required="1" class="oe_inline" on_change="onchange_amount(amount, payment_rate, partner_id, journal_id, currency_id, type, date, payment_rate_currency_id, company_id, context)"/>
+                                        <field name="payment_rate_currency_id" class="oe_inline" on_change="onchange_payment_rate_currency(currency_id, payment_rate, payment_rate_currency_id, date, amount, company_id, context)" groups="base.group_multi_currency"/>
+                                    </div>
+                                    <field name="currency_help_label" colspan="2" nolabel="1" class="oe_grey"/>
                                     <field name="paid_amount_in_company_currency" colspan="4" invisible="1"/>
                                 </group>
                                 <group>
diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index 6a84a09d5e6..dc732129803 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -145,6 +145,13 @@
                             </field>
                         </page>
                     </notebook>
+                    <group col="4" invisible="1">
+                                    <field name="is_multi_currency" invisible="1"/>
+                                    <field name="currency_help_label" invisible="1"/>
+                                    <field name="payment_rate" invisible="1"/>
+                                    <field name="payment_rate_currency_id"  invisible="1"/>
+                                    <field name="paid_amount_in_company_currency" colspan="4" invisible="1"/>
+                    </group>
                     </sheet>
                     <div class="oe_chatter">
                         <field name="message_follower_ids" widget="mail_followers"/>
@@ -237,6 +244,7 @@
                                 on_change="onchange_journal(journal_id, line_dr_ids, tax_id, partner_id, date, amount, type, company_id, context)"
                                 groups="account.group_account_user"/>
                             <field name="paid_amount_in_company_currency" invisible="1"/>
+                            <field name="currency_help_label" invisible="1"/>
                         </group>
                     </group>
                     <notebook>
diff --git a/addons/analytic/security/analytic_security.xml b/addons/analytic/security/analytic_security.xml
index 70688275de2..bf103ca8988 100644
--- a/addons/analytic/security/analytic_security.xml
+++ b/addons/analytic/security/analytic_security.xml
@@ -4,14 +4,14 @@
 
     <record id="analytic_comp_rule" model="ir.rule">
         <field name="name">Analytic multi company rule</field>
-        <field model="ir.model" name="model_id" ref="model_account_analytic_account"/>
+        <field name="model_id" ref="model_account_analytic_account"/>
         <field eval="True" name="global"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
      
     <record id="analytic_line_comp_rule" model="ir.rule">
         <field name="name">Analytic line multi company rule</field>
-        <field model="ir.model" name="model_id" ref="model_account_analytic_line"/>
+        <field name="model_id" ref="model_account_analytic_line"/>
         <field eval="True" name="global"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
diff --git a/addons/anonymization/anonymization.py b/addons/anonymization/anonymization.py
index 025f1f79f70..0477efa5b1f 100644
--- a/addons/anonymization/anonymization.py
+++ b/addons/anonymization/anonymization.py
@@ -543,6 +543,7 @@ class ir_model_fields_anonymize_wizard(osv.osv_memory):
             fixes = group(fixes, ('model_name', 'field_name'))
 
             for line in data:
+                queries = []
                 table_name = self.pool[line['model_id']]._table if line['model_id'] in self.pool else None
 
                 # check if custom sql exists:
diff --git a/addons/auth_oauth/static/lib/zocial/css/zocial-regular-webfont.eot b/addons/auth_oauth/static/lib/zocial/css/zocial-regular-webfont.eot
old mode 100755
new mode 100644
diff --git a/addons/auth_oauth/static/lib/zocial/css/zocial-regular-webfont.svg b/addons/auth_oauth/static/lib/zocial/css/zocial-regular-webfont.svg
old mode 100755
new mode 100644
diff --git a/addons/auth_oauth/static/lib/zocial/css/zocial-regular-webfont.ttf b/addons/auth_oauth/static/lib/zocial/css/zocial-regular-webfont.ttf
old mode 100755
new mode 100644
diff --git a/addons/auth_oauth/static/lib/zocial/css/zocial-regular-webfont.woff b/addons/auth_oauth/static/lib/zocial/css/zocial-regular-webfont.woff
old mode 100755
new mode 100644
diff --git a/addons/auth_openid/i18n/ru.po b/addons/auth_openid/i18n/ru.po
index 6041300fe60..68b36626056 100644
--- a/addons/auth_openid/i18n/ru.po
+++ b/addons/auth_openid/i18n/ru.po
@@ -8,21 +8,21 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2013-03-23 11:37+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2013-05-28 06:19+0000\n"
+"Last-Translator: Глория Хрусталёва <gloriya@hushmail.com>\n"
 "Language-Team: Russian <ru@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: 2013-03-24 04:45+0000\n"
-"X-Generator: Launchpad (build 16540)\n"
+"X-Launchpad-Export-Date: 2013-05-29 05:37+0000\n"
+"X-Generator: Launchpad (build 16640)\n"
 
 #. module: auth_openid
 #. openerp-web
 #: code:addons/auth_openid/static/src/xml/auth_openid.xml:24
 #, python-format
 msgid "Username"
-msgstr ""
+msgstr "Имя пользователя"
 
 #. module: auth_openid
 #. openerp-web
@@ -30,7 +30,7 @@ msgstr ""
 #: view:res.users:0
 #, python-format
 msgid "OpenID"
-msgstr ""
+msgstr "OpenID"
 
 #. module: auth_openid
 #. openerp-web
@@ -46,14 +46,14 @@ msgstr ""
 #: code:addons/auth_openid/static/src/xml/auth_openid.xml:10
 #, python-format
 msgid "Google"
-msgstr ""
+msgstr "Google"
 
 #. module: auth_openid
 #. openerp-web
 #: code:addons/auth_openid/static/src/xml/auth_openid.xml:11
 #, python-format
 msgid "Launchpad"
-msgstr ""
+msgstr "Launchpad"
 
 #. module: auth_openid
 #: help:res.users,openid_email:0
@@ -82,7 +82,7 @@ msgstr ""
 #: code:addons/auth_openid/static/src/xml/auth_openid.xml:8
 #, python-format
 msgid "Password"
-msgstr ""
+msgstr "Пароль"
 
 #. module: auth_openid
 #. openerp-web
@@ -94,4 +94,4 @@ msgstr ""
 #. module: auth_openid
 #: model:ir.model,name:auth_openid.model_res_users
 msgid "Users"
-msgstr ""
+msgstr "Пользователи"
diff --git a/addons/auth_openid/res_users.py b/addons/auth_openid/res_users.py
index 47e119f2a1e..897dea07982 100644
--- a/addons/auth_openid/res_users.py
+++ b/addons/auth_openid/res_users.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
diff --git a/addons/auth_openid/utils.py b/addons/auth_openid/utils.py
index 806198f99c2..0474e23fe4b 100644
--- a/addons/auth_openid/utils.py
+++ b/addons/auth_openid/utils.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
diff --git a/addons/auth_signup/i18n/ru.po b/addons/auth_signup/i18n/ru.po
index bddc6cde1ba..639a1e9bc3c 100644
--- a/addons/auth_signup/i18n/ru.po
+++ b/addons/auth_signup/i18n/ru.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-12-11 06:59+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2013-05-27 12:12+0000\n"
+"Last-Translator: Глория Хрусталёва <gloriya@hushmail.com>\n"
 "Language-Team: Russian <ru@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: 2013-03-16 05:52+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-05-28 05:17+0000\n"
+"X-Generator: Launchpad (build 16640)\n"
 
 #. module: auth_signup
 #: field:res.partner,signup_type:0
@@ -25,25 +25,25 @@ msgstr ""
 #. module: auth_signup
 #: field:base.config.settings,auth_signup_uninvited:0
 msgid "Allow external users to sign up"
-msgstr ""
+msgstr "Разрешить регистрацию внешним пользователям"
 
 #. module: auth_signup
 #. openerp-web
 #: code:addons/auth_signup/static/src/xml/auth_signup.xml:16
 #, python-format
 msgid "Confirm Password"
-msgstr ""
+msgstr "Подтвердите пароль"
 
 #. module: auth_signup
 #: help:base.config.settings,auth_signup_uninvited:0
 msgid "If unchecked, only invited users may sign up."
 msgstr ""
-"Если отмечено, только приглашенные пользователи могут зарегистрироваться"
+"Если не отмечено, только приглашенные пользователи могут зарегистрироваться"
 
 #. module: auth_signup
 #: model:ir.model,name:auth_signup.model_base_config_settings
 msgid "base.config.settings"
-msgstr ""
+msgstr "base.config.settings"
 
 #. module: auth_signup
 #: code:addons/auth_signup/res_users.py:265
@@ -57,17 +57,17 @@ msgstr "Невозможно отправить письмо: у пользов
 #: code:addons/auth_signup/static/src/xml/auth_signup.xml:28
 #, python-format
 msgid "Reset password"
-msgstr ""
+msgstr "Сброс пароля"
 
 #. module: auth_signup
 #: field:base.config.settings,auth_signup_template_user_id:0
 msgid "Template user for new users created through signup"
-msgstr ""
+msgstr "Шаблон новых пользователей, созданных в процессе регистрации"
 
 #. module: auth_signup
 #: model:email.template,subject:auth_signup.reset_password_email
 msgid "Password reset"
-msgstr ""
+msgstr "Сброс пароля"
 
 #. module: auth_signup
 #. openerp-web
@@ -88,12 +88,12 @@ msgstr ""
 #: code:addons/auth_signup/static/src/xml/auth_signup.xml:26
 #, python-format
 msgid "Sign Up"
-msgstr ""
+msgstr "Регистрация"
 
 #. module: auth_signup
 #: selection:res.users,state:0
 msgid "New"
-msgstr ""
+msgstr "Новый"
 
 #. module: auth_signup
 #: code:addons/auth_signup/res_users.py:258
@@ -104,7 +104,7 @@ msgstr ""
 #. module: auth_signup
 #: field:res.users,state:0
 msgid "Status"
-msgstr ""
+msgstr "Статус"
 
 #. module: auth_signup
 #: model:email.template,body_html:auth_signup.reset_password_email
@@ -118,18 +118,27 @@ msgid ""
 "\n"
 "<p>Note: If you do not expect this, you can safely ignore this email.</p>"
 msgstr ""
+"\n"
+"<p>Был запрошен сброс пароля для аккаунта OpenERP  связанного с этим адресом "
+"эл.почты</p>\n"
+"\n"
+"<p>Вы можете сменить пароль, проследовав по <a "
+"href=\"${object.signup_url}\">ссылке</a>.</p>\n"
+"\n"
+"<p>Примечание: если вы не запрашивали сброс пароля, просто проигнорируйте "
+"данное письмо</p>"
 
 #. module: auth_signup
 #. openerp-web
 #: code:addons/auth_signup/static/src/js/auth_signup.js:111
 #, python-format
 msgid "Please enter a name."
-msgstr ""
+msgstr "Пожалуйста, введите имя"
 
 #. module: auth_signup
 #: model:ir.model,name:auth_signup.model_res_users
 msgid "Users"
-msgstr ""
+msgstr "Пользователи"
 
 #. module: auth_signup
 #: field:res.partner,signup_url:0
@@ -146,7 +155,7 @@ msgstr "Пожалуйста, введите имя пользователя."
 #. module: auth_signup
 #: selection:res.users,state:0
 msgid "Active"
-msgstr ""
+msgstr "Активен"
 
 #. module: auth_signup
 #: code:addons/auth_signup/res_users.py:269
@@ -155,39 +164,41 @@ msgid ""
 "Cannot send email: no outgoing email server configured.\n"
 "You can configure it under Settings/General Settings."
 msgstr ""
+"Невозможно отправить email: не настроены сервера исходящей почты.\n"
+"Вы можете настроить их в меню Настройки/Общие настройки"
 
 #. module: auth_signup
 #. openerp-web
 #: code:addons/auth_signup/static/src/xml/auth_signup.xml:12
 #, python-format
 msgid "Username"
-msgstr ""
+msgstr "Имя пользователя"
 
 #. module: auth_signup
 #. openerp-web
 #: code:addons/auth_signup/static/src/xml/auth_signup.xml:8
 #, python-format
 msgid "Name"
-msgstr ""
+msgstr "Имя"
 
 #. module: auth_signup
 #. openerp-web
 #: code:addons/auth_signup/static/src/js/auth_signup.js:170
 #, python-format
 msgid "Please enter a username or email address."
-msgstr ""
+msgstr "Пожалуйста, введите имя пользователя или адрес эл. почты."
 
 #. module: auth_signup
 #: selection:res.users,state:0
 msgid "Resetting Password"
-msgstr ""
+msgstr "Переустановка пароля"
 
 #. module: auth_signup
 #. openerp-web
 #: code:addons/auth_signup/static/src/xml/auth_signup.xml:13
 #, python-format
 msgid "Username (Email)"
-msgstr ""
+msgstr "Имя пользователя (Email)"
 
 #. module: auth_signup
 #: field:res.partner,signup_expiration:0
@@ -198,13 +209,15 @@ msgstr ""
 #: help:base.config.settings,auth_signup_reset_password:0
 msgid "This allows users to trigger a password reset from the Login page."
 msgstr ""
+"Это позволяет пользователям запросить сброс пароля со страницы входа в "
+"систему."
 
 #. module: auth_signup
 #. openerp-web
 #: code:addons/auth_signup/static/src/xml/auth_signup.xml:22
 #, python-format
 msgid "Log in"
-msgstr ""
+msgstr "Вход"
 
 #. module: auth_signup
 #: field:res.partner,signup_valid:0
@@ -222,7 +235,7 @@ msgstr ""
 #: code:addons/auth_signup/static/src/js/auth_signup.js:170
 #, python-format
 msgid "Login"
-msgstr ""
+msgstr "Вход"
 
 #. module: auth_signup
 #. openerp-web
@@ -236,7 +249,7 @@ msgstr ""
 #: code:addons/auth_signup/static/src/js/auth_signup.js:120
 #, python-format
 msgid "Passwords do not match; please retype them."
-msgstr ""
+msgstr "Пароли не совпадают; пожалуйста, введите их заново."
 
 #. module: auth_signup
 #. openerp-web
@@ -244,7 +257,7 @@ msgstr ""
 #: code:addons/auth_signup/static/src/js/auth_signup.js:167
 #, python-format
 msgid "No database selected !"
-msgstr ""
+msgstr "Не выбрана база данных!"
 
 #. module: auth_signup
 #: view:res.users:0
@@ -254,14 +267,14 @@ msgstr ""
 #. module: auth_signup
 #: field:base.config.settings,auth_signup_reset_password:0
 msgid "Enable password reset from Login page"
-msgstr ""
+msgstr "Включить сброс пароля со страницы входа"
 
 #. module: auth_signup
 #. openerp-web
 #: code:addons/auth_signup/static/src/xml/auth_signup.xml:27
 #, python-format
 msgid "Back to Login"
-msgstr ""
+msgstr "Вернуться к странице входа"
 
 #. module: auth_signup
 #. openerp-web
@@ -273,7 +286,7 @@ msgstr ""
 #. module: auth_signup
 #: model:ir.model,name:auth_signup.model_res_partner
 msgid "Partner"
-msgstr ""
+msgstr "Партнер"
 
 #. module: auth_signup
 #: field:res.partner,signup_token:0
diff --git a/addons/auth_signup/res_users.py b/addons/auth_signup/res_users.py
index f4a985280ac..ad28bbb1d57 100644
--- a/addons/auth_signup/res_users.py
+++ b/addons/auth_signup/res_users.py
@@ -23,6 +23,7 @@ import random
 from urllib import urlencode
 from urlparse import urljoin
 
+from openerp.addons.base.ir.ir_mail_server import MailDeliveryException
 from openerp.osv import osv, fields
 from openerp.tools.misc import DEFAULT_SERVER_DATETIME_FORMAT
 from openerp.tools.safe_eval import safe_eval
@@ -103,6 +104,9 @@ class res_partner(osv.Model):
     def action_signup_prepare(self, cr, uid, ids, context=None):
         return self.signup_prepare(cr, uid, ids, context=context)
 
+    def signup_cancel(self, cr, uid, ids, context=None):
+        return self.write(cr, uid, ids, {'signup_token': False, 'signup_type': False, 'signup_expiration': False}, context=context)
+
     def signup_prepare(self, cr, uid, ids, signup_type="signup", expiration=False, context=None):
         """ generate a new token for the partners with the given validity, if necessary
             :param expiration: the expiration datetime of the token (string, optional)
@@ -202,7 +206,7 @@ class res_users(osv.Model):
                 })
                 if partner.company_id:
                     values['company_id'] = partner.company_id.id
-                    values['company_ids'] = [(6,0,[partner.company_id.id])]
+                    values['company_ids'] = [(6, 0, [partner.company_id.id])]
                 self._signup_create_user(cr, uid, values, context=context)
         else:
             # no token, sign up an external user
@@ -259,25 +263,26 @@ class res_users(osv.Model):
                 pass
         if not bool(template):
             template = self.pool.get('ir.model.data').get_object(cr, uid, 'auth_signup', 'reset_password_email')
-        mail_obj = self.pool.get('mail.mail')
         assert template._name == 'email.template'
 
         for user in self.browse(cr, uid, ids, context):
             if not user.email:
                 raise osv.except_osv(_("Cannot send email: user has no email address."), user.name)
-            mail_id = self.pool.get('email.template').send_mail(cr, uid, template.id, user.id, True, context=context)
-            mail_state = mail_obj.read(cr, uid, mail_id, ['state'], context=context)
-
-            if mail_state and mail_state['state'] == 'exception':
-                raise self.pool.get('res.config.settings').get_config_warning(cr, _("Cannot send email: no outgoing email server configured.\nYou can configure it under %(menu:base_setup.menu_general_configuration)s."), context)
-            else:
-                return True
+            try:
+                self.pool.get('email.template').send_mail(cr, uid, template.id, user.id, force_send=True, raise_exception=True, context=context)
+            except Exception:
+                raise
 
     def create(self, cr, uid, values, context=None):
+        if context is None:
+            context = {}
         # overridden to automatically invite user to sign up
         user_id = super(res_users, self).create(cr, uid, values, context=context)
         user = self.browse(cr, uid, user_id, context=context)
-        if context and context.get('reset_password') and user.email:
-            ctx = dict(context, create_user=True)
-            self.action_reset_password(cr, uid, [user.id], context=ctx)
+        if user.email and not context.get('no_reset_password'):
+            context.update({'create_user': True})
+            try:
+                self.action_reset_password(cr, uid, [user.id], context=context)
+            except MailDeliveryException:
+                self.pool.get('res.partner').signup_cancel(cr, uid, [user.partner_id.id], context=context)
         return user_id
diff --git a/addons/auth_signup/res_users_view.xml b/addons/auth_signup/res_users_view.xml
index 28f66eb101d..60c419db737 100644
--- a/addons/auth_signup/res_users_view.xml
+++ b/addons/auth_signup/res_users_view.xml
@@ -31,9 +31,11 @@
                 <!-- add Reset Password button -->
                 <xpath expr="//div[@class='oe_right oe_button_box']//button" position="replace">
                         <button string="Send Reset Password Instructions"
+                                class="oe_link"
                                 type="object" name="action_reset_password"
                                 attrs="{'invisible': [('state', '!=', 'active')]}"/>
                         <button string="Send an Invitation Email"
+                                class="oe_link"
                                 type="object" name="action_reset_password" context="{'create_user': 1}"
                                 attrs="{'invisible': [('state', '!=', 'new')]}"/>
                 </xpath>
diff --git a/addons/auth_signup/static/src/js/auth_signup.js b/addons/auth_signup/static/src/js/auth_signup.js
index bbaf907c625..545ee6cf60e 100644
--- a/addons/auth_signup/static/src/js/auth_signup.js
+++ b/addons/auth_signup/static/src/js/auth_signup.js
@@ -57,14 +57,14 @@ openerp.auth_signup = function(instance) {
                         self.signup_enabled = result.signup;
                         self.reset_password_enabled = result.reset_password;
                         if (!self.signup_enabled || self.$("form input[name=login]").val()){
-                            self.set('login_mode', 'default');
+                            self.set('login_mode', self.params.type || 'default');
                         } else {
                             self.set('login_mode', 'signup');
                         }
                     });
                 } else {
                     // TODO: support multiple database mode
-                    self.set('login_mode', 'default');
+                    self.set('login_mode', self.params.type || 'default');
                 }
             });
         },
diff --git a/addons/base_action_rule/base_action_rule.py b/addons/base_action_rule/base_action_rule.py
index 9d7d4d34ac4..9309f790013 100644
--- a/addons/base_action_rule/base_action_rule.py
+++ b/addons/base_action_rule/base_action_rule.py
@@ -50,6 +50,7 @@ class base_action_rule(osv.osv):
 
     _name = 'base.action.rule'
     _description = 'Action Rules'
+    _order = 'sequence'
 
     _columns = {
         'name':  fields.char('Rule Name', size=64, required=True),
@@ -61,6 +62,9 @@ class base_action_rule(osv.osv):
             help="When unchecked, the rule is hidden and will not be executed."),
         'sequence': fields.integer('Sequence',
             help="Gives the sequence order when displaying a list of rules."),
+        'kind': fields.selection(
+            [('on_create', 'On Creation'), ('on_write', 'On Update'), ('on_time', 'Based on Timed Condition')],
+            string='When to Run'),
         'trg_date_id': fields.many2one('ir.model.fields', string='Trigger Date',
             domain="[('model_id', '=', model_id), ('ttype', 'in', ('date', 'datetime'))]"),
         'trg_date_range': fields.integer('Delay after trigger date',
@@ -78,10 +82,10 @@ class base_action_rule(osv.osv):
             ondelete='restrict',
             domain="[('model_id', '=', model_id.model)]",
             help="If present, this condition must be satisfied before the update of the record."),
-        'filter_id': fields.many2one('ir.filters', string='After Update Filter',
+        'filter_id': fields.many2one('ir.filters', string='Filter',
             ondelete='restrict',
             domain="[('model_id', '=', model_id.model)]",
-            help="If present, this condition must be satisfied after the update of the record."),
+            help="If present, this condition must be satisfied before executing the action rule."),
         'last_run': fields.datetime('Last Run', readonly=1),
     }
 
@@ -90,7 +94,15 @@ class base_action_rule(osv.osv):
         'trg_date_range_type': 'day',
     }
 
-    _order = 'sequence'
+    def onchange_kind(self, cr, uid, ids, kind, context=None):
+        clear_fields = []
+        if kind == 'on_create':
+            clear_fields = ['filter_pre_id', 'trg_date_id', 'trg_date_range', 'trg_date_range_type']
+        elif kind == 'on_write':
+            clear_fields = ['trg_date_id', 'trg_date_range', 'trg_date_range_type']
+        elif kind == 'on_time':
+            clear_fields = ['filter_pre_id']
+        return {'value': dict.fromkeys(clear_fields, False)}
 
     def _filter(self, cr, uid, action, action_filter, record_ids, context=None):
         """ filter the list record_ids that satisfy the action filter """
@@ -105,14 +117,7 @@ class base_action_rule(osv.osv):
 
     def _process(self, cr, uid, action, record_ids, context=None):
         """ process the given action on the records """
-        # execute server actions
         model = self.pool[action.model_id.model]
-        if action.server_action_ids:
-            server_action_ids = map(int, action.server_action_ids)
-            for record in model.browse(cr, uid, record_ids, context):
-                action_server_obj = self.pool.get('ir.actions.server')
-                ctx = dict(context, active_model=model._name, active_ids=[record.id], active_id=record.id)
-                action_server_obj.run(cr, uid, server_action_ids, context=ctx)
 
         # modify records
         values = {}
@@ -127,13 +132,21 @@ class base_action_rule(osv.osv):
             follower_ids = map(int, action.act_followers)
             model.message_subscribe(cr, uid, record_ids, follower_ids, context=context)
 
+        # execute server actions
+        if action.server_action_ids:
+            server_action_ids = map(int, action.server_action_ids)
+            for record in model.browse(cr, uid, record_ids, context):
+                action_server_obj = self.pool.get('ir.actions.server')
+                ctx = dict(context, active_model=model._name, active_ids=[record.id], active_id=record.id)
+                action_server_obj.run(cr, uid, server_action_ids, context=ctx)
+
         return True
 
     def _wrap_create(self, old_create, model):
         """ Return a wrapper around `old_create` calling both `old_create` and
             `_process`, in that order.
         """
-        def wrapper(cr, uid, vals, context=None):
+        def create(cr, uid, vals, context=None):
             # avoid loops or cascading actions
             if context and context.get('action'):
                 return old_create(cr, uid, vals, context=context)
@@ -141,8 +154,8 @@ class base_action_rule(osv.osv):
             context = dict(context or {}, action=True)
             new_id = old_create(cr, uid, vals, context=context)
 
-            # as it is a new record, we do not consider the actions that have a prefilter
-            action_dom = [('model', '=', model), ('trg_date_id', '=', False), ('filter_pre_id', '=', False)]
+            # retrieve the action rules to run on creation
+            action_dom = [('model', '=', model), ('kind', '=', 'on_create')]
             action_ids = self.search(cr, uid, action_dom, context=context)
 
             # check postconditions, and execute actions on the records that satisfy them
@@ -151,13 +164,13 @@ class base_action_rule(osv.osv):
                     self._process(cr, uid, action, [new_id], context=context)
             return new_id
 
-        return wrapper
+        return create
 
     def _wrap_write(self, old_write, model):
         """ Return a wrapper around `old_write` calling both `old_write` and
             `_process`, in that order.
         """
-        def wrapper(cr, uid, ids, vals, context=None):
+        def write(cr, uid, ids, vals, context=None):
             # avoid loops or cascading actions
             if context and context.get('action'):
                 return old_write(cr, uid, ids, vals, context=context)
@@ -165,8 +178,8 @@ class base_action_rule(osv.osv):
             context = dict(context or {}, action=True)
             ids = [ids] if isinstance(ids, (int, long, str)) else ids
 
-            # retrieve the action rules to possibly execute
-            action_dom = [('model', '=', model), ('trg_date_id', '=', False)]
+            # retrieve the action rules to run on update
+            action_dom = [('model', '=', model), ('kind', '=', 'on_write')]
             action_ids = self.search(cr, uid, action_dom, context=context)
             actions = self.browse(cr, uid, action_ids, context=context)
 
@@ -185,7 +198,7 @@ class base_action_rule(osv.osv):
                     self._process(cr, uid, action, post_ids, context=context)
             return True
 
-        return wrapper
+        return write
 
     def _register_hook(self, cr, ids=None):
         """ Wrap the methods `create` and `write` of the models specified by
@@ -224,8 +237,8 @@ class base_action_rule(osv.osv):
     def _check(self, cr, uid, automatic=False, use_new_cursor=False, context=None):
         """ This Function is called by scheduler. """
         context = context or {}
-        # retrieve all the action rules that have a trg_date_id and no precondition
-        action_dom = [('trg_date_id', '!=', False), ('filter_pre_id', '=', False)]
+        # retrieve all the action rules to run based on a timed condition
+        action_dom = [('kind', '=', 'on_time')]
         action_ids = self.search(cr, uid, action_dom, context=context)
         for action in self.browse(cr, uid, action_ids, context=context):
             now = datetime.now()
diff --git a/addons/base_action_rule/base_action_rule_view.xml b/addons/base_action_rule/base_action_rule_view.xml
index 5eaaf08dad4..c2262adde39 100644
--- a/addons/base_action_rule/base_action_rule_view.xml
+++ b/addons/base_action_rule/base_action_rule_view.xml
@@ -26,24 +26,32 @@
                         <notebook>
                             <page string="Conditions">
                                 <group>
-                                    <group name="filter" string="Filter Condition">
-                                        <field name="filter_pre_id" domain="[('model_id','=',model)]" context="{'default_model_id': model}"/>
-                                        <field name="filter_id" domain="[('model_id','=',model)]" context="{'default_model_id': model}"/>
-                                    </group>
-                                    <group name="timing" string="Timer">
-                                        <field name="trg_date_id"/>
-                                        <label for="trg_date_range" string="Delay After Trigger Date" attrs="{'invisible': [('trg_date_id','=',False)]}"/>
-                                        <div attrs="{'invisible': [('trg_date_id','=',False)]}">
-                                            <field name="trg_date_range" class="oe_inline"/>
-                                            <field name="trg_date_range_type" class="oe_inline" attrs="{'required': [('trg_date_id','!=',False)]}"/>
-                                        </div>
-                                    </group>
+                                    <field name="kind" required="1"
+                                        on_change="onchange_kind(kind)"/>
+                                    <field name="filter_pre_id"
+                                        domain="[('model_id','=',model), ('user_id', '=', False)]"
+                                        context="{'default_model_id': model}"
+                                        attrs="{'invisible': [('kind', '!=', 'on_write')]}"/>
+                                    <field name="filter_id"
+                                        domain="[('model_id','=',model), ('user_id', '=', False)]"
+                                        context="{'default_model_id': model}"/>
+                                    <field name="trg_date_id"
+                                        attrs="{'invisible': [('kind', '!=', 'on_time')], 'required': [('kind', '=', 'on_time')]}"/>
+                                    <label for="trg_date_range" string="Delay After Trigger Date"
+                                        attrs="{'invisible': [('trg_date_id','=',False)]}"/>
+                                    <div attrs="{'invisible': [('trg_date_id','=',False)]}">
+                                        <field name="trg_date_range" class="oe_inline"/>
+                                        <field name="trg_date_range_type" class="oe_inline" attrs="{'required': [('trg_date_id','!=',False)]}"/>
+                                    </div>
                                 </group>
-                                <p class="oe_grey">
-                                    <b>Select a filter or a timer as condition.</b><br/> An action rule is checked when you create or modify the "Related Document Model". The precondition filter is checked right before the modification while the postcondition filter is checked after the modification. A precondition filter will therefore not work during a creation.<br/>
-                                    <b>To create a new filter:</b><br/>
-                                    - Go to your "Related Document Model" page and set the filter parameters in the "Search" view (Example of filter based on Leads/Opportunities: Creation Date "is equal to" 01/01/2012)<br/>
-                                    - In this same "Search" view, select the menu "Save Current Filter", enter the name (Ex: Create the 01/01/2012) and add the option "Share with all users"<br/>
+                                <p>
+                                    Select when the action must be run, and add filters and/or timing conditions.
+                                    <br/>
+                                    In order to create a new filter:
+                                    <ul>
+                                        <li>Go to your "Related Document Model" page and set the filter parameters in the "Search" view (Example of filter based on Leads/Opportunities: Creation Date "is equal to" 01/01/2012)</li>
+                                        <li>In this same "Search" view, select the menu "Save Current Filter", enter the name (Ex: Create the 01/01/2012) and add the option "Share with all users"</li>
+                                    </ul>
                                     The filter must therefore be available in this page.
                                 </p>
                             </page>
@@ -76,6 +84,7 @@
                 <tree string="Action Rule">
                     <field name="sequence"/>
                     <field name="name"/>
+                    <field name="kind"/>
                     <field name="filter_id"/>
                 </tree>
             </field>
diff --git a/addons/base_action_rule/i18n/ru.po b/addons/base_action_rule/i18n/ru.po
index c8673c26815..3ca5b1eab04 100644
--- a/addons/base_action_rule/i18n/ru.po
+++ b/addons/base_action_rule/i18n/ru.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-05-10 18:17+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2013-05-31 10:23+0000\n"
+"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: Russian <ru@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: 2013-03-16 05:46+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-06-01 05:16+0000\n"
+"X-Generator: Launchpad (build 16660)\n"
 
 #. module: base_action_rule
 #: selection:base.action.rule.lead.test,state:0
@@ -58,7 +58,7 @@ msgstr "Добавить подписчиков"
 #. module: base_action_rule
 #: field:base.action.rule,act_user_id:0
 msgid "Set Responsible"
-msgstr ""
+msgstr "Указать ответственного"
 
 #. module: base_action_rule
 #: help:base.action.rule,trg_date_range:0
@@ -71,7 +71,7 @@ msgstr ""
 #. module: base_action_rule
 #: model:ir.model,name:base_action_rule.model_base_action_rule_lead_test
 msgid "base.action.rule.lead.test"
-msgstr ""
+msgstr "base.action.rule.lead.test"
 
 #. module: base_action_rule
 #: selection:base.action.rule.lead.test,state:0
@@ -142,7 +142,7 @@ msgstr "Часы"
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "To create a new filter:"
-msgstr ""
+msgstr "Для создания нового фильтра:"
 
 #. module: base_action_rule
 #: field:base.action.rule,active:0
@@ -167,7 +167,7 @@ msgstr ""
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Filter Condition"
-msgstr ""
+msgstr "Условие фильтра"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
@@ -216,7 +216,7 @@ msgstr "Тип задержки"
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Server actions to run"
-msgstr ""
+msgstr "Действия сервера для запуска"
 
 #. module: base_action_rule
 #: help:base.action.rule,active:0
@@ -246,7 +246,7 @@ msgstr "Минуты"
 #. module: base_action_rule
 #: field:base.action.rule,model_id:0
 msgid "Related Document Model"
-msgstr ""
+msgstr "Модель связанного документа"
 
 #. module: base_action_rule
 #: help:base.action.rule,filter_pre_id:0
@@ -310,7 +310,7 @@ msgstr "Действия сервера"
 #. module: base_action_rule
 #: field:base.action.rule.lead.test,name:0
 msgid "Subject"
-msgstr ""
+msgstr "Тема"
 
 #~ msgid "Set State to"
 #~ msgstr "Уснатовить состояние в"
diff --git a/addons/base_action_rule/tests/base_action_rule_test.py b/addons/base_action_rule/tests/base_action_rule_test.py
index 36c928a84e3..54c72ba0607 100644
--- a/addons/base_action_rule/tests/base_action_rule_test.py
+++ b/addons/base_action_rule/tests/base_action_rule_test.py
@@ -19,8 +19,8 @@ class base_action_rule_test(common.TransactionCase):
             'name': "Lead is in done state",
             'is_default': False,
             'model_id': 'base.action.rule.lead.test',
-            'domain' : "[('state','=','done')]",
-            }, context=context)
+            'domain': "[('state','=','done')]",
+        }, context=context)
 
     def create_filter_draft(self, cr, uid, context=None):
         filter_pool = self.registry('ir.filters')
@@ -40,16 +40,16 @@ class base_action_rule_test(common.TransactionCase):
             'user_id': self.admin,
             }, context=context)
 
-    def create_rule(self, cr, uid, filter_id=False, filter_pre_id=False, context=None):
+    def create_rule(self, cr, uid, kind, filter_id=False, filter_pre_id=False, context=None):
         """
             The "Rule 1" says that when a lead goes to the 'draft' state, the responsible for that lead changes to user "demo"
         """
         return self.base_action_rule.create(cr,uid,{
-            'name' : "Rule 1",
+            'name': "Rule 1",
             'model_id': self.registry('ir.model').search(cr, uid, [('model','=','base.action.rule.lead.test')], context=context)[0],
-            'active' : 1,
-            'filter_pre_id' : filter_pre_id,
-            'filter_id' : filter_id,
+            'kind': kind,
+            'filter_pre_id': filter_pre_id,
+            'filter_id': filter_id,
             'act_user_id': self.demo,
             }, context=context)
 
@@ -64,7 +64,7 @@ class base_action_rule_test(common.TransactionCase):
         """
         cr, uid = self.cr, self.uid
         filter_draft = self.create_filter_draft(cr, uid)
-        self.create_rule(cr, uid, filter_pre_id=filter_draft)
+        self.create_rule(cr, uid, 'on_write', filter_pre_id=filter_draft)
         new_lead_id = self.create_lead_test_1(cr, uid)
         new_lead = self.model.browse(cr, uid, new_lead_id)
         self.assertEquals(new_lead.state, 'draft')
@@ -73,11 +73,11 @@ class base_action_rule_test(common.TransactionCase):
 
     def test_01_check_to_state_draft_post(self):
         """
-        Check that a new record (with state = draft) changes its responsible when there is a postcondition filter which check that the state is draft.
+        Check that a new record changes its responsible when there is a postcondition filter which check that the state is draft.
         """
         cr, uid = self.cr, self.uid
         filter_draft = self.create_filter_draft(cr, uid)
-        self.create_rule(cr, uid, filter_id=filter_draft)
+        self.create_rule(cr, uid, 'on_create')
         new_lead_id = self.create_lead_test_1(cr, uid)
         new_lead = self.model.browse(cr, uid, new_lead_id)
         self.assertEquals(new_lead.state, 'draft')
@@ -95,7 +95,7 @@ class base_action_rule_test(common.TransactionCase):
         cr, uid = self.cr, self.uid
         filter_draft = self.create_filter_draft(cr, uid)
         filter_done = self.create_filter_done(cr, uid)
-        self.create_rule(cr, uid, filter_pre_id=filter_draft, filter_id=filter_done)
+        self.create_rule(cr, uid, 'on_write', filter_pre_id=filter_draft, filter_id=filter_done)
         new_lead_id = self.create_lead_test_1(cr, uid)
         new_lead = self.model.browse(cr, uid, new_lead_id)
         self.assertEquals(new_lead.state, 'draft')
@@ -133,7 +133,7 @@ class base_action_rule_test(common.TransactionCase):
         cr, uid = self.cr, self.uid
         filter_draft = self.create_filter_draft(cr, uid)
         filter_done = self.create_filter_done(cr, uid)
-        self.create_rule(cr, uid, filter_pre_id=filter_draft, filter_id=filter_done)
+        self.create_rule(cr, uid, 'on_write', filter_pre_id=filter_draft, filter_id=filter_done)
         new_lead_id = self.create_lead_test_1(cr, uid)
         new_lead = self.model.browse(cr, uid, new_lead_id)
         self.assertEquals(new_lead.state, 'draft')
diff --git a/addons/base_import/static/lib/select2/README.md b/addons/base_import/static/lib/select2/README.md
old mode 100755
new mode 100644
diff --git a/addons/base_import/static/lib/select2/select2.css b/addons/base_import/static/lib/select2/select2.css
old mode 100755
new mode 100644
diff --git a/addons/base_import/static/lib/select2/select2.js b/addons/base_import/static/lib/select2/select2.js
old mode 100755
new mode 100644
diff --git a/addons/base_import/static/lib/select2/spinner.gif b/addons/base_import/static/lib/select2/spinner.gif
old mode 100755
new mode 100644
diff --git a/addons/base_report_designer/openerp_sxw2rml/openerp_sxw2rml.py b/addons/base_report_designer/openerp_sxw2rml/openerp_sxw2rml.py
old mode 100644
new mode 100755
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/About.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/About.py
index 43b452b82e2..9fb6cd11219 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/About.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/About.py
@@ -1,49 +1,25 @@
-##########################################################################
+#########################################################################
 #
-# Portions of this file are under the following copyright and license:
+#  Copyright (c) 2003-2004 Danny Brewer d29583@groovegarden.com
+#  Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>).
 #
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 2.1 of the License, or (at your option) any later version.
 #
-#   Copyright (c) 2003-2004 Danny Brewer 
-#   d29583@groovegarden.com 
-# 
-#   This library is free software; you can redistribute it and/or 
-#   modify it under the terms of the GNU Lesser General Public 
-#   License as published by the Free Software Foundation; either 
-#   version 2.1 of the License, or (at your option) any later version. 
-# 
-#   This library 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 
-#   Lesser General Public License for more details. 
-# 
-#   You should have received a copy of the GNU Lesser General Public 
-#   License along with this library; if not, write to the Free Software 
-#   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
-# 
-#   See:  http://www.gnu.org/licenses/lgpl.html 
+#  This library 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
+#  Lesser General Public License for more details.
 #
-# 
-# and other portions are under the following copyright and license:
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library; if not, write to the Free Software
+#  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
+#  See:  http://www.gnu.org/licenses/lgpl.html
 #
-#    OpenERP, Open Source Management Solution>..
-#    Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>). 
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-#
-##############################################################################
+#############################################################################
 
 import uno
 from com.sun.star.task import XJobExecutor
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/AddAttachment.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/AddAttachment.py
index ba69174ffc6..2dce1750e34 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/AddAttachment.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/AddAttachment.py
@@ -1,49 +1,26 @@
-##########################################################################
+#########################################################################
 #
-# Portions of this file are under the following copyright and license:
+#  Copyright (c) 2003-2004 Danny Brewer d29583@groovegarden.com
+#  Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>).
 #
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 2.1 of the License, or (at your option) any later version.
 #
-#   Copyright (c) 2003-2004 Danny Brewer
-#   d29583@groovegarden.com
+#  This library 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
+#  Lesser General Public License for more details.
 #
-#   This library is free software; you can redistribute it and/or
-#   modify it under the terms of the GNU Lesser General Public
-#   License as published by the Free Software Foundation; either
-#   version 2.1 of the License, or (at your option) any later version.
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library; if not, write to the Free Software
+#  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
-#   This library 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
-#   Lesser General Public License for more details.
+#  See:  http://www.gnu.org/licenses/lgpl.html
 #
-#   You should have received a copy of the GNU Lesser General Public
-#   License along with this library; if not, write to the Free Software
-#   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-#
-#   See:  http://www.gnu.org/licenses/lgpl.html
-#
-#
-# and other portions are under the following copyright and license:
-#
-#
-#    OpenERP, Open Source Management Solution>..
-#    Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-#
-##############################################################################
+#############################################################################
+
 import os
 import uno
 import unohelper
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Change.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Change.py
index b85a9d9bb06..e0b66780e8b 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Change.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Change.py
@@ -1,49 +1,26 @@
-##########################################################################
+#########################################################################
 #
-# Portions of this file are under the following copyright and license:
+#  Copyright (c) 2003-2004 Danny Brewer d29583@groovegarden.com
+#  Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>).
 #
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 2.1 of the License, or (at your option) any later version.
 #
-#   Copyright (c) 2003-2004 Danny Brewer 
-#   d29583@groovegarden.com 
-# 
-#   This library is free software; you can redistribute it and/or 
-#   modify it under the terms of the GNU Lesser General Public 
-#   License as published by the Free Software Foundation; either 
-#   version 2.1 of the License, or (at your option) any later version. 
-# 
-#   This library 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 
-#   Lesser General Public License for more details. 
-# 
-#   You should have received a copy of the GNU Lesser General Public 
-#   License along with this library; if not, write to the Free Software 
-#   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
-# 
-#   See:  http://www.gnu.org/licenses/lgpl.html 
+#  This library 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
+#  Lesser General Public License for more details.
 #
-# 
-# and other portions are under the following copyright and license:
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library; if not, write to the Free Software
+#  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
+#  See:  http://www.gnu.org/licenses/lgpl.html
 #
-#    OpenERP, Open Source Management Solution>..
-#    Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>). 
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-#
-##############################################################################
+#############################################################################
+
 import uno
 import string
 import unohelper
@@ -72,7 +49,7 @@ class Change( unohelper.Base, XJobExecutor ):
             'XML-RPC': 'http://',
             'XML-RPC secure': 'https://',
             'NET-RPC': 'socket://',
-        }  
+        }
         host=port=protocol=''
         if docinfo.getUserFieldValue(0):
             m = re.match('^(http[s]?://|socket://)([\w.\-]+):(\d{1,5})$',  docinfo.getUserFieldValue(0) or '')
@@ -80,7 +57,7 @@ class Change( unohelper.Base, XJobExecutor ):
             port = m.group(3)
             protocol = m.group(1)
         if  protocol:
-            for (key, value) in self.protocol.iteritems(): 
+            for (key, value) in self.protocol.iteritems():
                 if value==protocol:
                     protocol=key
                     break
@@ -102,7 +79,7 @@ class Change( unohelper.Base, XJobExecutor ):
         self.win.addButton( 'btnNext', -2, -5, 30, 15, 'Next', actionListenerProc = self.btnNext_clicked )
 
         self.win.addButton( 'btnCancel', -2 - 30 - 5 ,-5, 30, 15, 'Cancel', actionListenerProc = self.btnCancel_clicked )
-       
+
         for i in self.protocol.keys():
             self.lstProtocol.addItem(i,self.lstProtocol.getItemCount() )
         self.win.doModalDialog( "lstProtocol",  protocol)
@@ -110,27 +87,27 @@ class Change( unohelper.Base, XJobExecutor ):
     def btnNext_clicked(self, oActionEvent):
         global url
         aVal=''
-        #aVal= Fetature used 
+        #aVal= Fetature used
         try:
             url = self.protocol[self.win.getListBoxSelectedItem("lstProtocol")]+self.win.getEditText("txtHost")+":"+self.win.getEditText("txtPort")
             self.sock=RPCSession(url)
             desktop=getDesktop()
             doc = desktop.getCurrentComponent()
-            docinfo=doc.getDocumentInfo()        
+            docinfo=doc.getDocumentInfo()
             docinfo.setUserFieldValue(0,url)
             res=self.sock.listdb()
             self.win.endExecute()
             ServerParameter(aVal,url)
         except :
-            import traceback,sys 
+            import traceback,sys
             info = reduce(lambda x, y: x+y, traceback.format_exception(sys.exc_type, sys.exc_value, sys.exc_traceback))
-            self.logobj.log_write('ServerParameter', LOG_ERROR, info)     
+            self.logobj.log_write('ServerParameter', LOG_ERROR, info)
             ErrorDialog("Connection to server is fail. Please check your Server Parameter.", "", "Error!")
             self.win.endExecute()
-                 
+
     def btnCancel_clicked(self,oActionEvent):
         self.win.endExecute()
-        
+
 
 if __name__<>"package" and __name__=="__main__":
     Change(None)
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ConvertBracesToField.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ConvertBracesToField.py
index c1fa8b22a85..17cc25687b1 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ConvertBracesToField.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ConvertBracesToField.py
@@ -1,49 +1,26 @@
-##########################################################################
+#########################################################################
 #
-# Portions of this file are under the following copyright and license:
+#  Copyright (c) 2003-2004 Danny Brewer d29583@groovegarden.com
+#  Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>).
 #
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 2.1 of the License, or (at your option) any later version.
 #
-#   Copyright (c) 2003-2004 Danny Brewer
-#   d29583@groovegarden.com
+#  This library 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
+#  Lesser General Public License for more details.
 #
-#   This library is free software; you can redistribute it and/or
-#   modify it under the terms of the GNU Lesser General Public
-#   License as published by the Free Software Foundation; either
-#   version 2.1 of the License, or (at your option) any later version.
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library; if not, write to the Free Software
+#  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
-#   This library 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
-#   Lesser General Public License for more details.
+#  See:  http://www.gnu.org/licenses/lgpl.html
 #
-#   You should have received a copy of the GNU Lesser General Public
-#   License along with this library; if not, write to the Free Software
-#   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-#
-#   See:  http://www.gnu.org/licenses/lgpl.html
-#
-#
-# and other portions are under the following copyright and license:
-#
-#
-#    OpenERP, Open Source Management Solution>..
-#    Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-#
-##############################################################################
+#############################################################################
+
 import uno
 import unohelper
 import string
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ConvertFieldsToBraces.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ConvertFieldsToBraces.py
index ffa88a8cd06..b8abcb1dc6c 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ConvertFieldsToBraces.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ConvertFieldsToBraces.py
@@ -1,49 +1,25 @@
-##########################################################################
+#########################################################################
 #
-# Portions of this file are under the following copyright and license:
+#  Copyright (c) 2003-2004 Danny Brewer d29583@groovegarden.com
+#  Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>).
 #
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 2.1 of the License, or (at your option) any later version.
 #
-#   Copyright (c) 2003-2004 Danny Brewer 
-#   d29583@groovegarden.com 
-# 
-#   This library is free software; you can redistribute it and/or 
-#   modify it under the terms of the GNU Lesser General Public 
-#   License as published by the Free Software Foundation; either 
-#   version 2.1 of the License, or (at your option) any later version. 
-# 
-#   This library 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 
-#   Lesser General Public License for more details. 
-# 
-#   You should have received a copy of the GNU Lesser General Public 
-#   License along with this library; if not, write to the Free Software 
-#   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
-# 
-#   See:  http://www.gnu.org/licenses/lgpl.html 
+#  This library 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
+#  Lesser General Public License for more details.
 #
-# 
-# and other portions are under the following copyright and license:
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library; if not, write to the Free Software
+#  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
+#  See:  http://www.gnu.org/licenses/lgpl.html
 #
-#    OpenERP, Open Source Management Solution>..
-#    Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>). 
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-#
-##############################################################################
+#############################################################################
 
 import uno
 import unohelper
@@ -81,7 +57,7 @@ class ConvertFieldsToBraces( unohelper.Base, XJobExecutor ):
 if __name__<>"package":
     ConvertFieldsToBraces(None)
 else:
-    g_ImplementationHelper.addImplementation( ConvertFieldsToBraces, "org.openoffice.openerp.report.convertFB", ("com.sun.star.task.Job",),) 
+    g_ImplementationHelper.addImplementation( ConvertFieldsToBraces, "org.openoffice.openerp.report.convertFB", ("com.sun.star.task.Job",),)
 
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ExportToRML.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ExportToRML.py
index d2605ce73e4..a12becdc68c 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ExportToRML.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ExportToRML.py
@@ -1,49 +1,26 @@
-##########################################################################
+#########################################################################
 #
-# Portions of this file are under the following copyright and license:
+#  Copyright (c) 2003-2004 Danny Brewer d29583@groovegarden.com
+#  Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>).
 #
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 2.1 of the License, or (at your option) any later version.
 #
-#   Copyright (c) 2003-2004 Danny Brewer
-#   d29583@groovegarden.com
+#  This library 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
+#  Lesser General Public License for more details.
 #
-#   This library is free software; you can redistribute it and/or
-#   modify it under the terms of the GNU Lesser General Public
-#   License as published by the Free Software Foundation; either
-#   version 2.1 of the License, or (at your option) any later version.
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library; if not, write to the Free Software
+#  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
-#   This library 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
-#   Lesser General Public License for more details.
+#  See:  http://www.gnu.org/licenses/lgpl.html
 #
-#   You should have received a copy of the GNU Lesser General Public
-#   License along with this library; if not, write to the Free Software
-#   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-#
-#   See:  http://www.gnu.org/licenses/lgpl.html
-#
-#
-# and other portions are under the following copyright and license:
-#
-#
-#    OpenERP, Open Source Management Solution>..
-#    Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-#
-##############################################################################
+#############################################################################
+
 import os
 import uno
 import unohelper
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Expression.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Expression.py
index 9e3b175b67b..896a5954c7d 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Expression.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Expression.py
@@ -1,49 +1,26 @@
-##########################################################################
+#########################################################################
 #
-# Portions of this file are under the following copyright and license:
+#  Copyright (c) 2003-2004 Danny Brewer d29583@groovegarden.com
+#  Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>).
 #
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 2.1 of the License, or (at your option) any later version.
 #
-#   Copyright (c) 2003-2004 Danny Brewer 
-#   d29583@groovegarden.com 
-# 
-#   This library is free software; you can redistribute it and/or 
-#   modify it under the terms of the GNU Lesser General Public 
-#   License as published by the Free Software Foundation; either 
-#   version 2.1 of the License, or (at your option) any later version. 
-# 
-#   This library 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 
-#   Lesser General Public License for more details. 
-# 
-#   You should have received a copy of the GNU Lesser General Public 
-#   License along with this library; if not, write to the Free Software 
-#   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
-# 
-#   See:  http://www.gnu.org/licenses/lgpl.html 
+#  This library 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
+#  Lesser General Public License for more details.
 #
-# 
-# and other portions are under the following copyright and license:
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library; if not, write to the Free Software
+#  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
+#  See:  http://www.gnu.org/licenses/lgpl.html
 #
-#    OpenERP, Open Source Management Solution>..
-#    Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>). 
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-#
-##############################################################################
+#############################################################################
+
 import uno
 import string
 import unohelper
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Fields.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Fields.py
index 90f85e57a0d..8ed4d2c25e8 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Fields.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Fields.py
@@ -1,50 +1,25 @@
-##########################################################################
+#########################################################################
 #
-# Portions of this file are under the following copyright and license:
+#  Copyright (c) 2003-2004 Danny Brewer d29583@groovegarden.com
+#  Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>).
 #
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 2.1 of the License, or (at your option) any later version.
 #
-#   Copyright (c) 2003-2004 Danny Brewer 
-#   d29583@groovegarden.com 
-# 
-#   This library is free software; you can redistribute it and/or 
-#   modify it under the terms of the GNU Lesser General Public 
-#   License as published by the Free Software Foundation; either 
-#   version 2.1 of the License, or (at your option) any later version. 
-# 
-#   This library 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 
-#   Lesser General Public License for more details. 
-# 
-#   You should have received a copy of the GNU Lesser General Public 
-#   License along with this library; if not, write to the Free Software 
-#   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
-# 
-#   See:  http://www.gnu.org/licenses/lgpl.html 
+#  This library 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
+#  Lesser General Public License for more details.
 #
-# 
-# and other portions are under the following copyright and license:
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library; if not, write to the Free Software
+#  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
+#  See:  http://www.gnu.org/licenses/lgpl.html
 #
-#    OpenERP, Open Source Management Solution>..
-#    Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>). 
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-#
-##############################################################################
-
+#############################################################################
 
 import uno
 import string
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/LoginTest.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/LoginTest.py
index 85059d7712c..11c74555447 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/LoginTest.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/LoginTest.py
@@ -1,49 +1,26 @@
-##########################################################################
+#########################################################################
 #
-# Portions of this file are under the following copyright and license:
+#  Copyright (c) 2003-2004 Danny Brewer d29583@groovegarden.com
+#  Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>).
 #
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 2.1 of the License, or (at your option) any later version.
 #
-#   Copyright (c) 2003-2004 Danny Brewer 
-#   d29583@groovegarden.com 
-# 
-#   This library is free software; you can redistribute it and/or 
-#   modify it under the terms of the GNU Lesser General Public 
-#   License as published by the Free Software Foundation; either 
-#   version 2.1 of the License, or (at your option) any later version. 
-# 
-#   This library 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 
-#   Lesser General Public License for more details. 
-# 
-#   You should have received a copy of the GNU Lesser General Public 
-#   License along with this library; if not, write to the Free Software 
-#   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
-# 
-#   See:  http://www.gnu.org/licenses/lgpl.html 
+#  This library 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
+#  Lesser General Public License for more details.
 #
-# 
-# and other portions are under the following copyright and license:
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library; if not, write to the Free Software
+#  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
+#  See:  http://www.gnu.org/licenses/lgpl.html
 #
-#    OpenERP, Open Source Management Solution>..
-#    Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>). 
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-#
-##############################################################################
+#############################################################################
+
 if __name__<>"package":
     from ServerParameter import *
     from lib.gui import *
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ModifyExistingReport.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ModifyExistingReport.py
index bc7d439c76d..ef1d3548a6e 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ModifyExistingReport.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ModifyExistingReport.py
@@ -1,49 +1,25 @@
-##########################################################################
+#########################################################################
 #
-# Portions of this file are under the following copyright and license:
+#  Copyright (c) 2003-2004 Danny Brewer d29583@groovegarden.com
+#  Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>).
 #
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 2.1 of the License, or (at your option) any later version.
 #
-#   Copyright (c) 2003-2004 Danny Brewer
-#   d29583@groovegarden.com
+#  This library 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
+#  Lesser General Public License for more details.
 #
-#   This library is free software; you can redistribute it and/or
-#   modify it under the terms of the GNU Lesser General Public
-#   License as published by the Free Software Foundation; either
-#   version 2.1 of the License, or (at your option) any later version.
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library; if not, write to the Free Software
+#  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
-#   This library 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
-#   Lesser General Public License for more details.
+#  See:  http://www.gnu.org/licenses/lgpl.html
 #
-#   You should have received a copy of the GNU Lesser General Public
-#   License along with this library; if not, write to the Free Software
-#   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-#
-#   See:  http://www.gnu.org/licenses/lgpl.html
-#
-#
-# and other portions are under the following copyright and license:
-#
-#
-#    OpenERP, Open Source Management Solution>..
-#    Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-#
-##############################################################################
+#############################################################################
 
 import uno
 import string
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/NewReport.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/NewReport.py
index 138c68b690e..3c6316d9fdb 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/NewReport.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/NewReport.py
@@ -1,49 +1,26 @@
-##########################################################################
+#########################################################################
 #
-# Portions of this file are under the following copyright and license:
+#  Copyright (c) 2003-2004 Danny Brewer d29583@groovegarden.com
+#  Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>).
 #
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 2.1 of the License, or (at your option) any later version.
 #
-#   Copyright (c) 2003-2004 Danny Brewer 
-#   d29583@groovegarden.com 
-# 
-#   This library is free software; you can redistribute it and/or 
-#   modify it under the terms of the GNU Lesser General Public 
-#   License as published by the Free Software Foundation; either 
-#   version 2.1 of the License, or (at your option) any later version. 
-# 
-#   This library 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 
-#   Lesser General Public License for more details. 
-# 
-#   You should have received a copy of the GNU Lesser General Public 
-#   License along with this library; if not, write to the Free Software 
-#   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
-# 
-#   See:  http://www.gnu.org/licenses/lgpl.html 
+#  This library 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
+#  Lesser General Public License for more details.
 #
-# 
-# and other portions are under the following copyright and license:
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library; if not, write to the Free Software
+#  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
+#  See:  http://www.gnu.org/licenses/lgpl.html
 #
-#    OpenERP, Open Source Management Solution>..
-#    Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>). 
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-#
-##############################################################################
+#############################################################################
+
 import uno
 import string
 import unohelper
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Repeatln.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Repeatln.py
index f5e0972d2dd..b6edaecdc44 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Repeatln.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Repeatln.py
@@ -1,49 +1,26 @@
-##########################################################################
+#########################################################################
 #
-# Portions of this file are under the following copyright and license:
+#  Copyright (c) 2003-2004 Danny Brewer d29583@groovegarden.com
+#  Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>).
 #
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 2.1 of the License, or (at your option) any later version.
 #
-#   Copyright (c) 2003-2004 Danny Brewer 
-#   d29583@groovegarden.com 
-# 
-#   This library is free software; you can redistribute it and/or 
-#   modify it under the terms of the GNU Lesser General Public 
-#   License as published by the Free Software Foundation; either 
-#   version 2.1 of the License, or (at your option) any later version. 
-# 
-#   This library 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 
-#   Lesser General Public License for more details. 
-# 
-#   You should have received a copy of the GNU Lesser General Public 
-#   License along with this library; if not, write to the Free Software 
-#   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
-# 
-#   See:  http://www.gnu.org/licenses/lgpl.html 
+#  This library 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
+#  Lesser General Public License for more details.
 #
-# 
-# and other portions are under the following copyright and license:
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library; if not, write to the Free Software
+#  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
+#  See:  http://www.gnu.org/licenses/lgpl.html
 #
-#    OpenERP, Open Source Management Solution>..
-#    Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>). 
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-#
-##############################################################################
+#############################################################################
+
 import uno
 import string
 import unohelper
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/SendToServer.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/SendToServer.py
index 7e83910a427..dbd0a51d66d 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/SendToServer.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/SendToServer.py
@@ -1,49 +1,25 @@
-##########################################################################
+#########################################################################
 #
-# Portions of this file are under the following copyright and license:
+#  Copyright (c) 2003-2004 Danny Brewer d29583@groovegarden.com
+#  Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>).
 #
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 2.1 of the License, or (at your option) any later version.
 #
-#   Copyright (c) 2003-2004 Danny Brewer
-#   d29583@groovegarden.com
+#  This library 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
+#  Lesser General Public License for more details.
 #
-#   This library is free software; you can redistribute it and/or
-#   modify it under the terms of the GNU Lesser General Public
-#   License as published by the Free Software Foundation; either
-#   version 2.1 of the License, or (at your option) any later version.
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library; if not, write to the Free Software
+#  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
-#   This library 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
-#   Lesser General Public License for more details.
+#  See:  http://www.gnu.org/licenses/lgpl.html
 #
-#   You should have received a copy of the GNU Lesser General Public
-#   License along with this library; if not, write to the Free Software
-#   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-#
-#   See:  http://www.gnu.org/licenses/lgpl.html
-#
-#
-# and other portions are under the following copyright and license:
-#
-#
-#    OpenERP, Open Source Management Solution>..
-#    Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-#
-##############################################################################
+#############################################################################
 
 import uno
 import string
@@ -201,7 +177,7 @@ class SendtoServer(unohelper.Base, XJobExecutor):
             if self.win.getListBoxSelectedItem("lstResourceType")=='OpenOffice':
                 params['report_type']=file_type
             self.sock.execute(database, uid, self.password, 'ir.actions.report.xml', 'write', int(docinfo.getUserFieldValue(2)), params)
-            
+
             # Call upload_report as the *last* step, as it will call register_all() and cause the report service
             # to be loaded - which requires all the data to be correct in the database
             self.sock.execute(database, uid, self.password, 'ir.actions.report.xml', 'upload_report', int(docinfo.getUserFieldValue(2)),base64.encodestring(data),file_type,{})
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ServerParameter.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ServerParameter.py
index c399634bfe5..b09b02699b0 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ServerParameter.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ServerParameter.py
@@ -1,49 +1,26 @@
-##########################################################################
+#########################################################################
 #
-# Portions of this file are under the following copyright and license:
+#  Copyright (c) 2003-2004 Danny Brewer d29583@groovegarden.com
+#  Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>).
 #
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 2.1 of the License, or (at your option) any later version.
 #
-#   Copyright (c) 2003-2004 Danny Brewer
-#   d29583@groovegarden.com
+#  This library 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
+#  Lesser General Public License for more details.
 #
-#   This library is free software; you can redistribute it and/or
-#   modify it under the terms of the GNU Lesser General Public
-#   License as published by the Free Software Foundation; either
-#   version 2.1 of the License, or (at your option) any later version.
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library; if not, write to the Free Software
+#  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
-#   This library 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
-#   Lesser General Public License for more details.
+#  See:  http://www.gnu.org/licenses/lgpl.html
 #
-#   You should have received a copy of the GNU Lesser General Public
-#   License along with this library; if not, write to the Free Software
-#   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-#
-#   See:  http://www.gnu.org/licenses/lgpl.html
-#
-#
-# and other portions are under the following copyright and license:
-#
-#
-#    OpenERP, Open Source Management Solution>..
-#    Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-#
-##############################################################################
+#############################################################################
+
 import uno
 import string
 import unohelper
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Translation.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Translation.py
index 05f81a5c5b2..132882e0932 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Translation.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Translation.py
@@ -1,49 +1,25 @@
-##########################################################################
+#########################################################################
 #
-# Portions of this file are under the following copyright and license:
+#  Copyright (c) 2003-2004 Danny Brewer d29583@groovegarden.com
+#  Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>).
 #
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 2.1 of the License, or (at your option) any later version.
 #
-#   Copyright (c) 2003-2004 Danny Brewer
-#   d29583@groovegarden.com
+#  This library 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
+#  Lesser General Public License for more details.
 #
-#   This library is free software; you can redistribute it and/or
-#   modify it under the terms of the GNU Lesser General Public
-#   License as published by the Free Software Foundation; either
-#   version 2.1 of the License, or (at your option) any later version.
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library; if not, write to the Free Software
+#  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
-#   This library 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
-#   Lesser General Public License for more details.
+#  See:  http://www.gnu.org/licenses/lgpl.html
 #
-#   You should have received a copy of the GNU Lesser General Public
-#   License along with this library; if not, write to the Free Software
-#   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-#
-#   See:  http://www.gnu.org/licenses/lgpl.html
-#
-#
-# and other portions are under the following copyright and license:
-#
-#
-#    OpenERP, Open Source Management Solution>..
-#    Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-#
-##############################################################################
+#############################################################################
 
 import uno
 import string
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/__init__.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/__init__.py
index 0ccd1c9d011..d7f93351fac 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/__init__.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/__init__.py
@@ -1,49 +1,26 @@
-##########################################################################
+#########################################################################
 #
-# Portions of this file are under the following copyright and license:
+#  Copyright (c) 2003-2004 Danny Brewer d29583@groovegarden.com
+#  Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>).
 #
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 2.1 of the License, or (at your option) any later version.
 #
-#   Copyright (c) 2003-2004 Danny Brewer 
-#   d29583@groovegarden.com 
-# 
-#   This library is free software; you can redistribute it and/or 
-#   modify it under the terms of the GNU Lesser General Public 
-#   License as published by the Free Software Foundation; either 
-#   version 2.1 of the License, or (at your option) any later version. 
-# 
-#   This library 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 
-#   Lesser General Public License for more details. 
-# 
-#   You should have received a copy of the GNU Lesser General Public 
-#   License along with this library; if not, write to the Free Software 
-#   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
-# 
-#   See:  http://www.gnu.org/licenses/lgpl.html 
+#  This library 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
+#  Lesser General Public License for more details.
 #
-# 
-# and other portions are under the following copyright and license:
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library; if not, write to the Free Software
+#  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
+#  See:  http://www.gnu.org/licenses/lgpl.html
 #
-#    OpenERP, Open Source Management Solution>..
-#    Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>). 
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-#
-##############################################################################
+#############################################################################
+
 import Expression
 import lib
 import Fields
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/compile_all.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/compile_all.py
index 4740c61b178..897f9abd00c 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/compile_all.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/compile_all.py
@@ -1,49 +1,26 @@
-##########################################################################
+#########################################################################
 #
-# Portions of this file are under the following copyright and license:
+#  Copyright (c) 2003-2004 Danny Brewer d29583@groovegarden.com
+#  Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>).
 #
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 2.1 of the License, or (at your option) any later version.
 #
-#   Copyright (c) 2003-2004 Danny Brewer 
-#   d29583@groovegarden.com 
-# 
-#   This library is free software; you can redistribute it and/or 
-#   modify it under the terms of the GNU Lesser General Public 
-#   License as published by the Free Software Foundation; either 
-#   version 2.1 of the License, or (at your option) any later version. 
-# 
-#   This library 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 
-#   Lesser General Public License for more details. 
-# 
-#   You should have received a copy of the GNU Lesser General Public 
-#   License along with this library; if not, write to the Free Software 
-#   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
-# 
-#   See:  http://www.gnu.org/licenses/lgpl.html 
+#  This library 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
+#  Lesser General Public License for more details.
 #
-# 
-# and other portions are under the following copyright and license:
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library; if not, write to the Free Software
+#  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
+#  See:  http://www.gnu.org/licenses/lgpl.html
 #
-#    OpenERP, Open Source Management Solution>..
-#    Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>). 
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-#
-##############################################################################
+#############################################################################
+
 import compileall
 
 compileall.compile_dir('package')
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/actions.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/actions.py
index 8511bb8343d..cf82d0e1a76 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/actions.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/actions.py
@@ -1,47 +1,23 @@
 ##########################################################################
 #
-# Portions of this file are under the following copyright and license:
+# Copyright (c) 2003-2004 Danny Brewer   d29583@groovegarden.com
+# Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>).
 #
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
 #
-#   Copyright (c) 2003-2004 Danny Brewer 
-#   d29583@groovegarden.com 
-# 
-#   This library is free software; you can redistribute it and/or 
-#   modify it under the terms of the GNU Lesser General Public 
-#   License as published by the Free Software Foundation; either 
-#   version 2.1 of the License, or (at your option) any later version. 
-# 
-#   This library 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 
-#   Lesser General Public License for more details. 
-# 
-#   You should have received a copy of the GNU Lesser General Public 
-#   License along with this library; if not, write to the Free Software 
-#   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
-# 
-#   See:  http://www.gnu.org/licenses/lgpl.html 
+# This library 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
+# Lesser General Public License for more details.
 #
-# 
-# and other portions are under the following copyright and license:
-#
-#
-#    OpenERP, Open Source Management Solution>..
-#    Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>). 
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
+# See:  http://www.gnu.org/licenses/lgpl.html
 #
 ##############################################################################
 
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/error.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/error.py
index cb86f5f429a..f44404eaa16 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/error.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/error.py
@@ -1,47 +1,23 @@
 ##########################################################################
 #
-# Portions of this file are under the following copyright and license:
+# Copyright (c) 2003-2004 Danny Brewer   d29583@groovegarden.com
+# Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>).
 #
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
 #
-#   Copyright (c) 2003-2004 Danny Brewer 
-#   d29583@groovegarden.com 
-# 
-#   This library is free software; you can redistribute it and/or 
-#   modify it under the terms of the GNU Lesser General Public 
-#   License as published by the Free Software Foundation; either 
-#   version 2.1 of the License, or (at your option) any later version. 
-# 
-#   This library 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 
-#   Lesser General Public License for more details. 
-# 
-#   You should have received a copy of the GNU Lesser General Public 
-#   License along with this library; if not, write to the Free Software 
-#   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
-# 
-#   See:  http://www.gnu.org/licenses/lgpl.html 
+# This library 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
+# Lesser General Public License for more details.
 #
-# 
-# and other portions are under the following copyright and license:
-#
-#
-#    OpenERP, Open Source Management Solution>..
-#    Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>). 
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
+# See:  http://www.gnu.org/licenses/lgpl.html
 #
 ##############################################################################
 
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/functions.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/functions.py
index 1d10f0f6a4c..52af0821790 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/functions.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/functions.py
@@ -1,47 +1,23 @@
 ##########################################################################
 #
-# Portions of this file are under the following copyright and license:
+# Copyright (c) 2003-2004 Danny Brewer   d29583@groovegarden.com
+# Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>).
 #
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
 #
-#   Copyright (c) 2003-2004 Danny Brewer 
-#   d29583@groovegarden.com 
-# 
-#   This library is free software; you can redistribute it and/or 
-#   modify it under the terms of the GNU Lesser General Public 
-#   License as published by the Free Software Foundation; either 
-#   version 2.1 of the License, or (at your option) any later version. 
-# 
-#   This library 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 
-#   Lesser General Public License for more details. 
-# 
-#   You should have received a copy of the GNU Lesser General Public 
-#   License along with this library; if not, write to the Free Software 
-#   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
-# 
-#   See:  http://www.gnu.org/licenses/lgpl.html 
+# This library 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
+# Lesser General Public License for more details.
 #
-# 
-# and other portions are under the following copyright and license:
-#
-#
-#    OpenERP, Open Source Management Solution>..
-#    Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>). 
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
+# See:  http://www.gnu.org/licenses/lgpl.html
 #
 ##############################################################################
 
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/gui.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/gui.py
index d75469ca658..92b5ab750ca 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/gui.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/gui.py
@@ -1,47 +1,23 @@
 ##########################################################################
 #
-# Portions of this file are under the following copyright and license:
+# Copyright (c) 2003-2004 Danny Brewer   d29583@groovegarden.com
+# Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>).
 #
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
 #
-#   Copyright (c) 2003-2004 Danny Brewer 
-#   d29583@groovegarden.com 
-# 
-#   This library is free software; you can redistribute it and/or 
-#   modify it under the terms of the GNU Lesser General Public 
-#   License as published by the Free Software Foundation; either 
-#   version 2.1 of the License, or (at your option) any later version. 
-# 
-#   This library 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 
-#   Lesser General Public License for more details. 
-# 
-#   You should have received a copy of the GNU Lesser General Public 
-#   License along with this library; if not, write to the Free Software 
-#   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
-# 
-#   See:  http://www.gnu.org/licenses/lgpl.html 
+# This library 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
+# Lesser General Public License for more details.
 #
-# 
-# and other portions are under the following copyright and license:
-#
-#
-#    OpenERP, Open Source Management Solution>..
-#    Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>). 
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
+# See:  http://www.gnu.org/licenses/lgpl.html
 #
 ##############################################################################
 
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/modify.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/modify.py
index 60edbc71d96..f8d90c30d75 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/modify.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/modify.py
@@ -1,49 +1,25 @@
-##########################################################################
+#########################################################################
 #
-# Portions of this file are under the following copyright and license:
+#  Copyright (c) 2003-2004 Danny Brewer d29583@groovegarden.com
+#  Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>).
 #
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 2.1 of the License, or (at your option) any later version.
 #
-#   Copyright (c) 2003-2004 Danny Brewer
-#   d29583@groovegarden.com
+#  This library 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
+#  Lesser General Public License for more details.
 #
-#   This library is free software; you can redistribute it and/or
-#   modify it under the terms of the GNU Lesser General Public
-#   License as published by the Free Software Foundation; either
-#   version 2.1 of the License, or (at your option) any later version.
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library; if not, write to the Free Software
+#  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
-#   This library 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
-#   Lesser General Public License for more details.
+#  See:  http://www.gnu.org/licenses/lgpl.html
 #
-#   You should have received a copy of the GNU Lesser General Public
-#   License along with this library; if not, write to the Free Software
-#   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-#
-#   See:  http://www.gnu.org/licenses/lgpl.html
-#
-#
-# and other portions are under the following copyright and license:
-#
-#
-#    OpenERP, Open Source Management Solution>..
-#    Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-#
-##############################################################################
+#############################################################################
 
 import re
 import uno
diff --git a/addons/base_setup/i18n/ru.po b/addons/base_setup/i18n/ru.po
index bfc0807f019..93f65355baa 100644
--- a/addons/base_setup/i18n/ru.po
+++ b/addons/base_setup/i18n/ru.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-12-28 10:09+0000\n"
-"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
+"PO-Revision-Date: 2013-05-27 12:19+0000\n"
+"Last-Translator: leksei <lirgus@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: 2013-03-16 05:12+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-05-28 05:17+0000\n"
+"X-Generator: Launchpad (build 16640)\n"
 
 #. module: base_setup
 #: view:sale.config.settings:0
@@ -41,6 +41,8 @@ msgstr "base.config.settings"
 msgid ""
 "Use external authentication providers, sign in with google, facebook, ..."
 msgstr ""
+"Использовать внешние сервисы аутентификации, например, вход через google, "
+"facebook, ..."
 
 #. module: base_setup
 #: view:sale.config.settings:0
@@ -68,7 +70,7 @@ msgstr "Участник"
 #. module: base_setup
 #: view:base.config.settings:0
 msgid "Portal access"
-msgstr ""
+msgstr "Доступ к порталу"
 
 #. module: base_setup
 #: view:base.config.settings:0
@@ -192,6 +194,9 @@ msgid ""
 "When you create a new contact (person or company), you will be able to load "
 "all the data from LinkedIn (photos, address, etc)."
 msgstr ""
+"Когда вы создаете новый контакт (человека или компанию), у вас есть "
+"возможность загрузить из LinkedIn всю информацию о нем (адреса, фотографии и "
+"т.д.)"
 
 #. module: base_setup
 #: help:base.config.settings,module_multi_company:0
@@ -200,6 +205,9 @@ msgid ""
 "companies.\n"
 "                This installs the module multi_company."
 msgstr ""
+"Работать в режиме Мульти-компании, с соответствующими правами доступа между "
+"компаниями.\n"
+"                Будет установлен модуль multi_company."
 
 #. module: base_setup
 #: view:base.config.settings:0
@@ -208,6 +216,9 @@ msgid ""
 "You can\n"
 "                                    launch the OpenERP Server with the option"
 msgstr ""
+"Публичный портал доступен только при использовании одной базы данных. Вы "
+"можете\n"
+"                                    запустить сервер OpenERP с этой опцией"
 
 #. module: base_setup
 #: view:base.config.settings:0
@@ -215,6 +226,8 @@ msgid ""
 "You will find more options in your company details: address for the header "
 "and footer, overdue payments texts, etc."
 msgstr ""
+"Больше опций вы можете найти в настройках компании: адреса для "
+"верхнего/нижнего колонтитула, тексты для просроченных платежей и т.д."
 
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_sale_config_settings
@@ -238,6 +251,14 @@ msgid ""
 "projects,\n"
 "                                    etc."
 msgstr ""
+"Когда вы отправляете заказчику документы\n"
+"                                    (прайсы, счета), для их получения он "
+"сможет\n"
+"                                    войти на портал, где так же сможет "
+"прочитать\n"
+"                                    новости вашей компании, узнать "
+"обновления по\n"
+"                                    его проектам и т.д."
 
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_setup_terminology
@@ -252,7 +273,7 @@ msgstr "Клиент"
 #. module: base_setup
 #: help:base.config.settings,module_portal_anonymous:0
 msgid "Enable the public part of openerp, openerp becomes a public website."
-msgstr ""
+msgstr "Включая публичную часть, openerp становится общедоступным сайтом."
 
 #. module: base_setup
 #: help:sale.config.settings,module_plugin_thunderbird:0
@@ -274,13 +295,13 @@ msgstr "Контрагент"
 #. module: base_setup
 #: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
 msgid "Use another word to say \"Customer\""
-msgstr ""
+msgstr "Использовать другое слово вместо \"Заказчик\""
 
 #. module: base_setup
 #: model:ir.actions.act_window,name:base_setup.action_sale_config
 #: view:sale.config.settings:0
 msgid "Configure Sales"
-msgstr ""
+msgstr "Настройки продаж"
 
 #. module: base_setup
 #: help:sale.config.settings,module_plugin_outlook:0
@@ -297,12 +318,12 @@ msgstr ""
 #. module: base_setup
 #: view:base.config.settings:0
 msgid "Options"
-msgstr ""
+msgstr "Настройки"
 
 #. module: base_setup
 #: field:base.config.settings,module_portal:0
 msgid "Activate the customer portal"
-msgstr ""
+msgstr "Включить клиентский портал"
 
 #. module: base_setup
 #: view:base.config.settings:0
@@ -315,32 +336,32 @@ msgstr ""
 #. module: base_setup
 #: field:base.config.settings,module_share:0
 msgid "Allow documents sharing"
-msgstr ""
+msgstr "Разрешить совместный доступ к документам"
 
 #. module: base_setup
 #: view:base.config.settings:0
 msgid "(company news, jobs, contact form, etc.)"
-msgstr ""
+msgstr "(новости компании, вакансии, форма обратной связи т.д.)"
 
 #. module: base_setup
 #: field:base.config.settings,module_portal_anonymous:0
 msgid "Activate the public portal"
-msgstr ""
+msgstr "Включить публичный портал"
 
 #. module: base_setup
 #: view:base.config.settings:0
 msgid "Configure outgoing email servers"
-msgstr ""
+msgstr "Настроить сервер(а) исходящей почты"
 
 #. module: base_setup
 #: view:sale.config.settings:0
 msgid "Social Network Integration"
-msgstr ""
+msgstr "Интеграция с социальными сетями"
 
 #. module: base_setup
 #: help:base.config.settings,module_portal:0
 msgid "Give your customers access to their documents."
-msgstr ""
+msgstr "Разрешить заказчикам доступ к своим документам"
 
 #. module: base_setup
 #: view:base.config.settings:0
@@ -352,23 +373,23 @@ msgstr "Отмена"
 #: view:base.config.settings:0
 #: view:sale.config.settings:0
 msgid "Apply"
-msgstr ""
+msgstr "Применить"
 
 #. module: base_setup
 #: view:base.setup.terminology:0
 msgid "Specify Your Terminology"
-msgstr ""
+msgstr "Определить терминологию"
 
 #. module: base_setup
 #: view:base.config.settings:0
 #: view:sale.config.settings:0
 msgid "or"
-msgstr ""
+msgstr "или"
 
 #. module: base_setup
 #: view:base.config.settings:0
 msgid "Configure your company data"
-msgstr ""
+msgstr "Настроить информацию о компании"
 
 #~ msgid "City"
 #~ msgstr "Город"
diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml
index 9e026184c9d..8c48f5d7a6b 100644
--- a/addons/base_setup/res_config_view.xml
+++ b/addons/base_setup/res_config_view.xml
@@ -31,7 +31,7 @@
                     <group>
                         <label for="id" string="Email"/>
                         <div name="email">
-                            <div>
+                            <div name="email.outgoing_server">
                                 <button type="action"
                                     name="%(base.action_ir_mail_server_list)d"
                                     string="Configure outgoing email servers" class="oe_link"/>
diff --git a/addons/claim_from_delivery/i18n/ru.po b/addons/claim_from_delivery/i18n/ru.po
index 253e824d1e2..8d97086c22a 100644
--- a/addons/claim_from_delivery/i18n/ru.po
+++ b/addons/claim_from_delivery/i18n/ru.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2010-09-30 06:47+0000\n"
+"PO-Revision-Date: 2013-05-27 12:19+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: Russian <ru@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: 2013-03-16 05:41+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-05-28 05:17+0000\n"
+"X-Generator: Launchpad (build 16640)\n"
 
 #. module: claim_from_delivery
 #: view:stock.picking.out:0
@@ -25,7 +25,7 @@ msgstr ""
 #. module: claim_from_delivery
 #: model:res.request.link,name:claim_from_delivery.request_link_claim_from_delivery
 msgid "Delivery Order"
-msgstr ""
+msgstr "Заказ доставки"
 
 #. module: claim_from_delivery
 #: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
diff --git a/addons/contacts/i18n/th.po b/addons/contacts/i18n/th.po
new file mode 100644
index 00000000000..a75ecac2237
--- /dev/null
+++ b/addons/contacts/i18n/th.po
@@ -0,0 +1,37 @@
+# Thai 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: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2013-05-15 07:10+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Thai <th@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: 2013-05-16 05:12+0000\n"
+"X-Generator: Launchpad (build 16626)\n"
+
+#. module: contacts
+#: model:ir.actions.act_window,help:contacts.action_contacts
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to add a contact in your address book.\n"
+"          </p><p>\n"
+"            OpenERP helps you easily track all activities related to\n"
+"            a customer; discussions, history of business opportunities,\n"
+"            documents, etc.\n"
+"          </p>\n"
+"        "
+msgstr ""
+
+#. module: contacts
+#: model:ir.actions.act_window,name:contacts.action_contacts
+#: model:ir.ui.menu,name:contacts.menu_contacts
+msgid "Contacts"
+msgstr ""
diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index bc74c3350ac..d48226eea76 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -81,8 +81,6 @@ Dashboard for CRM will include:
         'crm_lead_view.xml',
         'crm_lead_menu.xml',
 
-        'crm_case_section_view.xml',
-
         'crm_meeting_menu.xml',
 
         'crm_phonecall_view.xml',
@@ -98,6 +96,8 @@ Dashboard for CRM will include:
 
         'res_config_view.xml',
         'base_partner_merge_view.xml',
+
+        'crm_case_section_view.xml',
     ],
     'demo': [
         'crm_demo.xml',
@@ -122,7 +122,8 @@ Dashboard for CRM will include:
         'static/src/css/crm.css'
     ],
     'js': [
-        'static/src/js/crm.js'
+        'static/lib/sparkline/jquery.sparkline.js',
+        'static/src/js/crm_case_section.js',
     ],
     'installable': True,
     'application': True,
diff --git a/addons/crm/base_partner_merge.py b/addons/crm/base_partner_merge.py
index b2645e7fb79..0a8e37b14b7 100644
--- a/addons/crm/base_partner_merge.py
+++ b/addons/crm/base_partner_merge.py
@@ -13,6 +13,7 @@ from openerp.tools import mute_logger
 # Validation Library https://pypi.python.org/pypi/validate_email/1.1
 from .validate_email import validate_email
 
+import openerp
 from openerp.osv import osv, orm
 from openerp.osv import fields
 from openerp.osv.orm import browse_record
@@ -101,14 +102,26 @@ class MergePartnerAutomatic(osv.TransientModel):
         'current_line_id': fields.many2one('base.partner.merge.line', 'Current Line'),
         'line_ids': fields.one2many('base.partner.merge.line', 'wizard_id', 'Lines'),
         'partner_ids': fields.many2many('res.partner', string='Contacts'),
+        'dst_partner_id': fields.many2one('res.partner', string='Destination Contact'),
 
         'exclude_contact': fields.boolean('A user associated to the contact'),
         'exclude_journal_item': fields.boolean('Journal Items associated to the contact'),
         'maximum_group': fields.integer("Maximum of Group of Contacts"),
     }
 
+    def default_get(self, cr, uid, fields, context=None):
+        if context is None:
+            context = {}
+        res = super(MergePartnerAutomatic, self).default_get(cr, uid, fields, context)
+        if context.get('active_model') == 'res.partner' and context.get('active_ids'):
+            partner_ids = context['active_ids']
+            res['state'] = 'selection'
+            res['partner_ids'] = partner_ids
+            res['dst_partner_id'] = self._get_ordered_partner(cr, uid, partner_ids, context=context)[-1].id
+        return res
+
     _defaults = {
-        'state': 'option',
+        'state': 'option'
     }
 
     def get_fk_on(self, cr, table):
@@ -204,8 +217,8 @@ class MergePartnerAutomatic(osv.TransientModel):
             if proxy is None:
                 return
             domain = [(field_model, '=', 'res.partner'), (field_id, '=', src.id)]
-            ids = proxy.search(cr, uid, domain, context=context)
-            return proxy.write(cr, uid, ids, {field_id: dst_partner.id}, context=context)
+            ids = proxy.search(cr, openerp.SUPERUSER_ID, domain, context=context)
+            return proxy.write(cr, openerp.SUPERUSER_ID, ids, {field_id: dst_partner.id}, context=context)
 
         update_records = functools.partial(update_records, context=context)
 
@@ -219,9 +232,9 @@ class MergePartnerAutomatic(osv.TransientModel):
 
         proxy = self.pool['ir.model.fields']
         domain = [('ttype', '=', 'reference')]
-        record_ids = proxy.search(cr, uid, domain, context=context)
+        record_ids = proxy.search(cr, openerp.SUPERUSER_ID, domain, context=context)
 
-        for record in proxy.browse(cr, uid, record_ids, context=context):
+        for record in proxy.browse(cr, openerp.SUPERUSER_ID, record_ids, context=context):
             proxy_model = self.pool[record.model]
 
             field_type = proxy_model._columns.get(record.name).__class__._type
@@ -233,11 +246,11 @@ class MergePartnerAutomatic(osv.TransientModel):
                 domain = [
                     (record.name, '=', 'res.partner,%d' % partner.id)
                 ]
-                model_ids = proxy_model.search(cr, uid, domain, context=context)
+                model_ids = proxy_model.search(cr, openerp.SUPERUSER_ID, domain, context=context)
                 values = {
                     record.name: 'res.partner,%d' % dst_partner.id,
                 }
-                proxy_model.write(cr, uid, model_ids, values, context=context)
+                proxy_model.write(cr, openerp.SUPERUSER_ID, model_ids, values, context=context)
 
     def _update_values(self, cr, uid, src_partners, dst_partner, context=None):
         _logger.debug('_update_values for dst_partner: %s for src_partners: %r', dst_partner.id, list(map(operator.attrgetter('id'), src_partners)))
@@ -266,22 +279,31 @@ class MergePartnerAutomatic(osv.TransientModel):
                 _logger.info('Skip recursive partner hierarchies for parent_id %s of partner: %s', parent_id, dst_partner.id)
 
     @mute_logger('openerp.osv.expression', 'openerp.osv.orm')
-    def _merge(self, cr, uid, partner_ids, context=None):
+    def _merge(self, cr, uid, partner_ids, dst_partner=None, context=None):
         proxy = self.pool.get('res.partner')
 
         partner_ids = proxy.exists(cr, uid, list(partner_ids), context=context)
         if len(partner_ids) < 2:
             return
 
-        partners = proxy.browse(cr, uid, list(partner_ids), context=context)
-        ordered_partners = sorted(sorted(partners,
-                                key=operator.attrgetter('create_date'), reverse=True),
-                                    key=operator.attrgetter('active'), reverse=True)
+        if len(partner_ids) > 3:
+            raise osv.except_osv(_('Error'), _("For safety reasons, you cannot merge more than 3 contacts together. You can re-open the wizard several times if needed."))
 
-        dst_partner = ordered_partners[-1]
-        src_partners = ordered_partners[:-1]
+        if openerp.SUPERUSER_ID != uid and len(set(partner.email for partner in proxy.browse(cr, uid, partner_ids, context=context))) > 1:
+            raise osv.except_osv(_('Error'), _("All contacts must have the same email. Only the Administrator can merge contacts with different emails."))
+
+        if dst_partner and dst_partner.id in partner_ids:
+            src_partners = proxy.browse(cr, uid, [id for id in partner_ids if id != dst_partner.id], context=context)
+        else:
+            ordered_partners = self._get_ordered_partner(cr, uid, partner_ids, context)
+            dst_partner = ordered_partners[-1]
+            src_partners = ordered_partners[:-1]
         _logger.info("dst_partner: %s", dst_partner.id)
 
+        if openerp.SUPERUSER_ID != uid and self._model_is_installed(cr, uid, 'account.move.line', context=context) and \
+                self.pool.get('account.move.line').search(cr, openerp.SUPERUSER_ID, [('partner_id', 'in', [partner.id for partner in src_partners])], context=context):
+            raise osv.except_osv(_('Error'), _("Only the destination contact may be linked to existing Journal Items. Please ask the Administrator if you need to merge several contacts linked to existing Journal Items."))
+
         call_it = lambda function: function(cr, uid, src_partners, dst_partner,
                                             context=context)
 
@@ -289,12 +311,12 @@ class MergePartnerAutomatic(osv.TransientModel):
         call_it(self._update_reference_fields)
         call_it(self._update_values)
 
-        _logger.info("---merged---")
-
+        _logger.info('(uid = %s) merged the partners %r with %s', uid, list(map(operator.attrgetter('id'), src_partners)), dst_partner.id)
+        dst_partner.message_post(body='%s %s'%(_("Merged with the following partners:"), ", ".join('%s<%s>(ID %s)' % (p.name, p.email or 'n/a', p.id) for p in src_partners)))
+        
         for partner in src_partners:
             partner.unlink()
 
-
     def clean_emails(self, cr, uid, context=None):
         """
         Clean the email address of the partner, if there is an email field with
@@ -414,9 +436,16 @@ class MergePartnerAutomatic(osv.TransientModel):
         this = self.browse(cr, uid, ids[0], context=context)
         if this.current_line_id:
             this.current_line_id.unlink()
-        return self._next_screen(this)
+        return self._next_screen(cr, uid, this, context)
 
-    def _next_screen(self, this):
+    def _get_ordered_partner(self, cr, uid, partner_ids, context=None):
+        partners = self.pool.get('res.partner').browse(cr, uid, list(partner_ids), context=context)
+        ordered_partners = sorted(sorted(partners,
+                            key=operator.attrgetter('create_date'), reverse=True),
+                                key=operator.attrgetter('active'), reverse=True)
+        return ordered_partners
+
+    def _next_screen(self, cr, uid, this, context=None):
         this.refresh()
         values = {}
         if this.line_ids:
@@ -426,6 +455,7 @@ class MergePartnerAutomatic(osv.TransientModel):
             values.update({
                 'current_line_id': current_line.id,
                 'partner_ids': [(6, 0, current_partner_ids)],
+                'dst_partner_id': self._get_ordered_partner(cr, uid, current_partner_ids, context)[-1].id,
                 'state': 'selection',
             })
         else:
@@ -525,7 +555,7 @@ class MergePartnerAutomatic(osv.TransientModel):
         query = self._generate_query(groups, this.maximum_group)
         self._process_query(cr, uid, ids, query, context=context)
 
-        return self._next_screen(this)
+        return self._next_screen(cr, uid, this, context)
 
     def automatic_process_cb(self, cr, uid, ids, context=None):
         assert is_integer_list(ids)
@@ -666,7 +696,7 @@ class MergePartnerAutomatic(osv.TransientModel):
         #         p1.parent_id = p1.id
         # """)
 
-        return self._next_screen(this)
+        return self._next_screen(cr, uid, this, context)
 
     def merge_cb(self, cr, uid, ids, context=None):
         assert is_integer_list(ids)
@@ -685,33 +715,12 @@ class MergePartnerAutomatic(osv.TransientModel):
                 'target': 'new',
             }
 
-        self._merge(cr, uid, partner_ids, context=context)
+        self._merge(cr, uid, partner_ids, this.dst_partner_id, context=context)
 
-        this.current_line_id.unlink()
+        if this.current_line_id:
+            this.current_line_id.unlink()
 
-        return self._next_screen(this)
-
-    def merge_multi(self, cr, uid, ids, context=None):
-
-        active_model = context.get('active_model')
-        if active_model != 'res.partner':
-            raise osv.except_osv(
-                _('Error'),
-                _('This wizard can only used with the Partners')
-            )
-
-        partner_ids = context.get('active_ids', [])
-
-        MINIMAL_NUMBER = 2
-        if len(partner_ids) < MINIMAL_NUMBER:
-            raise osv.except_osv(
-                _('Error'),
-                _("You can't use this wizard with only one Partner")
-            )
-
-        self._merge(cr, uid, partner_ids, context=context)
-
-        return True
+        return self._next_screen(cr, uid, this, context)
 
     def auto_set_parent_id(self, cr, uid, ids, context=None):
         assert is_integer_list(ids)
diff --git a/addons/crm/base_partner_merge_view.xml b/addons/crm/base_partner_merge_view.xml
index 74e7a72d7a8..8ce0b5fd99f 100644
--- a/addons/crm/base_partner_merge_view.xml
+++ b/addons/crm/base_partner_merge_view.xml
@@ -68,9 +68,9 @@
                             OpenERP will propose you to merge only those having
                             all these fields in common. (not one of the fields).
                         </p>
-                        <group attrs="{'invisible': [('state', 'not in', ('selection', 'finished'))]}">
+                        <group attrs="{'invisible': ['|', ('state', 'not in', ('selection', 'finished')), ('number_group', '=', 0)]}">
                             <field name="state" invisible="1" />
-                            <field name="number_group" invisible="0" />
+                            <field name="number_group"/>
                         </group>
                         <group string="Search duplicates based on duplicated data in"
                             attrs="{'invisible': [('state', 'not in', ('option',))]}">
@@ -98,15 +98,15 @@
                                 redirected to the aggregated contact. You can remove
                                 contacts from this list to avoid merging them.
                             </p>
+                            <field name="dst_partner_id" domain="[('id', 'in', partner_ids and partner_ids[0] and partner_ids[0][2] or False)]" attrs="{'required': [('state', '=', 'selection')]}"/>
                             <field name="partner_ids" nolabel="1">
                                 <tree string="Partners">
                                     <field name="id" />
-                                    <field name="name" />
+                                    <field name="display_name" />
                                     <field name="email" />
                                     <field name="is_company" />
                                     <field name="vat" />
                                     <field name="country_id" />
-                                    <field name="parent_id" />
                                 </tree>
                             </field>
                         </group>
@@ -114,24 +114,9 @@
                 </form>
             </field>
         </record>
-
-        <record model="ir.actions.server"
-            id="ir_actions_server_merge_automatic">
-            <field name="code">pool.get('base.partner.merge.automatic.wizard').merge_multi(cr, uid, None, context)</field>
-            <field name="condition">True</field>
-            <field name="model_id" ref="base.model_res_partner" />
-            <field name="name">Automatic Merge</field>
-            <field name="sequence" eval="5" />
-            <field name="state">code</field>
-            <field name="type">ir.actions.server</field>
-        </record>
-
-        <record model="ir.values" id="ir_open_merge_automatic">
-            <field name="key2" eval="'client_action_multi'" />
-            <field name="model">res.partner</field>
-            <field name="name">Automatic Merge</field>
-            <field name="value" eval="'ir.actions.server,%d' % ir_actions_server_merge_automatic" />
-        </record>
+        
+        <act_window id="action_partner_merge" res_model="base.partner.merge.automatic.wizard" src_model="res.partner"
+            target="new" multi="True" key2="client_action_multi" view_mode="form" name="Automatic Merge"/>
 
     </data>
 
diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index 7b6fe02afa8..4c9a60634a5 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -19,13 +19,12 @@
 #
 ##############################################################################
 
-import base64
-import time
-from lxml import etree
+from datetime import date, datetime
+from dateutil import relativedelta
+
+from openerp import tools
 from openerp.osv import fields
 from openerp.osv import osv
-from openerp import tools
-from openerp.tools.translate import _
 
 MAX_LEVEL = 15
 AVAILABLE_STATES = [
@@ -106,10 +105,57 @@ class crm_case_section(osv.osv):
     _inherit = "mail.thread"
     _description = "Sales Teams"
     _order = "complete_name"
+    # number of periods for lead/opportunities/... tracking in salesteam kanban dashboard/kanban view
+    _period_number = 5
 
     def get_full_name(self, cr, uid, ids, field_name, arg, context=None):
         return dict(self.name_get(cr, uid, ids, context=context))
 
+    def __get_bar_values(self, cr, uid, obj, domain, read_fields, value_field, groupby_field, context=None):
+        """ Generic method to generate data for bar chart values using SparklineBarWidget.
+            This method performs obj.read_group(cr, uid, domain, read_fields, groupby_field).
+
+            :param obj: the target model (i.e. crm_lead)
+            :param domain: the domain applied to the read_group
+            :param list read_fields: the list of fields to read in the read_group
+            :param str value_field: the field used to compute the value of the bar slice
+            :param str groupby_field: the fields used to group
+
+            :return list section_result: a list of dicts: [
+                                                {   'value': (int) bar_column_value,
+                                                    'tootip': (str) bar_column_tooltip,
+                                                }
+                                            ]
+        """
+        month_begin = date.today().replace(day=1)
+        section_result = [{
+                            'value': 0,
+                            'tooltip': (month_begin + relativedelta.relativedelta(months=-i)).strftime('%B'),
+                            } for i in range(self._period_number - 1, -1, -1)]
+        group_obj = obj.read_group(cr, uid, domain, read_fields, groupby_field, context=context)
+        for group in group_obj:
+            group_begin_date = datetime.strptime(group['__domain'][0][2], tools.DEFAULT_SERVER_DATE_FORMAT)
+            month_delta = relativedelta.relativedelta(month_begin, group_begin_date)
+            section_result[self._period_number - (month_delta.months + 1)] = {'value': group.get(value_field, 0), 'tooltip': group_begin_date.strftime('%B')}
+        return section_result
+
+    def _get_opportunities_data(self, cr, uid, ids, field_name, arg, context=None):
+        """ Get opportunities-related data for salesteam kanban view
+            monthly_open_leads: number of open lead during the last months
+            monthly_planned_revenue: planned revenu of opportunities during the last months
+        """
+        obj = self.pool.get('crm.lead')
+        res = dict.fromkeys(ids, False)
+        month_begin = date.today().replace(day=1)
+        groupby_begin = (month_begin + relativedelta.relativedelta(months=-4)).strftime(tools.DEFAULT_SERVER_DATE_FORMAT)
+        for id in ids:
+            res[id] = dict()
+            lead_domain = [('type', '=', 'lead'), ('section_id', '=', id), ('create_date', '>=', groupby_begin)]
+            res[id]['monthly_open_leads'] = self.__get_bar_values(cr, uid, obj, lead_domain, ['create_date'], 'create_date_count', 'create_date', context=context)
+            opp_domain = [('type', '=', 'opportunity'), ('section_id', '=', id), ('create_date', '>=', groupby_begin)]
+            res[id]['monthly_planned_revenue'] = self.__get_bar_values(cr, uid, obj, opp_domain, ['planned_revenue', 'create_date'], 'planned_revenue', 'create_date', context=context)
+        return res
+
     _columns = {
         'name': fields.char('Sales Team', size=64, required=True, translate=True),
         'complete_name': fields.function(get_full_name, type='char', size=256, readonly=True, store=True),
@@ -129,15 +175,16 @@ class crm_case_section(osv.osv):
         'alias_id': fields.many2one('mail.alias', 'Alias', ondelete="cascade", required=True,
                                     help="The email address associated with this team. New emails received will automatically "
                                          "create new leads assigned to the team."),
-        'open_lead_ids': fields.one2many('crm.lead', 'section_id',
-            string='Open Leads', readonly=True,
-            domain=['&', ('type', '!=', 'opportunity'), ('state', 'not in', ['done', 'cancel'])]),
-        'open_opportunity_ids': fields.one2many('crm.lead', 'section_id',
-            string='Open Opportunities', readonly=True,
-            domain=['&', '|', ('type', '=', 'opportunity'), ('type', '=', 'both'), ('state', 'not in', ['done', 'cancel'])]),
         'color': fields.integer('Color Index'),
         'use_leads': fields.boolean('Leads',
-            help="This enables the management of leads in the sales team. Otherwise the sales team manages only opportunities."),
+            help="The first contact you get with a potential customer is a lead you qualify before converting it into a real business opportunity. Check this box to manage leads in this sales team."),
+
+        'monthly_open_leads': fields.function(_get_opportunities_data,
+            type="string", readonly=True, multi='_get_opportunities_data',
+            string='Open Leads per Month'),
+        'monthly_planned_revenue': fields.function(_get_opportunities_data,
+            type="string", readonly=True, multi='_get_opportunities_data',
+            string='Planned Revenue per Month')
     }
 
     def _get_stage_common(self, cr, uid, context):
diff --git a/addons/crm/crm_action_rule_demo.xml b/addons/crm/crm_action_rule_demo.xml
index bf1f7d4082f..7204f666db5 100644
--- a/addons/crm/crm_action_rule_demo.xml
+++ b/addons/crm/crm_action_rule_demo.xml
@@ -26,6 +26,7 @@ Description: [[object.description]]
             <field name="name">Set Auto Reminder on leads which are not open since 5 days.</field>
             <field name="model_id" ref="model_crm_lead"/>
             <field name="sequence">1</field>
+            <field name="kind">on_time</field>
             <field name="filter_id" ref="filter_draft_lead"/>
             <field name="trg_date_id" ref="field_crm_lead_create_date"/>
             <field name="trg_date_range">5</field>
@@ -54,12 +55,10 @@ object.write({'section_id': sales_team.id})
             <field name="name">Set Auto Followers on leads which are urgent and come from USA.</field>
             <field name="model_id" ref="model_crm_lead"/>
             <field name="sequence">2</field>
+            <field name="kind">on_create</field>
             <field name="filter_id" ref="filter_usa_lead"/>
-            <field name="act_followers" eval="[(6,0,[ref('base.res_partner_4'), ref('base.res_partner_5'), ref('base.res_partner_6')])]"/>
             <field name="act_user_id" ref="base.user_root"/>
-            <field name="trg_date_id" ref="field_crm_lead_create_date"/>
-            <field name="trg_date_range">0</field>
-            <field name="trg_date_range_type">minutes</field>
+            <field name="act_followers" eval="[(6,0,[ref('base.res_partner_4'), ref('base.res_partner_5'), ref('base.res_partner_6')])]"/>
             <field name="server_action_ids" eval="[(6,0,[ref('action_set_team_sales_department')])]"/>
         </record>
     </data>
diff --git a/addons/crm/crm_case_section_view.xml b/addons/crm/crm_case_section_view.xml
index c788872b47e..be5611c03c4 100644
--- a/addons/crm/crm_case_section_view.xml
+++ b/addons/crm/crm_case_section_view.xml
@@ -43,8 +43,7 @@
             <field name="search_view_id" ref="crm.view_crm_case_opportunities_filter"/>
             <field name="context">{
                     'search_default_section_id': [active_id],
-                    'search_default_new': 1,
-                    'search_default_open': 1,
+                    'search_default_assigned_to_me': 1,
                     'default_section_id': active_id,
                     'stage_type': 'opportunity',
                     'default_type': 'opportunity',
@@ -79,12 +78,12 @@
                     <field name="note"/>
                     <field name="alias_id"/>
                     <field name="color"/>
-                    <field name="open_lead_ids"/>
-                    <field name="open_opportunity_ids"/>
+                    <field name="monthly_open_leads"/>
+                    <field name="monthly_planned_revenue"/>
                     <templates>
                         <t t-name="kanban-box">
-                            <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_project oe_kanban_global_click oe_kanban_crm_salesteams">
-                                <div class="oe_dropdown_toggle oe_dropdown_kanban" groups="base.group_user">
+                            <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_global_click oe_kanban_crm_salesteams">
+                                <div class="oe_dropdown_toggle oe_dropdown_kanban" groups="base.group_sale_manager">
                                     <span class="oe_e">í</span>
                                     <ul class="oe_dropdown_menu">
                                         <li t-if="widget.view.is_action_enabled('edit')"><a type="edit">Sales Teams Settings</a></li>
@@ -93,25 +92,19 @@
                                     </ul>
                                 </div>
                                 <div class="oe_kanban_content">
-                                    <h4><field name="name"/></h4>
-                                    <div class="oe_kanban_alias" t-if="record.use_leads.raw_value and record.alias_id.value">
-                                        <span class="oe_e">%%</span><small><field name="alias_id"/></small>
+                                    <h4 class="oe_center"><field name="name"/></h4>
+                                    <div class="oe_kanban_alias oe_center" t-if="record.use_leads.raw_value and record.alias_id.value">
+                                        <small><span class="oe_e" style="float: none;">%%</span><t t-raw="record.alias_id.raw_value[1]"/></small>
                                     </div>
                                     <div class="oe_items_list">
-                                        <a t-if="record.use_leads.raw_value" name="%(crm_case_form_view_salesteams_lead)d" type="action">
-                                            <t t-raw="record.open_lead_ids.raw_value.length"/>
-                                            <t t-if="record.open_lead_ids.raw_value.length &gt;= 2">Leads</t>
-                                            <t t-if="record.open_lead_ids.raw_value.length &lt; 2">Lead</t></a>
-                                        <a name="%(crm_case_form_view_salesteams_opportunity)d" type="action">
-                                            <t t-raw="record.open_opportunity_ids.raw_value.length"/>
-                                            <t t-if="record.open_opportunity_ids.raw_value.length &gt;= 2">Opportunities</t>
-                                            <t t-if="record.open_opportunity_ids.raw_value.length &lt; 2">Opportunity</t></a>
-                                    </div>
-                                    <div class="oe_avatars">
-                                        <img t-if="record.user_id.raw_value" t-att-src="kanban_image('res.users', 'image_small', record.user_id.raw_value)" t-att-data-member_id="record.user_id.raw_value"/>
-                                        <t t-foreach="record.member_ids.raw_value.slice(0,11)" t-as="member">
-                                            <img t-att-src="kanban_image('res.users', 'image_small', member)" t-att-data-member_id="member"/>
-                                        </t>
+                                        <div class="oe_salesteams_leads" t-if="record.use_leads.raw_value">
+                                            <a name="%(crm_case_form_view_salesteams_lead)d" type="action">Leads</a>
+                                            <a name="%(action_report_crm_lead)d" type="action" class="oe_sparkline_bar_link"><field name="monthly_open_leads" widget="sparkline_bar">Open Leads per Month<br/>Click to see a detailed analysis of leads.</field></a>
+                                        </div>
+                                        <div class="oe_salesteams_opportunities">
+                                            <a name="%(crm_case_form_view_salesteams_opportunity)d" type="action">Opportunities</a>
+                                            <a name="%(action_report_crm_opportunity)d" type="action"><field name="monthly_planned_revenue" widget="sparkline_bar">Planned Revenue per Month<br/>Click to see a detailed analysis of opportunities.</field></a>
+                                        </div>
                                     </div>
                                 </div>
                             </div>
@@ -121,6 +114,27 @@
             </field>
         </record>
 
+        <!-- Case Sections Search view -->
+
+        <record id="crm_case_section_salesteams_search" model="ir.ui.view">
+            <field name="name">Case Sections - Search</field>
+            <field name="model">crm.case.section</field>
+            <field name="arch" type="xml">
+                <search string="Salesteams Search">
+                    <field name="name"/>
+                    <field name="parent_id"/>
+                    <field name="user_id"/>
+                    <field name="note"/>
+                    <field name="code"/>
+                    <filter name="personal" string="My Salesteams" domain="['|', ('member_ids', '=', uid), ('user_id', '=', uid)]"/>
+                    <group expand="0" string="Group By...">
+                        <filter string="Team Leader" domain="[]" context="{'group_by':'user_id'}"/>
+                        <filter string="Parent Sales Teams" domain="[]" context="{'group_by':'parent_id'}"/>
+                    </group>
+                </search>
+            </field>
+        </record>
+
         <!-- Case Sections Action -->
 
         <record id="crm_case_section_salesteams_act" model="ir.actions.act_window">
@@ -128,6 +142,7 @@
             <field name="res_model">crm.case.section</field>
             <field name="view_type">form</field>
             <field name="view_mode">kanban,tree,form</field>
+            <field name="context">{'search_default_personal': True}</field>
             <field name="view_id" ref="crm_case_section_salesteams_view_kanban"/>
             <field name="help" type="html">
                 <p class="oe_view_nocontent_create">
@@ -149,9 +164,9 @@
                 <form string="Sales Team" version="7.0">
                     <sheet>
                         <div class="oe_title">
-                            <label for="name" class="oe_edit_only" string="Project Name"/>
+                            <label for="name" class="oe_edit_only" string="Sales team"/>
                             <h1>
-                                <field name="name" string="Project Name"/>
+                                <field name="name" string="Salesteam"/>
                             </h1>
                             <div name="group_alias"
                                     attrs="{'invisible': [('alias_domain', '=', False)]}">
@@ -169,25 +184,18 @@
                             </div>
                         </div>
                         <group>
-                            <group>
-                                <field name="parent_id"/>
-                                <field name="resource_calendar_id"/>
-                                <field name="active"/>
-                            </group>
                             <group>
                                 <field name="user_id"/>
                                 <field name="code"/>
                             </group>
-                            <group colspan="4" attrs="{'invisible': [('use_leads', '=', False)]}">
-                                
+                            <group>
+                                <field name="parent_id"/>
+                                <field name="change_responsible"/>
+                                <field name="active"/>
                             </group>
                         </group>
                         <notebook colspan="4">
-                            <page string="Sales Team">
-                               <group>
-                                    <field name="change_responsible"/>
-                                </group>
-                                <separator string="Team Members"/>
+                            <page string="Team Members">
                                 <field name="member_ids" widget="many2many_kanban">
                                     <kanban quick_create="false" create="true">
                                         <field name="name"/>
diff --git a/addons/crm/crm_data.xml b/addons/crm/crm_data.xml
index f24aee13c1d..1f1bd74391a 100644
--- a/addons/crm/crm_data.xml
+++ b/addons/crm/crm_data.xml
@@ -27,9 +27,10 @@
         </record>
 
         <record model="crm.case.section" id="section_sales_department">
-            <field name="name">Sales</field>
-            <field name="code">Sales</field>
+            <field name="name">Direct Sales</field>
+            <field name="code">DM</field>
             <field name="use_leads">True</field>
+            <field name="alias_name">info</field>
             <field name="member_ids" eval="[(4, ref('base.user_root'))]"/>
         </record>
 
diff --git a/addons/crm/crm_demo.xml b/addons/crm/crm_demo.xml
index 203193dc3bc..2858250e86a 100644
--- a/addons/crm/crm_demo.xml
+++ b/addons/crm/crm_demo.xml
@@ -7,27 +7,13 @@
         </record>
 
         <record model="crm.case.section" id="crm_case_section_1">
-            <field name="name">Sales Marketing Department</field>
-            <field name="code">SMD</field>
-            <field name="parent_id" ref="crm.section_sales_department"/>
+            <field name="name">Indirect Sales</field>
+            <field name="code">IM</field>
         </record>
 
         <record model="crm.case.section" id="crm_case_section_2">
-            <field name="name">Support Department</field>
+            <field name="name">Marketing</field>
             <field name="code">SPD</field>
-            <field name="parent_id" ref="crm.section_sales_department"/>
-        </record>
-
-        <record model="crm.case.section" id="crm_case_section_3">
-            <field name="name">Direct Marketing</field>
-            <field name="code">DM</field>
-            <field name="parent_id" ref="crm.section_sales_department"/>
-        </record>
-
-        <record model="crm.case.section" id="crm_case_section_4">
-            <field name="name">Online Support</field>
-            <field name="code">OS</field>
-            <field name="parent_id" ref="crm.crm_case_section_2"/>
         </record>
 
         <record model="crm.segmentation" id="crm_segmentation0">
diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 61e8c75cea8..455ad89003c 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -23,8 +23,9 @@ from openerp.addons.base_status.base_stage import base_stage
 import crm
 from datetime import datetime
 from operator import itemgetter
-from openerp.osv import fields, osv
+from openerp.osv import fields, osv, orm
 import time
+from openerp import SUPERUSER_ID
 from openerp import tools
 from openerp.tools.translate import _
 from openerp.tools import html2plaintext
@@ -274,7 +275,7 @@ class crm_lead(base_stage, format_address, osv.osv):
         'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority', select=True),
         'date_closed': fields.datetime('Closed', readonly=True),
         'stage_id': fields.many2one('crm.case.stage', 'Stage', track_visibility='onchange',
-                        domain="['&', '&', ('fold', '=', False), ('section_ids', '=', section_id), '|', ('type', '=', type), ('type', '=', 'both')]"),
+                        domain="['&', ('section_ids', '=', section_id), '|', ('type', '=', type), ('type', '=', 'both')]"),
         'user_id': fields.many2one('res.users', 'Salesperson', select=True, track_visibility='onchange'),
         'referred': fields.char('Referred By', size=64),
         'date_open': fields.datetime('Opened', readonly=True),
@@ -366,8 +367,8 @@ class crm_lead(base_stage, format_address, osv.osv):
     def on_change_user(self, cr, uid, ids, user_id, context=None):
         """ When changing the user, also set a section_id or restrict section id
             to the ones user_id is member of. """
-        section_id = False
-        if user_id:
+        section_id = self._get_default_section_id(cr, uid, context=context) or False
+        if user_id and not section_id:
             section_ids = self.pool.get('crm.case.section').search(cr, uid, ['|', ('user_id', '=', user_id), ('member_ids', '=', user_id)], context=context)
             if section_ids:
                 section_id = section_ids[0]
@@ -980,15 +981,28 @@ class crm_lead(base_stage, format_address, osv.osv):
     def message_get_reply_to(self, cr, uid, ids, context=None):
         """ Override to get the reply_to of the parent project. """
         return [lead.section_id.message_get_reply_to()[0] if lead.section_id else False
-                    for lead in self.browse(cr, uid, ids, context=context)]
+                    for lead in self.browse(cr, SUPERUSER_ID, ids, context=context)]
+
+    def _get_formview_action(self, cr, uid, id, context=None):
+        action = super(crm_lead, self)._get_formview_action(cr, uid, id, context=context)
+        obj = self.browse(cr, uid, id, context=context)
+        if obj.type == 'opportunity':
+            model, view_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'crm', 'crm_case_form_view_oppor')
+            action.update({
+                'views': [(view_id, 'form')],
+                })
+        return action
 
     def message_get_suggested_recipients(self, cr, uid, ids, context=None):
         recipients = super(crm_lead, self).message_get_suggested_recipients(cr, uid, ids, context=context)
-        for lead in self.browse(cr, uid, ids, context=context):
-            if lead.partner_id:
-                self._message_add_suggested_recipient(cr, uid, recipients, lead, partner=lead.partner_id, reason=_('Customer'))
-            elif lead.email_from:
-                self._message_add_suggested_recipient(cr, uid, recipients, lead, email=lead.email_from, reason=_('Customer Email'))
+        try:
+            for lead in self.browse(cr, uid, ids, context=context):
+                if lead.partner_id:
+                    self._message_add_suggested_recipient(cr, uid, recipients, lead, partner=lead.partner_id, reason=_('Customer'))
+                elif lead.email_from:
+                    self._message_add_suggested_recipient(cr, uid, recipients, lead, email=lead.email_from, reason=_('Customer Email'))
+        except (osv.except_osv, orm.except_orm):  # no read access rights -> just ignore suggested recipients because this imply modifying followers
+            pass
         return recipients
 
     def message_new(self, cr, uid, msg, custom_values=None, context=None):
diff --git a/addons/crm/crm_lead_demo.xml b/addons/crm/crm_lead_demo.xml
index 21d60ad2961..e7e6beae33e 100644
--- a/addons/crm/crm_lead_demo.xml
+++ b/addons/crm/crm_lead_demo.xml
@@ -20,7 +20,7 @@
             <field name="categ_ids" eval="[(6, 0, [categ_oppor6])]"/>
             <field name="channel_id" ref="crm_case_channel_email"/>
             <field name="priority">1</field>
-            <field name="section_id" ref="crm_case_section_4"/>
+            <field name="section_id" ref="crm_case_section_2"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="stage_id" ref="stage_lead1"/>
             <field name="description">Hello,
@@ -44,7 +44,7 @@ Can you send me the details ?</field>
             <field name="categ_ids" eval="[(6, 0, [categ_oppor2])]"/>
             <field name="channel_id" ref="crm_case_channel_website"/>
             <field name="priority">4</field>
-            <field name="section_id" ref="crm_case_section_3"/>
+            <field name="section_id" ref="crm_case_section_2"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="stage_id" ref="stage_lead1"/>
             <field eval="1" name="active"/>
@@ -63,7 +63,7 @@ Can you send me the details ?</field>
             <field name="categ_ids" eval="[(6, 0, [categ_oppor4])]"/>
             <field name="channel_id" ref=""/>
             <field name="priority">2</field>
-            <field name="section_id" ref="crm_case_section_2"/>
+            <field name="section_id" ref="crm_case_section_1"/>
             <field name="user_id" ref="base.user_demo"/>
             <field name="stage_id" ref="stage_lead2"/>
             <field eval="1" name="active"/>
@@ -82,7 +82,7 @@ Can you send me the details ?</field>
             <field name="categ_ids" eval="[(6, 0, [categ_oppor5])]"/>
             <field name="channel_id" ref=""/>
             <field name="priority">3</field>
-            <field name="section_id" ref="crm_case_section_2"/>
+            <field name="section_id" ref="crm_case_section_1"/>
             <field name="user_id" ref=""/>
             <field name="stage_id" ref="stage_lead7"/>
             <field eval="1" name="active"/>
@@ -133,7 +133,7 @@ Contact: +1 813 494 5005</field>
             <field name="categ_ids" eval="[(6, 0, [categ_oppor3,categ_oppor4])]"/>
             <field name="channel_id" ref=""/>
             <field name="priority">3</field>
-            <field name="section_id" ref="crm_case_section_4"/>
+            <field name="section_id" ref="crm_case_section_2"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="stage_id" ref="stage_lead1"/>
             <field eval="1" name="active"/>
@@ -152,7 +152,7 @@ Contact: +1 813 494 5005</field>
             <field name="categ_ids" eval="[(6, 0, [categ_oppor4])]"/>
             <field name="channel_id" ref=""/>
             <field name="priority">5</field>
-            <field name="section_id" ref="crm_case_section_4"/>
+            <field name="section_id" ref="crm_case_section_2"/>
             <field name="user_id" ref="base.user_demo"/>
             <field name="stage_id" ref="stage_lead7"/>
             <field eval="1" name="active"/>
@@ -197,6 +197,9 @@ Contact: +1 813 494 5005</field>
             <field name="stage_id" ref="stage_lead1"/>
             <field eval="1" name="active"/>
         </record>
+        <record id="crm_case_9" model="crm.lead">
+            <field name="create_date" eval="(DateTime.today() - relativedelta(months=1)).strftime('%Y-%m-%d %H:%M')"/>
+        </record>
 
         <record id="crm_case_10" model="crm.lead">
             <field name="type">lead</field>
@@ -211,7 +214,7 @@ Contact: +1 813 494 5005</field>
             <field name="categ_ids" eval="[(6, 0, [categ_oppor1])]"/>
             <field name="channel_id" ref="crm_case_channel_email"/>
             <field name="priority">2</field>
-            <field name="section_id" ref="crm_case_section_3"/>
+            <field name="section_id" ref="crm_case_section_2"/>
             <field name="user_id" ref=""/>
             <field name="stage_id" ref="stage_lead1"/>
             <field name="description">Hi,
@@ -235,7 +238,7 @@ Andrew</field>
             <field name="categ_ids" eval="[(6, 0, [categ_oppor7])]"/>
             <field name="channel_id" ref="crm_case_channel_direct"/>
             <field name="priority">3</field>
-            <field name="section_id" ref="crm_case_section_2"/>
+            <field name="section_id" ref="crm_case_section_1"/>
             <field name="user_id" ref="base.user_demo"/>
             <field name="stage_id" ref="stage_lead1"/>
             <field eval="1" name="active"/>
@@ -291,7 +294,7 @@ Andrew</field>
             <field eval="time.strftime('%Y-%m-25')" name="date_deadline"/>
             <field eval="time.strftime('%Y-%m-12')" name="date_action"/>
             <field name="title_action">Meeting for pricing information.</field>
-            <field name="section_id" ref="crm_case_section_3"/>
+            <field name="section_id" ref="section_sales_department"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="stage_id" ref="crm.stage_lead3"/>
             <field eval="1" name="active"/>
@@ -317,7 +320,7 @@ Andrew</field>
             <field eval="time.strftime('%Y-%m-23')" name="date_deadline"/>
             <field eval="time.strftime('%Y-%m-10')" name="date_action"/>
             <field name="title_action">Send Catalogue by Email</field>
-            <field name="section_id" ref="crm_case_section_4"/>
+            <field name="section_id" ref="section_sales_department"/>
             <field name="user_id" ref="base.user_demo"/>
             <field name="stage_id" ref="crm.stage_lead3"/>
             <field eval="1" name="active"/>
@@ -326,7 +329,7 @@ Andrew</field>
         <record id="crm_case_15" model="crm.lead">
             <field name="type">opportunity</field>
             <field name="name">Plan to buy RedHat servers</field>
-            <field eval="35000" name="planned_revenue"/>
+            <field eval="25000" name="planned_revenue"/>
             <field eval="30.0" name="probability"/>
             <field name="street">69 rue de Chimay</field>
             <field name="country_id" ref="base.be"/>
@@ -339,10 +342,11 @@ Andrew</field>
             <field eval="time.strftime('%Y-%m-12')" name="date_deadline"/>
             <field eval="time.strftime('%Y-%m-10')" name="date_action"/>
             <field name="title_action">Call to ask system requirement</field>
-            <field name="section_id" ref="crm_case_section_3"/>
+            <field name="section_id" ref="section_sales_department"/>
             <field name="user_id" ref="base.user_demo"/>
-            <field name="stage_id" ref="crm.stage_lead4"/>
+            <field name="stage_id" ref="crm.stage_lead6"/>
             <field eval="1" name="active"/>
+            <field name="date_closed" eval="(DateTime.today() - relativedelta(months=2)).strftime('%Y-%m-%d %H:%M')"/>
         </record>
 
         <record id="crm_case_16" model="crm.lead">
@@ -367,6 +371,7 @@ Andrew</field>
             <field name="user_id" ref="base.user_demo"/>
             <field name="stage_id" ref="crm.stage_lead6"/>
             <field eval="1" name="active"/>
+            <field name="date_closed" eval="(DateTime.today() - relativedelta(hours=1)).strftime('%Y-%m-%d %H:%M')"/>
         </record>
 
         <record id="crm_case_17" model="crm.lead">
@@ -388,10 +393,11 @@ Andrew</field>
             <field eval="time.strftime('%Y-%m-8')" name="date_deadline"/>
             <field eval="time.strftime('%Y-%m-3')" name="date_action"/>
             <field name="title_action">Send price list regarding our interventions</field>
-            <field name="section_id" ref="crm_case_section_2"/>
+            <field name="section_id" ref="crm_case_section_1"/>
             <field name="user_id" ref="base.user_demo"/>
-            <field name="stage_id" ref="crm.stage_lead3"/>
+            <field name="stage_id" ref="crm.stage_lead6"/>
             <field eval="1" name="active"/>
+            <field name="date_closed" eval="(DateTime.today() - relativedelta(hours=1)).strftime('%Y-%m-%d %H:%M')"/>
         </record>
 
         <record id="crm_case_18" model="crm.lead">
@@ -412,7 +418,7 @@ Andrew</field>
             <field eval="time.strftime('%Y-%m-13')" name="date_deadline"/>
             <field eval="time.strftime('%Y-%m-4')" name="date_action"/>
             <field name="title_action">Call to define real needs about training</field>
-            <field name="section_id" ref="crm_case_section_2"/>
+            <field name="section_id" ref="crm_case_section_1"/>
             <field name="user_id" ref="base.user_demo"/>
             <field name="stage_id" ref="crm.stage_lead3"/>
             <field eval="1" name="active"/>
@@ -438,8 +444,9 @@ Andrew</field>
             <field name="title_action">Ask for the good receprion of the proposition</field>
             <field name="section_id" ref="crm_case_section_1"/>
             <field name="user_id" ref="base.user_root"/>
-            <field name="stage_id" ref="crm.stage_lead4"/>
+            <field name="stage_id" ref="crm.stage_lead6"/>
             <field eval="1" name="active"/>
+            <field name="date_closed" eval="(DateTime.today() - relativedelta(months=3)).strftime('%Y-%m-%d %H:%M')"/>
         </record>
 
         <record id="crm_case_20" model="crm.lead">
@@ -468,10 +475,11 @@ Andrew</field>
             <field name="categ_ids" eval="[(6, 0, [categ_oppor7])]"/>
             <field name="channel_id" ref="crm_case_channel_phone"/>
             <field name="priority">3</field>
-            <field name="section_id" ref="crm_case_section_4"/>
+            <field name="section_id" ref="crm_case_section_2"/>
             <field name="user_id" ref="base.user_root"/>
-            <field name="stage_id" ref="crm.stage_lead8"/>
+            <field name="stage_id" ref="crm.stage_lead6"/>
             <field eval="1" name="active"/>
+            <field name="date_closed" eval="(DateTime.today() - relativedelta(months=1)).strftime('%Y-%m-%d %H:%M')"/>
         </record>
 
         <record id="crm_case_22" model="crm.lead">
@@ -486,7 +494,7 @@ Andrew</field>
             <field name="categ_ids" eval="[(6, 0, [categ_oppor3])]"/>
             <field name="channel_id" ref="crm_case_channel_email"/>
             <field name="priority">3</field>
-            <field name="section_id" ref="crm_case_section_4"/>
+            <field name="section_id" ref="crm_case_section_2"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="stage_id" ref="crm.stage_lead8"/>
             <field eval="1" name="active"/>
@@ -504,14 +512,15 @@ Andrew</field>
             <field name="priority">5</field>
             <field name="section_id" ref="section_sales_department"/>
             <field name="user_id" ref="base.user_demo"/>
-            <field name="stage_id" ref="crm.stage_lead5"/>
+            <field name="stage_id" ref="crm.stage_lead6"/>
             <field eval="1" name="active"/>
+            <field name="date_closed" eval="(DateTime.today() - relativedelta(hours=1)).strftime('%Y-%m-%d %H:%M')"/>
         </record>
 
         <record id="crm_case_24" model="crm.lead">
             <field name="type">opportunity</field>
             <field name="name">Need 20 Days of Consultancy</field>
-            <field eval="5025" name="planned_revenue"/>
+            <field eval="6025" name="planned_revenue"/>
             <field eval="90.0" name="probability"/>
             <field name="email_from">info@mycompany.net</field>
             <field name="country_id" ref="base.pe"/>
@@ -525,6 +534,7 @@ Andrew</field>
             <field name="user_id" ref="base.user_root"/>
             <field name="stage_id" ref="crm.stage_lead6"/>
             <field eval="1" name="active"/>
+            <field name="date_closed" eval="(DateTime.today() - relativedelta(month=1)).strftime('%Y-%m-%d %H:%M')"/>
         </record>
 
         <record id="crm_case_25" model="crm.lead">
@@ -544,7 +554,7 @@ Andrew</field>
             <field name="categ_ids" eval="[(6, 0, [categ_oppor4])]"/>
             <field name="priority">2</field>
             <field name="title_action">Conf call with technical service</field>
-            <field name="section_id" ref="crm_case_section_2"/>
+            <field name="section_id" ref="crm_case_section_1"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="stage_id" ref="crm.stage_lead4"/>
             <field eval="1" name="active"/>
@@ -569,10 +579,11 @@ Andrew</field>
             <field eval="time.strftime('%Y-%m-23')" name="date_deadline"/>
             <field eval="time.strftime('%Y-%m-10')" name="date_action"/>
             <field name="title_action">Send Catalogue by Email</field>
-            <field name="section_id" ref="crm_case_section_4"/>
+            <field name="section_id" ref="crm_case_section_2"/>
             <field name="user_id" ref="base.user_demo"/>
-            <field name="stage_id" ref="crm.stage_lead3"/>
+            <field name="stage_id" ref="crm.stage_lead6"/>
             <field eval="1" name="active"/>
+            <field name="date_closed" eval="(DateTime.today() - relativedelta(hours=1)).strftime('%Y-%m-%d %H:%M')"/>
         </record>
 
         <!-- Unsubscribe Admin from case15, subscribe Demo -->
diff --git a/addons/crm/crm_lead_menu.xml b/addons/crm/crm_lead_menu.xml
index 2226b4ac895..7ee3287fd75 100644
--- a/addons/crm/crm_lead_menu.xml
+++ b/addons/crm/crm_lead_menu.xml
@@ -12,6 +12,7 @@
         <field name="context">{
                 'default_type':'lead',
                 'stage_type':'lead',
+                'needaction_menu_ref': 'crm.menu_crm_opportunities',
                 'search_default_unassigned':1,
             }
         </field>
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 8c22a0a2e1c..6ddd06c1c90 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -157,7 +157,8 @@
                             <label for="section_id" groups="base.group_multi_salesteams"/>
                             <div groups="base.group_multi_salesteams">
                                 <field name="section_id"/>
-                                <button name="case_escalate" string="Escalate" type="object"
+                                <button name="case_escalate" string="Escalate"
+                                        type="object" class="oe_link"
                                         attrs="{'invisible': ['|', ('section_id','=',False), ('state', 'not in', ['draft','open','pending'])]}"/>
                             </div>
                             <field name="type" invisible="1"/>
@@ -343,7 +344,7 @@
                             help="Leads that are assigned to me"/>
                     <filter string="Assigned to My Team(s)"
                             domain="[('section_id.member_ids', 'in', [uid])]" context="{'invisible_section': False}"
-                            help="Leads that are assigned to any sales teams I am member of"/>
+                            help="Leads that are assigned to any sales teams I am member of" groups="base.group_multi_salesteams"/>
                     <separator />
                     <filter string="Available for mass mailing"
                             name='not_opt_out' domain="[('opt_out', '=', False)]"
@@ -351,7 +352,7 @@
                     <separator />
                     <group expand="0" string="Group By...">
                         <filter string="Salesperson" domain="[]" context="{'group_by':'user_id'}"/>
-                        <filter string="Team" domain="[]" context="{'group_by':'section_id'}"/>
+                        <filter string="Team" domain="[]" context="{'group_by':'section_id'}" groups="base.group_multi_salesteams"/>
                         <filter string="Stage" domain="[]" context="{'group_by':'stage_id'}"/>
                         <filter string="Customer" help="Partner" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="Country" domain="[]" context="{'group_by':'country_id'}"/>
@@ -362,7 +363,7 @@
                     </group>
                     <group string="Display">
                         <filter string="Show Countries" context="{'invisible_country': False}" help="Show Countries"/>
-                        <filter string="Show Sales Team" context="{'invisible_section': False}" domain="[]" help="Show Sales Team"/>
+                        <filter string="Show Sales Team" context="{'invisible_section': False}" domain="[]" help="Show Sales Team" groups="base.group_multi_salesteams"/>
                     </group>
                 </search>
             </field>
@@ -556,7 +557,7 @@
                     <filter string="Lost" name="lost" domain="[('state','=','cancel')]"/>
                     <filter string="Unassigned" name="unassigned" domain="[('user_id','=', False)]" help="No salesperson"/>
                     <filter string="Unread Messages" name="message_unread" domain="[('message_unread','=',True)]" help="Unread messages"/>
-                    <filter string="Assigned to Me"
+                    <filter string="My Opportunities" name="assigned_to_me"
                             domain="[('user_id','=',uid)]" context="{'invisible_section': False}"
                             help="Opportunities that are assigned to me"/>
                     <filter string="Assigned to My Team(s)"
@@ -577,7 +578,7 @@
                         <filter string="Creation" domain="[]" context="{'group_by':'create_date'}"/>
                     </group>
                     <group string="Display">
-                        <filter string="Show Sales Team" context="{'invisible_section': False}" domain="[]" help="Show Sales Team"/>
+                        <filter string="Show Sales Team" context="{'invisible_section': False}" domain="[]" help="Show Sales Team" groups="base.group_multi_salesteams"/>
                         <filter string="Show Countries" context="{'invisible_country': False}" help="Show Countries"/>
                     </group>
                 </search>
@@ -608,5 +609,22 @@
             <field name="ref_ir_act_window" ref="crm.action_lead_mass_mail"/>
         </record>
 
+        <record id="action_mark_as_lost" model="ir.actions.server">
+            <field name="name">Mark As Lost</field>
+            <field name="model_id" ref="model_crm_lead"/>
+            <field name="state">code</field>
+            <field name="code">
+                if context.get('active_model') == 'crm.lead' and context.get('active_ids'):
+                    self.case_cancel(cr, uid, context['active_ids'], context=context)
+            </field>
+        </record>
+
+        <record id="ir_mark_as_lost" model="ir.values">
+            <field eval="'client_action_multi'" name="key2"/>
+            <field eval="'crm.lead'" name="model"/>
+            <field name="name">Mark As Lost</field>
+            <field eval="'ir.actions.server,%d'%action_mark_as_lost" name="value"/>
+        </record>
+
     </data>
 </openerp>
diff --git a/addons/crm/crm_phonecall_demo.xml b/addons/crm/crm_phonecall_demo.xml
index f441c29a7e6..4002e18815e 100644
--- a/addons/crm/crm_phonecall_demo.xml
+++ b/addons/crm/crm_phonecall_demo.xml
@@ -37,7 +37,7 @@
             <field name="name">Ask for convenient time of meeting</field>
             <field name="state">open</field>
             <field name="partner_phone">+1 786 525 0724</field>
-            <field name="section_id" ref="crm.crm_case_section_3"/>
+            <field name="section_id" ref="crm.crm_case_section_2"/>
             <field eval="1" name="active"/>
             <field name="categ_id" ref="crm.categ_phone2"/>
             <field eval="5.0" name="duration"/>
@@ -50,7 +50,7 @@
             <field name="state">done</field>
             <field name="partner_phone">(077) 582-4035</field>
             <field name="partner_mobile">(077) 341-3591</field>
-            <field name="section_id" ref="crm.crm_case_section_4"/>
+            <field name="section_id" ref="crm.crm_case_section_2"/>
             <field eval="1" name="active"/>
             <field name="categ_id" ref="crm.categ_phone1"/>
             <field eval="5.45" name="duration"/>
@@ -74,7 +74,7 @@
             <field name="name">Proposal for discount offer</field>
             <field name="state">open</field>
             <field name="partner_phone">+34 230 953 485</field>
-            <field name="section_id" ref="crm.crm_case_section_3"/>
+            <field name="section_id" ref="crm.crm_case_section_2"/>
             <field eval="time.strftime('%Y-%m-28 14:15:30')" name="date"/>
             <field name="categ_id" ref="crm.categ_phone2"/>
             <field eval="8.56" name="duration"/>
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index 63385fa3e17..a84ae553b4a 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -101,7 +101,7 @@
                         <field name="type"/>
                         <field name="on_change"/>
                         <field name="sequence"/>
-                        <field name="case_default"/>
+                        <field name="case_default" groups="base.group_multi_salesteams"/>
                         <field name="fold"/>
                     </group>
                     <separator string="Requirements"/>
diff --git a/addons/crm/html/Stephan-Keller.jpg b/addons/crm/html/Stephan-Keller.jpg
new file mode 100644
index 00000000000..57464ea0b2b
Binary files /dev/null and b/addons/crm/html/Stephan-Keller.jpg differ
diff --git a/addons/crm/html/claudia-sebastiani.jpg b/addons/crm/html/claudia-sebastiani.jpg
new file mode 100644
index 00000000000..f24ba95189a
Binary files /dev/null and b/addons/crm/html/claudia-sebastiani.jpg differ
diff --git a/addons/crm/html/crm_game.png b/addons/crm/html/crm_game.png
new file mode 100644
index 00000000000..b5416926793
Binary files /dev/null and b/addons/crm/html/crm_game.png differ
diff --git a/addons/crm/html/crm_game_01.png b/addons/crm/html/crm_game_01.png
new file mode 100644
index 00000000000..a3cd109c2de
Binary files /dev/null and b/addons/crm/html/crm_game_01.png differ
diff --git a/addons/crm/html/crm_game_02.png b/addons/crm/html/crm_game_02.png
new file mode 100644
index 00000000000..1a747e1ffe8
Binary files /dev/null and b/addons/crm/html/crm_game_02.png differ
diff --git a/addons/crm/html/crm_game_03.png b/addons/crm/html/crm_game_03.png
new file mode 100644
index 00000000000..2fd14886179
Binary files /dev/null and b/addons/crm/html/crm_game_03.png differ
diff --git a/addons/crm/html/crm_linkedin.png b/addons/crm/html/crm_linkedin.png
new file mode 100644
index 00000000000..e40563dbfc7
Binary files /dev/null and b/addons/crm/html/crm_linkedin.png differ
diff --git a/addons/crm/html/crm_sc_01.jpg b/addons/crm/html/crm_sc_01.jpg
new file mode 100644
index 00000000000..7a2a44d7b0d
Binary files /dev/null and b/addons/crm/html/crm_sc_01.jpg differ
diff --git a/addons/crm/html/crm_sc_01.png b/addons/crm/html/crm_sc_01.png
new file mode 100644
index 00000000000..8f1ff1e95fe
Binary files /dev/null and b/addons/crm/html/crm_sc_01.png differ
diff --git a/addons/crm/html/crm_sc_02.png b/addons/crm/html/crm_sc_02.png
new file mode 100644
index 00000000000..e20c44836ba
Binary files /dev/null and b/addons/crm/html/crm_sc_02.png differ
diff --git a/addons/crm/html/crm_sc_04a.png b/addons/crm/html/crm_sc_04a.png
new file mode 100644
index 00000000000..d0308e3f68b
Binary files /dev/null and b/addons/crm/html/crm_sc_04a.png differ
diff --git a/addons/crm/html/crm_sc_04b.png b/addons/crm/html/crm_sc_04b.png
new file mode 100644
index 00000000000..57b7965771e
Binary files /dev/null and b/addons/crm/html/crm_sc_04b.png differ
diff --git a/addons/crm/html/crm_sc_04c.png b/addons/crm/html/crm_sc_04c.png
new file mode 100644
index 00000000000..d3c4dbae043
Binary files /dev/null and b/addons/crm/html/crm_sc_04c.png differ
diff --git a/addons/crm/html/crm_sc_04d.png b/addons/crm/html/crm_sc_04d.png
new file mode 100644
index 00000000000..687bdfb971f
Binary files /dev/null and b/addons/crm/html/crm_sc_04d.png differ
diff --git a/addons/crm/html/crm_sc_05.png b/addons/crm/html/crm_sc_05.png
new file mode 100644
index 00000000000..b71ce805250
Binary files /dev/null and b/addons/crm/html/crm_sc_05.png differ
diff --git a/addons/crm/html/crm_sc_06.png b/addons/crm/html/crm_sc_06.png
new file mode 100644
index 00000000000..1da7d5e841f
Binary files /dev/null and b/addons/crm/html/crm_sc_06.png differ
diff --git a/addons/crm/html/crm_sc_08.png b/addons/crm/html/crm_sc_08.png
new file mode 100644
index 00000000000..b47d9738cf9
Binary files /dev/null and b/addons/crm/html/crm_sc_08.png differ
diff --git a/addons/crm/html/crm_sc_agenda.png b/addons/crm/html/crm_sc_agenda.png
new file mode 100644
index 00000000000..a0f57eb4bca
Binary files /dev/null and b/addons/crm/html/crm_sc_agenda.png differ
diff --git a/addons/crm/html/crm_sc_marketing.png b/addons/crm/html/crm_sc_marketing.png
new file mode 100644
index 00000000000..f7662587969
Binary files /dev/null and b/addons/crm/html/crm_sc_marketing.png differ
diff --git a/addons/crm/html/index.html b/addons/crm/html/index.html
new file mode 100644
index 00000000000..5ae542f5c91
--- /dev/null
+++ b/addons/crm/html/index.html
@@ -0,0 +1,252 @@
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <div class="oe_span12">
+            <h2 class="oe_slogan">Customer Relationship Management</h2>
+            <h3 class="oe_slogan">Boost sales productivity, improve win rates, grow revenue</h3>
+        </div>
+        <div class="oe_span6">
+            <div class="oe_demo oe_picture oe_screenshot">
+                <a href="https://www.openerp.com/saas_master/demo?lang=en_US&module=crm">
+                    <img src="crm_sc_01.png">
+                </a>
+                <div class="oe_demo_footer oe_centeralign">Online Demo</div>
+            </div>
+        </div>
+        <div class="oe_span6">
+            <p class="oe_mt32">
+Manage your sales funnel with no effort. Attract leads, follow-up on phone calls and meetings. Analyse the quality of your leads to make informed decisions and save time by integrating emails directly into the application.
+            </p>
+            <div class="oe_centeralign oe_websiteonly">
+                <a href="http://www.openerp.com/start" class="oe_button oe_big oe_tacky">Start your <span class="oe_emph">free</span> trial</a>
+            </div>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container oe_dark">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan">Your Sales Funnel, The Way You Like It</h2>
+        <div class="oe_span6">
+            <p class="oe_mt32">
+Track your opportunities pipeline with the revolutionary kanban view. Work inside your sales funnel and get instant visual information about next actions, new messages, top opportunities and expected revenues.
+            </p>
+        </div>
+        <div class="oe_span6">
+            <div class="oe_row_img oe_centered">
+                <img class="oe_picture oe_screenshot" src="crm_sc_02.png">
+            </div>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan">Social Network Integration</h2>
+        <div class="oe_span6">
+            <div class="oe_row_img oe_centered">
+                <img class="oe_picture" src="crm_linkedin.png">
+            </div>
+        </div>
+        <div class="oe_span6">
+            <p class="oe_mt32">
+Bring social intelligence to your sales process. Gain insights from social media site LinkedIn to find prospects easily and load their data automatically into your address book.
+            </p>
+        </div>
+    </div>
+</section>
+
+
+<section class="oe_container oe_dark">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan">Lead Management Made Easy</h2>
+        <div class="oe_span6">
+            <p class="oe_mt32">
+Create leads automatically from incoming emails. Analyse leads efficiency and compare performance by campaigns, channels or sales team.
+            </p>
+            <p class="oe_mt32">
+Find duplicates, merge leads and assign them to the right salesperson in one operation. Spend less time on administration and more time on qualifying leads.
+            </p>
+        </div>
+        <div class="oe_span6">
+            <div class="oe_row_img oe_centered">
+                <img class="oe_picture oe_screenshot" src="crm_sc_05.png">
+            </div>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan">Organize Your Opportunities</h2>
+        <h3 class="oe_slogan">A clean user interface with everything in one screen</h3>
+        <div class="oe_span6">
+            <div class="oe_row_img oe_centered">
+                <img class="oe_picture oe_screenshot" src="crm_sc_06.png">
+            </div>
+        </div>
+        <div class="oe_span6">
+            <p class="oe_mt32">
+Get your opportunities organized to stay focused on the best deals. Manage all your customer interactions from the opportunity like emails, phone calls, internal notes, meetings and quotations.
+            </p><p>
+Follow opportunities that interrests you to get notified upon specific events: deal won or lost, stage changed, new customer demand, etc.
+            </p>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container oe_dark">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan">Email Integration and Automation</h2>
+        <div class="oe_span6">
+            <p class="oe_mt32">
+Work with the email applications you already use every day. Whether your company uses Microsoft Outlook or Gmail, no one needs to change the way they work, so everyone stays productive.
+            </p><p>
+Route, sort and filter incoming emails automatically. OpenERP CRM handles incoming emails and route them to the right opportunities or sales team. New leads are created on the fly and interested salespersons are notified automatically.
+            </p>
+        </div>
+        <div class="oe_span6">
+            <div class="oe_row_img oe_centered">
+                <img class="oe_picture oe_screenshot" src="crm_sc_08.png">
+            </div>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan">Collaborative Agenda</h2>
+        <div class="oe_span6">
+            <div class="oe_row_img oe_centered">
+                <img class="oe_picture oe_screenshot" src="crm_sc_agenda.png">
+            </div>
+        </div>
+        <div class="oe_span6">
+            <p class="oe_mt32">
+Schedule your meetings and phone calls using the integrated calendar. You can see your agenda and your colleagues' in one view. As a manager, it's easy to see what your team is busy with.
+            </p>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container oe_dark">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan">Lead Automation and Marketing Campaigns</h2>
+        <h3 class="oe_slogan">Drive performance by automating tasks</h3>
+        <div class="oe_span6">
+            <p class="oe_mt32">
+            Use our marketing campaigns to automate lead acquisition, follow ups and promotions. Define automated actions (e.g. ask a salesperson to call, send an email, ...) based on triggers (no activity since 20 days, answered a promotional email, etc.)
+            </p><p class="oe_mt32">
+            Optimize campaigns from lead to close, on every channel. Make smarter decisions about where to invest and show the impact of your marketing activities on your company's bottom line.
+            </p>
+        </div>
+        <div class="oe_span6">
+            <div class="oe_row_img oe_centered">
+                <img class="oe_picture oe_screenshot" src="crm_sc_marketing.png">
+            </div>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row">
+        <h2 class="oe_slogan">Customize Your Sales Cycle</h2>
+        <h3 class="oe_slogan">It Fits Your Sales Approach</h3>
+        <p>
+Customize your sales cycle by configuring sales stages that perfectly fit your sales approach. Control statistics to get accurate forecasts to improve your sales performance at every stage of your customer relationship.
+        </p>
+        <div class="oe_row_img oe_centered oe_mt32">
+            <img class="oe_picture oe_screenshot" src="crm_sc_04a.png">
+            <img class="oe_picture oe_screenshot" src="crm_sc_04b.png">
+            <img class="oe_picture oe_screenshot" src="crm_sc_04c.png">
+            <img class="oe_picture oe_screenshot" src="crm_sc_04d.png">
+        </div>
+    </div>
+</section>
+
+<section class="oe_container oe_dark">
+    <div class="oe_spaced oe_row">
+        <h2 class="oe_slogan">Reporting and Dashboards</h2>
+        <h3 class="oe_slogan">Get access to the right information to take smart decisions</h3>
+        <div class="oe_span6">
+            <div class="oe_row_img oe_centered">
+                <img class="oe_picture oe_screenshot" src="crm_sc_05.png">
+            </div>
+        </div>
+        <div class="oe_span6">
+            <p class="oe_mt32">
+Get the insights you need to make smarter decisions. Design custom dashboards to get a picture of your business at a glance. Dig deeper with real-time reports that anyone can create and share.
+            </p>
+        </div>
+    </div>
+</section>
+
+<section class="oe_spaced oe_container">
+    <div class="oe_row">
+        <h2 class="oe_slogan">Drive Engagement with Gamification</h2>
+        <h3 class="oe_slogan">Leverage sales' natural desire for competition</h3>
+        <p class="oe_mt32">
+               Reinforce good habits and improve win rates with real-time recognition and rewards inspired by <a href="http://en.wikipedia.org/wiki/Gamification">game mechanics</a>. Align sales teams around clear business objectives with challenges, personal objectives and team leader boards.
+        </p>
+        <div class="oe_span4 oe_centered">
+            <h3>Leaderboards</h3>
+            <div class="oe_row_img oe_centered">
+                <img class="oe_picture" src="crm_game_01.png">
+            </div>
+            <p>
+               Promote leaders and competition amongst sales team with performance ratios.
+            </p>
+        </div>
+        <div class="oe_span4 oe_centered">
+            <h3>Personnal Objectives</h3>
+            <div class="oe_row_img">
+                <img class="oe_picture" src="crm_game_02.png">
+            </div>
+            <p>
+                Assign clear goals to users to align them with the company objectives.
+            </p>
+        </div>
+        <div class="oe_span4 oe_centered">
+            <h3>Team Targets</h3>
+            <div class="oe_row_img oe_centered">
+                <img class="oe_picture" src="crm_game_03.png">
+            </div>
+            <p>
+                Compare revenues with forecasts and budgets in real time.
+            </p>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container oe_dark">
+    <div class="oe_row">
+        <div class="oe_span12">
+            <h2 class="oe_slogan">Many companies already enjoy it</h2>
+            <h3 class="oe_slogan">Hear what they have to say !</h3>
+        </div>
+        <div class="oe_span6">
+            <div class="oe_quote">
+                <q>
+                    With OpenERP CRM I keep all the information about leads and customers
+                    in a single place, and share it with my colleagues. It's great and effective.
+                </q>
+                <cite class="oe_cite oe_clearfix">
+                    <img class="oe_photo" src="claudia-sebastiani.jpg">
+                    <div class="oe_author">Claudia Sebastiani</div>
+                    <div class="oe_job">Sales manager at <a href="http://openerp.creativiquadrati.it" target="_blank">CQ Creativi Quadrati</a>.</div>
+                </cite>
+            </div>
+        </div>
+        <div class="oe_span6">
+            <div class="oe_quote">
+                <q>
+                    I am surprised by how good OpenERP CRM is. Awesome product.
+                </q>
+                <cite class="oe_cite oe_clearfix">
+                    <img class="oe_photo" src="Stephan-Keller.jpg">
+                    <div class="oe_author">Stephan Keller</div>
+                    <div class="oe_job">CEO of <a href="http://www.sodexis.com" target="_blank">Sodexis, Inc</a>.</div>
+                </cite>
+            </div>
+        </div>
+    </div>
+</section>
diff --git a/addons/crm/i18n/ru.po b/addons/crm/i18n/ru.po
index 19ae76e9f46..ec2a9f35ee5 100644
--- a/addons/crm/i18n/ru.po
+++ b/addons/crm/i18n/ru.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
-"PO-Revision-Date: 2013-03-01 11:27+0000\n"
-"Last-Translator: Антон Лаврёнов <lavrton@gmail.com>\n"
+"PO-Revision-Date: 2013-05-30 13:52+0000\n"
+"Last-Translator: Chertykov Denis <chertykov@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: 2013-03-16 05:09+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-05-31 05:38+0000\n"
+"X-Generator: Launchpad (build 16660)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -452,7 +452,7 @@ msgstr "# Предложений"
 #, python-format
 msgid ""
 "Please select more than one element (lead or opportunity) from the list view."
-msgstr ""
+msgstr "Пожалуйста, выберите хотя бы один элемент из списка ниже."
 
 #. module: crm
 #: view:crm.lead:0
@@ -1108,7 +1108,7 @@ msgstr "Удалить"
 #. module: crm
 #: model:mail.message.subtype,description:crm.mt_lead_create
 msgid "Opportunity created"
-msgstr ""
+msgstr "Предложение создано"
 
 #. module: crm
 #: view:crm.lead:0
@@ -1397,7 +1397,7 @@ msgstr "Сделать"
 #. module: crm
 #: model:mail.message.subtype,description:crm.mt_lead_lost
 msgid "Opportunity lost"
-msgstr ""
+msgstr "Предложение отклонено"
 
 #. module: crm
 #: field:crm.lead2opportunity.partner,action:0
@@ -1446,7 +1446,7 @@ msgstr "Пользователи"
 #. module: crm
 #: model:mail.message.subtype,name:crm.mt_lead_stage
 msgid "Stage Changed"
-msgstr ""
+msgstr "Стадия изменена"
 
 #. module: crm
 #: field:crm.case.stage,section_ids:0
@@ -1759,7 +1759,7 @@ msgstr "Способ оплаты"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead2opportunity_partner_mass
 msgid "Mass Lead To Opportunity Partner"
-msgstr "Массовое проведение предложений партнёру"
+msgstr "Массовое преобразование кандидатов в предложения"
 
 #. module: crm
 #: view:sale.config.settings:0
@@ -1917,7 +1917,7 @@ msgstr "Сделать"
 #: model:mail.message.subtype,name:crm.mt_lead_convert_to_opportunity
 #: model:mail.message.subtype,name:crm.mt_salesteam_lead_opportunity
 msgid "Lead to Opportunity"
-msgstr ""
+msgstr "Кандидат в предложение"
 
 #. module: crm
 #: field:crm.lead,user_email:0
@@ -2126,7 +2126,7 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0
 msgid "Address"
-msgstr ""
+msgstr "Адрес"
 
 #. module: crm
 #: help:crm.case.section,alias_id:0
@@ -2134,6 +2134,8 @@ msgid ""
 "The email address associated with this team. New emails received will "
 "automatically create new leads assigned to the team."
 msgstr ""
+"Адрес эл. почты связанный с этой командой. Новая полученная эл. почта будет "
+"автоматически создавать новые кандидаты связанные с командой."
 
 #. module: crm
 #: view:crm.lead:0
@@ -2192,7 +2194,7 @@ msgstr "Продолжение процесса"
 #: selection:crm.lead2opportunity.partner.mass,name:0
 #: model:ir.actions.act_window,name:crm.action_crm_lead2opportunity_partner
 msgid "Convert to opportunity"
-msgstr "Преобразовать в возможность"
+msgstr "Преобразовать в предложение"
 
 #. module: crm
 #: field:crm.opportunity2phonecall,user_id:0
@@ -2234,6 +2236,8 @@ msgid ""
 "This stage is not visible, for example in status bar or kanban view, when "
 "there are no records in that stage to display."
 msgstr ""
+"Эта стадия не видима, например в статус-баре или виде канбан, когда нет "
+"записей этой стадии для отображения."
 
 #. module: crm
 #: field:crm.lead.report,nbr:0
@@ -2249,7 +2253,7 @@ msgstr "Отдел продаж, которому принадлежит воп
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead6
 msgid "Banner Ads"
-msgstr ""
+msgstr "Баннер"
 
 #. module: crm
 #: field:crm.merge.opportunity,opportunity_ids:0
@@ -2279,7 +2283,7 @@ msgstr "Выполняется"
 #. module: crm
 #: model:mail.message.subtype,description:crm.mt_lead_convert_to_opportunity
 msgid "Lead converted into an opportunity"
-msgstr ""
+msgstr "Кандидат превращенный в предложение"
 
 #. module: crm
 #: view:crm.lead:0
@@ -2289,7 +2293,7 @@ msgstr "Нераспределенные кандидаты"
 #. module: crm
 #: model:mail.message.subtype,description:crm.mt_lead_won
 msgid "Opportunity won"
-msgstr ""
+msgstr "Предложение принято"
 
 #. module: crm
 #: field:crm.case.categ,object_id:0
@@ -2364,7 +2368,7 @@ msgstr ""
 #. module: crm
 #: field:crm.case.stage,state:0
 msgid "Related Status"
-msgstr ""
+msgstr "Связанный статус"
 
 #. module: crm
 #: field:crm.phonecall,name:0
@@ -2410,7 +2414,7 @@ msgstr "Подтвердить"
 #. module: crm
 #: view:crm.lead:0
 msgid "Unread messages"
-msgstr ""
+msgstr "Непрочитанные сообщения"
 
 #. module: crm
 #: field:crm.phonecall.report,section_id:0
@@ -2501,7 +2505,7 @@ msgstr "Создание предложений из кандидатов"
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead3
 msgid "Email Campaign - Products"
-msgstr ""
+msgstr "Кампания эл. почты - Продукция"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_categ_phone_incoming0
@@ -2578,7 +2582,7 @@ msgstr "Август"
 #: model:mail.message.subtype,name:crm.mt_lead_lost
 #: model:mail.message.subtype,name:crm.mt_salesteam_lead_lost
 msgid "Opportunity Lost"
-msgstr ""
+msgstr "Предложение отклонено"
 
 #. module: crm
 #: field:crm.lead.report,deadline_month:0
@@ -2644,7 +2648,7 @@ msgstr "Сотрудники отдела"
 #: view:crm.opportunity2phonecall:0
 #: view:crm.phonecall2phonecall:0
 msgid "Schedule/Log a Call"
-msgstr ""
+msgstr "Запланировать/Описать звонок"
 
 #. module: crm
 #: field:crm.lead,planned_cost:0
@@ -2654,7 +2658,7 @@ msgstr "Планируемые затраты"
 #. module: crm
 #: help:crm.lead,date_deadline:0
 msgid "Estimate of the date on which the opportunity will be won."
-msgstr ""
+msgstr "Оценка даты на которую это предложение будет принято."
 
 #. module: crm
 #: help:crm.lead,email_cc:0
@@ -2676,7 +2680,7 @@ msgstr "Описанные звонки"
 #: model:mail.message.subtype,name:crm.mt_lead_won
 #: model:mail.message.subtype,name:crm.mt_salesteam_lead_won
 msgid "Opportunity Won"
-msgstr ""
+msgstr "Предложение принято"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_section_act_tree
@@ -2895,7 +2899,7 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0
 msgid "Internal Notes"
-msgstr ""
+msgstr "Внутренние заметки"
 
 #. module: crm
 #: view:crm.lead:0
@@ -2960,6 +2964,7 @@ msgstr "Проиграно"
 #, python-format
 msgid "Closed/Cancelled leads cannot be converted into opportunities."
 msgstr ""
+"Закрытые/Отмененные кандидаты не могут быть конвертированы в возможности."
 
 #. module: crm
 #: view:crm.lead:0
@@ -3050,7 +3055,7 @@ msgstr "Рассылка"
 #. module: crm
 #: model:mail.message.subtype,name:crm.mt_salesteam_lead_stage
 msgid "Opportunity Stage Changed"
-msgstr ""
+msgstr "Этап предложения изменен"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_lead_stage_act
diff --git a/addons/crm/process/crm_configuration_process.xml b/addons/crm/process/crm_configuration_process.xml
index c56bb8935d9..882c9680268 100644
--- a/addons/crm/process/crm_configuration_process.xml
+++ b/addons/crm/process/crm_configuration_process.xml
@@ -60,24 +60,24 @@
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Prospect Opportunity&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Creating business opportunities from Leads&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_opportunities0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_leads0"/>
+            <field name="target_node_id" ref="process_node_opportunities0"/>
+            <field name="source_node_id" ref="process_node_leads0"/>
         </record>
 
         <record id="process_transition_leadpartner0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Prospect Partner&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Prospect is converting to business partner&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_partner0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_leads0"/>
+            <field name="target_node_id" ref="process_node_partner0"/>
+            <field name="source_node_id" ref="process_node_leads0"/>
         </record>
 
         <record id="process_transition_opportunitymeeting0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Opportunity Meeting&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Normal or phone meeting for opportunity&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_meeting0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_opportunities0"/>
+            <field name="target_node_id" ref="process_node_meeting0"/>
+            <field name="source_node_id" ref="process_node_opportunities0"/>
         </record>
 
     </data>
diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml
index 759063b3c1d..09853c6379e 100644
--- a/addons/crm/report/crm_lead_report_view.xml
+++ b/addons/crm/report/crm_lead_report_view.xml
@@ -75,7 +75,7 @@
                     <filter icon="terp-dialog-close" string="Closed" domain="[('state','=','done')]" help="Leads/Opportunities which are in done state"/>
                     <separator/>
                     <filter string="My Sales Team(s)" icon="terp-personal+" context="{'invisible_section': False}" domain="[('section_id.user_id','=',uid)]"
-                            help="Leads/Opportunities that are assigned to one of the sale teams I manage"/>
+                            help="Leads/Opportunities that are assigned to one of the sale teams I manage" groups="base.group_multi_salesteams"/>
                     <separator/>
                     <filter icon="terp-personal" string="My Case(s)" help="Leads/Opportunities that are assigned to me" domain="[('user_id','=',uid)]"/>
                     <field name="section_id" context="{'invisible_section': False}"
diff --git a/addons/crm/report/crm_phonecall_report_view.xml b/addons/crm/report/crm_phonecall_report_view.xml
index 070d574e0cd..aa2162d163a 100644
--- a/addons/crm/report/crm_phonecall_report_view.xml
+++ b/addons/crm/report/crm_phonecall_report_view.xml
@@ -57,7 +57,7 @@
                         help="Phone calls which are in pending state"/>
                     <separator/>
                     <filter string="My Sales Team(s)" icon="terp-personal+" context="{'invisible_section': False}" domain="[('section_id.user_id','=',uid)]"
-                            help="Phone calls that are assigned to one of the sale teams I manage"/>
+                            help="Phone calls that are assigned to one of the sale teams I manage" groups="base.group_multi_salesteams"/>
                     <separator/>
                     <filter icon="terp-personal" string="My Phone Calls" help="Phone Calls that are assigned to me" domain="[('user_id','=',uid)]" />
                     <field name="section_id" string="Sales Team" context="{'invisible_section': False}"
diff --git a/addons/crm/res_config_view.xml b/addons/crm/res_config_view.xml
index 547ce1c2ae6..9fd542c9dbd 100644
--- a/addons/crm/res_config_view.xml
+++ b/addons/crm/res_config_view.xml
@@ -22,9 +22,9 @@
                             </div>
                         </div>
                     </group>
-                    <separator string="Sales Teams Configuration"/>
+                    <separator string="Sales Teams"/>
                     <group>
-                        <label for="id" string="Use Sales Teams"/>
+                        <label for="id" string="Manage Sales Teams"/>
                         <div>
                             <field name="group_multi_salesteams" class="oe_inline"/>
                             <label for="group_multi_salesteams"/>
diff --git a/addons/crm/security/ir.model.access.csv b/addons/crm/security/ir.model.access.csv
index b09c201df2b..cadb8c24550 100644
--- a/addons/crm/security/ir.model.access.csv
+++ b/addons/crm/security/ir.model.access.csv
@@ -12,7 +12,7 @@ access_crm_phonecall_manager,crm.phonecall.manager,model_crm_phonecall,base.grou
 access_crm_case_categ,crm.case.categ,model_crm_case_categ,base.group_user,1,0,0,0
 access_crm_lead,crm.lead,model_crm_lead,base.group_sale_salesman,1,1,1,0
 access_crm_phonecall,crm.phonecall,model_crm_phonecall,base.group_sale_salesman,1,1,1,0
-access_crm_case_section_user,crm.case.section.user,model_crm_case_section,base.group_sale_salesman,1,1,1,0
+access_crm_case_section_user,crm.case.section.user,model_crm_case_section,base.group_sale_salesman,1,0,0,0
 access_crm_case_section_manager,crm.case.section.manager,model_crm_case_section,base.group_sale_manager,1,1,1,1
 access_crm_case_stage,crm.case.stage,model_crm_case_stage,,1,0,0,0
 access_crm_case_stage_manager,crm.case.stage,model_crm_case_stage,base.group_sale_manager,1,1,1,1
diff --git a/addons/crm/static/lib/sparkline/jquery.sparkline.js b/addons/crm/static/lib/sparkline/jquery.sparkline.js
new file mode 100644
index 00000000000..c003923e03b
--- /dev/null
+++ b/addons/crm/static/lib/sparkline/jquery.sparkline.js
@@ -0,0 +1,3047 @@
+/**
+*
+* jquery.sparkline.js
+*
+* v2.1.1
+* (c) Splunk, Inc
+* Contact: Gareth Watts (gareth@splunk.com)
+* http://omnipotent.net/jquery.sparkline/
+*
+* Generates inline sparkline charts from data supplied either to the method
+* or inline in HTML
+*
+* Compatible with Internet Explorer 6.0+ and modern browsers equipped with the canvas tag
+* (Firefox 2.0+, Safari, Opera, etc)
+*
+* License: New BSD License
+*
+* Copyright (c) 2012, Splunk Inc.
+* All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without modification,
+* are permitted provided that the following conditions are met:
+*
+*     * Redistributions of source code must retain the above copyright notice,
+*       this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright notice,
+*       this list of conditions and the following disclaimer in the documentation
+*       and/or other materials provided with the distribution.
+*     * Neither the name of Splunk Inc nor the names of its contributors may
+*       be used to endorse or promote products derived from this software without
+*       specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+* SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+* OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+*
+* Usage:
+*  $(selector).sparkline(values, options)
+*
+* If values is undefined or set to 'html' then the data values are read from the specified tag:
+*   <p>Sparkline: <span class="sparkline">1,4,6,6,8,5,3,5</span></p>
+*   $('.sparkline').sparkline();
+* There must be no spaces in the enclosed data set
+*
+* Otherwise values must be an array of numbers or null values
+*    <p>Sparkline: <span id="sparkline1">This text replaced if the browser is compatible</span></p>
+*    $('#sparkline1').sparkline([1,4,6,6,8,5,3,5])
+*    $('#sparkline2').sparkline([1,4,6,null,null,5,3,5])
+*
+* Values can also be specified in an HTML comment, or as a values attribute:
+*    <p>Sparkline: <span class="sparkline"><!--1,4,6,6,8,5,3,5 --></span></p>
+*    <p>Sparkline: <span class="sparkline" values="1,4,6,6,8,5,3,5"></span></p>
+*    $('.sparkline').sparkline();
+*
+* For line charts, x values can also be specified:
+*   <p>Sparkline: <span class="sparkline">1:1,2.7:4,3.4:6,5:6,6:8,8.7:5,9:3,10:5</span></p>
+*    $('#sparkline1').sparkline([ [1,1], [2.7,4], [3.4,6], [5,6], [6,8], [8.7,5], [9,3], [10,5] ])
+*
+* By default, options should be passed in as teh second argument to the sparkline function:
+*   $('.sparkline').sparkline([1,2,3,4], {type: 'bar'})
+*
+* Options can also be set by passing them on the tag itself.  This feature is disabled by default though
+* as there's a slight performance overhead:
+*   $('.sparkline').sparkline([1,2,3,4], {enableTagOptions: true})
+*   <p>Sparkline: <span class="sparkline" sparkType="bar" sparkBarColor="red">loading</span></p>
+* Prefix all options supplied as tag attribute with "spark" (configurable by setting tagOptionPrefix)
+*
+* Supported options:
+*   lineColor - Color of the line used for the chart
+*   fillColor - Color used to fill in the chart - Set to '' or false for a transparent chart
+*   width - Width of the chart - Defaults to 3 times the number of values in pixels
+*   height - Height of the chart - Defaults to the height of the containing element
+*   chartRangeMin - Specify the minimum value to use for the Y range of the chart - Defaults to the minimum value supplied
+*   chartRangeMax - Specify the maximum value to use for the Y range of the chart - Defaults to the maximum value supplied
+*   chartRangeClip - Clip out of range values to the max/min specified by chartRangeMin and chartRangeMax
+*   chartRangeMinX - Specify the minimum value to use for the X range of the chart - Defaults to the minimum value supplied
+*   chartRangeMaxX - Specify the maximum value to use for the X range of the chart - Defaults to the maximum value supplied
+*   composite - If true then don't erase any existing chart attached to the tag, but draw
+*           another chart over the top - Note that width and height are ignored if an
+*           existing chart is detected.
+*   tagValuesAttribute - Name of tag attribute to check for data values - Defaults to 'values'
+*   enableTagOptions - Whether to check tags for sparkline options
+*   tagOptionPrefix - Prefix used for options supplied as tag attributes - Defaults to 'spark'
+*   disableHiddenCheck - If set to true, then the plugin will assume that charts will never be drawn into a
+*           hidden dom element, avoding a browser reflow
+*   disableInteraction - If set to true then all mouseover/click interaction behaviour will be disabled,
+*       making the plugin perform much like it did in 1.x
+*   disableTooltips - If set to true then tooltips will be disabled - Defaults to false (tooltips enabled)
+*   disableHighlight - If set to true then highlighting of selected chart elements on mouseover will be disabled
+*       defaults to false (highlights enabled)
+*   highlightLighten - Factor to lighten/darken highlighted chart values by - Defaults to 1.4 for a 40% increase
+*   tooltipContainer - Specify which DOM element the tooltip should be rendered into - defaults to document.body
+*   tooltipClassname - Optional CSS classname to apply to tooltips - If not specified then a default style will be applied
+*   tooltipOffsetX - How many pixels away from the mouse pointer to render the tooltip on the X axis
+*   tooltipOffsetY - How many pixels away from the mouse pointer to render the tooltip on the r axis
+*   tooltipFormatter  - Optional callback that allows you to override the HTML displayed in the tooltip
+*       callback is given arguments of (sparkline, options, fields)
+*   tooltipChartTitle - If specified then the tooltip uses the string specified by this setting as a title
+*   tooltipFormat - A format string or SPFormat object  (or an array thereof for multiple entries)
+*       to control the format of the tooltip
+*   tooltipPrefix - A string to prepend to each field displayed in a tooltip
+*   tooltipSuffix - A string to append to each field displayed in a tooltip
+*   tooltipSkipNull - If true then null values will not have a tooltip displayed (defaults to true)
+*   tooltipValueLookups - An object or range map to map field values to tooltip strings
+*       (eg. to map -1 to "Lost", 0 to "Draw", and 1 to "Win")
+*   numberFormatter - Optional callback for formatting numbers in tooltips
+*   numberDigitGroupSep - Character to use for group separator in numbers "1,234" - Defaults to ","
+*   numberDecimalMark - Character to use for the decimal point when formatting numbers - Defaults to "."
+*   numberDigitGroupCount - Number of digits between group separator - Defaults to 3
+*
+* There are 7 types of sparkline, selected by supplying a "type" option of 'line' (default),
+* 'bar', 'tristate', 'bullet', 'discrete', 'pie' or 'box'
+*    line - Line chart.  Options:
+*       spotColor - Set to '' to not end each line in a circular spot
+*       minSpotColor - If set, color of spot at minimum value
+*       maxSpotColor - If set, color of spot at maximum value
+*       spotRadius - Radius in pixels
+*       lineWidth - Width of line in pixels
+*       normalRangeMin
+*       normalRangeMax - If set draws a filled horizontal bar between these two values marking the "normal"
+*                      or expected range of values
+*       normalRangeColor - Color to use for the above bar
+*       drawNormalOnTop - Draw the normal range above the chart fill color if true
+*       defaultPixelsPerValue - Defaults to 3 pixels of width for each value in the chart
+*       highlightSpotColor - The color to use for drawing a highlight spot on mouseover - Set to null to disable
+*       highlightLineColor - The color to use for drawing a highlight line on mouseover - Set to null to disable
+*       valueSpots - Specify which points to draw spots on, and in which color.  Accepts a range map
+*
+*   bar - Bar chart.  Options:
+*       barColor - Color of bars for postive values
+*       negBarColor - Color of bars for negative values
+*       zeroColor - Color of bars with zero values
+*       nullColor - Color of bars with null values - Defaults to omitting the bar entirely
+*       barWidth - Width of bars in pixels
+*       colorMap - Optional mappnig of values to colors to override the *BarColor values above
+*                  can be an Array of values to control the color of individual bars or a range map
+*                  to specify colors for individual ranges of values
+*       barSpacing - Gap between bars in pixels
+*       zeroAxis - Centers the y-axis around zero if true
+*
+*   tristate - Charts values of win (>0), lose (<0) or draw (=0)
+*       posBarColor - Color of win values
+*       negBarColor - Color of lose values
+*       zeroBarColor - Color of draw values
+*       barWidth - Width of bars in pixels
+*       barSpacing - Gap between bars in pixels
+*       colorMap - Optional mappnig of values to colors to override the *BarColor values above
+*                  can be an Array of values to control the color of individual bars or a range map
+*                  to specify colors for individual ranges of values
+*
+*   discrete - Options:
+*       lineHeight - Height of each line in pixels - Defaults to 30% of the graph height
+*       thesholdValue - Values less than this value will be drawn using thresholdColor instead of lineColor
+*       thresholdColor
+*
+*   bullet - Values for bullet graphs msut be in the order: target, performance, range1, range2, range3, ...
+*       options:
+*       targetColor - The color of the vertical target marker
+*       targetWidth - The width of the target marker in pixels
+*       performanceColor - The color of the performance measure horizontal bar
+*       rangeColors - Colors to use for each qualitative range background color
+*
+*   pie - Pie chart. Options:
+*       sliceColors - An array of colors to use for pie slices
+*       offset - Angle in degrees to offset the first slice - Try -90 or +90
+*       borderWidth - Width of border to draw around the pie chart, in pixels - Defaults to 0 (no border)
+*       borderColor - Color to use for the pie chart border - Defaults to #000
+*
+*   box - Box plot. Options:
+*       raw - Set to true to supply pre-computed plot points as values
+*             values should be: low_outlier, low_whisker, q1, median, q3, high_whisker, high_outlier
+*             When set to false you can supply any number of values and the box plot will
+*             be computed for you.  Default is false.
+*       showOutliers - Set to true (default) to display outliers as circles
+*       outlierIQR - Interquartile range used to determine outliers.  Default 1.5
+*       boxLineColor - Outline color of the box
+*       boxFillColor - Fill color for the box
+*       whiskerColor - Line color used for whiskers
+*       outlierLineColor - Outline color of outlier circles
+*       outlierFillColor - Fill color of the outlier circles
+*       spotRadius - Radius of outlier circles
+*       medianColor - Line color of the median line
+*       target - Draw a target cross hair at the supplied value (default undefined)
+*
+*
+*
+*   Examples:
+*   $('#sparkline1').sparkline(myvalues, { lineColor: '#f00', fillColor: false });
+*   $('.barsparks').sparkline('html', { type:'bar', height:'40px', barWidth:5 });
+*   $('#tristate').sparkline([1,1,-1,1,0,0,-1], { type:'tristate' }):
+*   $('#discrete').sparkline([1,3,4,5,5,3,4,5], { type:'discrete' });
+*   $('#bullet').sparkline([10,12,12,9,7], { type:'bullet' });
+*   $('#pie').sparkline([1,1,2], { type:'pie' });
+*/
+
+/*jslint regexp: true, browser: true, jquery: true, white: true, nomen: false, plusplus: false, maxerr: 500, indent: 4 */
+
+(function(factory) {
+    if(typeof define === 'function' && define.amd) {
+		define(['jquery'], factory);
+	}
+	else {
+		factory(jQuery);
+	}
+}
+(function($) {
+    'use strict';
+
+    var UNSET_OPTION = {},
+        getDefaults, createClass, SPFormat, clipval, quartile, normalizeValue, normalizeValues,
+        remove, isNumber, all, sum, addCSS, ensureArray, formatNumber, RangeMap,
+        MouseHandler, Tooltip, barHighlightMixin,
+        line, bar, tristate, discrete, bullet, pie, box, defaultStyles, initStyles,
+        VShape, VCanvas_base, VCanvas_canvas, VCanvas_vml, pending, shapeCount = 0;
+
+    /**
+     * Default configuration settings
+     */
+    getDefaults = function () {
+        return {
+            // Settings common to most/all chart types
+            common: {
+                type: 'line',
+                lineColor: '#00f',
+                fillColor: '#cdf',
+                defaultPixelsPerValue: 3,
+                width: 'auto',
+                height: 'auto',
+                composite: false,
+                tagValuesAttribute: 'values',
+                tagOptionsPrefix: 'spark',
+                enableTagOptions: false,
+                enableHighlight: true,
+                highlightLighten: 1.4,
+                tooltipSkipNull: true,
+                tooltipPrefix: '',
+                tooltipSuffix: '',
+                disableHiddenCheck: false,
+                numberFormatter: false,
+                numberDigitGroupCount: 3,
+                numberDigitGroupSep: ',',
+                numberDecimalMark: '.',
+                disableTooltips: false,
+                disableInteraction: false
+            },
+            // Defaults for line charts
+            line: {
+                spotColor: '#f80',
+                highlightSpotColor: '#5f5',
+                highlightLineColor: '#f22',
+                spotRadius: 1.5,
+                minSpotColor: '#f80',
+                maxSpotColor: '#f80',
+                lineWidth: 1,
+                normalRangeMin: undefined,
+                normalRangeMax: undefined,
+                normalRangeColor: '#ccc',
+                drawNormalOnTop: false,
+                chartRangeMin: undefined,
+                chartRangeMax: undefined,
+                chartRangeMinX: undefined,
+                chartRangeMaxX: undefined,
+                tooltipFormat: new SPFormat('<span style="color: {{color}}">&#9679;</span> {{prefix}}{{y}}{{suffix}}')
+            },
+            // Defaults for bar charts
+            bar: {
+                barColor: '#3366cc',
+                negBarColor: '#f44',
+                stackedBarColor: ['#3366cc', '#dc3912', '#ff9900', '#109618', '#66aa00',
+                    '#dd4477', '#0099c6', '#990099'],
+                zeroColor: undefined,
+                nullColor: undefined,
+                zeroAxis: true,
+                barWidth: 4,
+                barSpacing: 1,
+                chartRangeMax: undefined,
+                chartRangeMin: undefined,
+                chartRangeClip: false,
+                colorMap: undefined,
+                tooltipFormat: new SPFormat('<span style="color: {{color}}">&#9679;</span> {{prefix}}{{value}}{{suffix}}')
+            },
+            // Defaults for tristate charts
+            tristate: {
+                barWidth: 4,
+                barSpacing: 1,
+                posBarColor: '#6f6',
+                negBarColor: '#f44',
+                zeroBarColor: '#999',
+                colorMap: {},
+                tooltipFormat: new SPFormat('<span style="color: {{color}}">&#9679;</span> {{value:map}}'),
+                tooltipValueLookups: { map: { '-1': 'Loss', '0': 'Draw', '1': 'Win' } }
+            },
+            // Defaults for discrete charts
+            discrete: {
+                lineHeight: 'auto',
+                thresholdColor: undefined,
+                thresholdValue: 0,
+                chartRangeMax: undefined,
+                chartRangeMin: undefined,
+                chartRangeClip: false,
+                tooltipFormat: new SPFormat('{{prefix}}{{value}}{{suffix}}')
+            },
+            // Defaults for bullet charts
+            bullet: {
+                targetColor: '#f33',
+                targetWidth: 3, // width of the target bar in pixels
+                performanceColor: '#33f',
+                rangeColors: ['#d3dafe', '#a8b6ff', '#7f94ff'],
+                base: undefined, // set this to a number to change the base start number
+                tooltipFormat: new SPFormat('{{fieldkey:fields}} - {{value}}'),
+                tooltipValueLookups: { fields: {r: 'Range', p: 'Performance', t: 'Target'} }
+            },
+            // Defaults for pie charts
+            pie: {
+                offset: 0,
+                sliceColors: ['#3366cc', '#dc3912', '#ff9900', '#109618', '#66aa00',
+                    '#dd4477', '#0099c6', '#990099'],
+                borderWidth: 0,
+                borderColor: '#000',
+                tooltipFormat: new SPFormat('<span style="color: {{color}}">&#9679;</span> {{value}} ({{percent.1}}%)')
+            },
+            // Defaults for box plots
+            box: {
+                raw: false,
+                boxLineColor: '#000',
+                boxFillColor: '#cdf',
+                whiskerColor: '#000',
+                outlierLineColor: '#333',
+                outlierFillColor: '#fff',
+                medianColor: '#f00',
+                showOutliers: true,
+                outlierIQR: 1.5,
+                spotRadius: 1.5,
+                target: undefined,
+                targetColor: '#4a2',
+                chartRangeMax: undefined,
+                chartRangeMin: undefined,
+                tooltipFormat: new SPFormat('{{field:fields}}: {{value}}'),
+                tooltipFormatFieldlistKey: 'field',
+                tooltipValueLookups: { fields: { lq: 'Lower Quartile', med: 'Median',
+                    uq: 'Upper Quartile', lo: 'Left Outlier', ro: 'Right Outlier',
+                    lw: 'Left Whisker', rw: 'Right Whisker'} }
+            }
+        };
+    };
+
+    // You can have tooltips use a css class other than jqstooltip by specifying tooltipClassname
+    defaultStyles = '.jqstooltip { ' +
+            'position: absolute;' +
+            'left: 0px;' +
+            'top: 0px;' +
+            'visibility: hidden;' +
+            'background: rgb(0, 0, 0) transparent;' +
+            'background-color: rgba(0,0,0,0.6);' +
+            'filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#99000000, endColorstr=#99000000);' +
+            '-ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr=#99000000, endColorstr=#99000000)";' +
+            'color: white;' +
+            'font: 10px arial, san serif;' +
+            'text-align: left;' +
+            'white-space: nowrap;' +
+            'padding: 5px;' +
+            'border: 1px solid white;' +
+            'z-index: 10000;' +
+            '}' +
+            '.jqsfield { ' +
+            'color: white;' +
+            'font: 10px arial, san serif;' +
+            'text-align: left;' +
+            '}';
+
+    /**
+     * Utilities
+     */
+
+    createClass = function (/* [baseclass, [mixin, ...]], definition */) {
+        var Class, args;
+        Class = function () {
+            this.init.apply(this, arguments);
+        };
+        if (arguments.length > 1) {
+            if (arguments[0]) {
+                Class.prototype = $.extend(new arguments[0](), arguments[arguments.length - 1]);
+                Class._super = arguments[0].prototype;
+            } else {
+                Class.prototype = arguments[arguments.length - 1];
+            }
+            if (arguments.length > 2) {
+                args = Array.prototype.slice.call(arguments, 1, -1);
+                args.unshift(Class.prototype);
+                $.extend.apply($, args);
+            }
+        } else {
+            Class.prototype = arguments[0];
+        }
+        Class.prototype.cls = Class;
+        return Class;
+    };
+
+    /**
+     * Wraps a format string for tooltips
+     * {{x}}
+     * {{x.2}
+     * {{x:months}}
+     */
+    $.SPFormatClass = SPFormat = createClass({
+        fre: /\{\{([\w.]+?)(:(.+?))?\}\}/g,
+        precre: /(\w+)\.(\d+)/,
+
+        init: function (format, fclass) {
+            this.format = format;
+            this.fclass = fclass;
+        },
+
+        render: function (fieldset, lookups, options) {
+            var self = this,
+                fields = fieldset,
+                match, token, lookupkey, fieldvalue, prec;
+            return this.format.replace(this.fre, function () {
+                var lookup;
+                token = arguments[1];
+                lookupkey = arguments[3];
+                match = self.precre.exec(token);
+                if (match) {
+                    prec = match[2];
+                    token = match[1];
+                } else {
+                    prec = false;
+                }
+                fieldvalue = fields[token];
+                if (fieldvalue === undefined) {
+                    return '';
+                }
+                if (lookupkey && lookups && lookups[lookupkey]) {
+                    lookup = lookups[lookupkey];
+                    if (lookup.get) { // RangeMap
+                        return lookups[lookupkey].get(fieldvalue) || fieldvalue;
+                    } else {
+                        return lookups[lookupkey][fieldvalue] || fieldvalue;
+                    }
+                }
+                if (isNumber(fieldvalue)) {
+                    if (options.get('numberFormatter')) {
+                        fieldvalue = options.get('numberFormatter')(fieldvalue);
+                    } else {
+                        fieldvalue = formatNumber(fieldvalue, prec,
+                            options.get('numberDigitGroupCount'),
+                            options.get('numberDigitGroupSep'),
+                            options.get('numberDecimalMark'));
+                    }
+                }
+                return fieldvalue;
+            });
+        }
+    });
+
+    // convience method to avoid needing the new operator
+    $.spformat = function(format, fclass) {
+        return new SPFormat(format, fclass);
+    };
+
+    clipval = function (val, min, max) {
+        if (val < min) {
+            return min;
+        }
+        if (val > max) {
+            return max;
+        }
+        return val;
+    };
+
+    quartile = function (values, q) {
+        var vl;
+        if (q === 2) {
+            vl = Math.floor(values.length / 2);
+            return values.length % 2 ? values[vl] : (values[vl-1] + values[vl]) / 2;
+        } else {
+            if (values.length % 2 ) { // odd
+                vl = (values.length * q + q) / 4;
+                return vl % 1 ? (values[Math.floor(vl)] + values[Math.floor(vl) - 1]) / 2 : values[vl-1];
+            } else { //even
+                vl = (values.length * q + 2) / 4;
+                return vl % 1 ? (values[Math.floor(vl)] + values[Math.floor(vl) - 1]) / 2 :  values[vl-1];
+
+            }
+        }
+    };
+
+    normalizeValue = function (val) {
+        var nf;
+        switch (val) {
+            case 'undefined':
+                val = undefined;
+                break;
+            case 'null':
+                val = null;
+                break;
+            case 'true':
+                val = true;
+                break;
+            case 'false':
+                val = false;
+                break;
+            default:
+                nf = parseFloat(val);
+                if (val == nf) {
+                    val = nf;
+                }
+        }
+        return val;
+    };
+
+    normalizeValues = function (vals) {
+        var i, result = [];
+        for (i = vals.length; i--;) {
+            result[i] = normalizeValue(vals[i]);
+        }
+        return result;
+    };
+
+    remove = function (vals, filter) {
+        var i, vl, result = [];
+        for (i = 0, vl = vals.length; i < vl; i++) {
+            if (vals[i] !== filter) {
+                result.push(vals[i]);
+            }
+        }
+        return result;
+    };
+
+    isNumber = function (num) {
+        return !isNaN(parseFloat(num)) && isFinite(num);
+    };
+
+    formatNumber = function (num, prec, groupsize, groupsep, decsep) {
+        var p, i;
+        num = (prec === false ? parseFloat(num).toString() : num.toFixed(prec)).split('');
+        p = (p = $.inArray('.', num)) < 0 ? num.length : p;
+        if (p < num.length) {
+            num[p] = decsep;
+        }
+        for (i = p - groupsize; i > 0; i -= groupsize) {
+            num.splice(i, 0, groupsep);
+        }
+        return num.join('');
+    };
+
+    // determine if all values of an array match a value
+    // returns true if the array is empty
+    all = function (val, arr, ignoreNull) {
+        var i;
+        for (i = arr.length; i--; ) {
+            if (ignoreNull && arr[i] === null) continue;
+            if (arr[i] !== val) {
+                return false;
+            }
+        }
+        return true;
+    };
+
+    // sums the numeric values in an array, ignoring other values
+    sum = function (vals) {
+        var total = 0, i;
+        for (i = vals.length; i--;) {
+            total += typeof vals[i] === 'number' ? vals[i] : 0;
+        }
+        return total;
+    };
+
+    ensureArray = function (val) {
+        return $.isArray(val) ? val : [val];
+    };
+
+    // http://paulirish.com/2008/bookmarklet-inject-new-css-rules/
+    addCSS = function(css) {
+        var tag;
+        //if ('\v' == 'v') /* ie only */ {
+        if (document.createStyleSheet) {
+            document.createStyleSheet().cssText = css;
+        } else {
+            tag = document.createElement('style');
+            tag.type = 'text/css';
+            document.getElementsByTagName('head')[0].appendChild(tag);
+            tag[(typeof document.body.style.WebkitAppearance == 'string') /* webkit only */ ? 'innerText' : 'innerHTML'] = css;
+        }
+    };
+
+    // Provide a cross-browser interface to a few simple drawing primitives
+    $.fn.simpledraw = function (width, height, useExisting, interact) {
+        var target, mhandler;
+        if (useExisting && (target = this.data('_jqs_vcanvas'))) {
+            return target;
+        }
+        if (width === undefined) {
+            width = $(this).innerWidth();
+        }
+        if (height === undefined) {
+            height = $(this).innerHeight();
+        }
+        if ($.fn.sparkline.hasCanvas) {
+            target = new VCanvas_canvas(width, height, this, interact);
+        } else if ($.fn.sparkline.hasVML) {
+            target = new VCanvas_vml(width, height, this);
+        } else {
+            return false;
+        }
+        mhandler = $(this).data('_jqs_mhandler');
+        if (mhandler) {
+            mhandler.registerCanvas(target);
+        }
+        return target;
+    };
+
+    $.fn.cleardraw = function () {
+        var target = this.data('_jqs_vcanvas');
+        if (target) {
+            target.reset();
+        }
+    };
+
+    $.RangeMapClass = RangeMap = createClass({
+        init: function (map) {
+            var key, range, rangelist = [];
+            for (key in map) {
+                if (map.hasOwnProperty(key) && typeof key === 'string' && key.indexOf(':') > -1) {
+                    range = key.split(':');
+                    range[0] = range[0].length === 0 ? -Infinity : parseFloat(range[0]);
+                    range[1] = range[1].length === 0 ? Infinity : parseFloat(range[1]);
+                    range[2] = map[key];
+                    rangelist.push(range);
+                }
+            }
+            this.map = map;
+            this.rangelist = rangelist || false;
+        },
+
+        get: function (value) {
+            var rangelist = this.rangelist,
+                i, range, result;
+            if ((result = this.map[value]) !== undefined) {
+                return result;
+            }
+            if (rangelist) {
+                for (i = rangelist.length; i--;) {
+                    range = rangelist[i];
+                    if (range[0] <= value && range[1] >= value) {
+                        return range[2];
+                    }
+                }
+            }
+            return undefined;
+        }
+    });
+
+    // Convenience function
+    $.range_map = function(map) {
+        return new RangeMap(map);
+    };
+
+    MouseHandler = createClass({
+        init: function (el, options) {
+            var $el = $(el);
+            this.$el = $el;
+            this.options = options;
+            this.currentPageX = 0;
+            this.currentPageY = 0;
+            this.el = el;
+            this.splist = [];
+            this.tooltip = null;
+            this.over = false;
+            this.displayTooltips = !options.get('disableTooltips');
+            this.highlightEnabled = !options.get('disableHighlight');
+        },
+
+        registerSparkline: function (sp) {
+            this.splist.push(sp);
+            if (this.over) {
+                this.updateDisplay();
+            }
+        },
+
+        registerCanvas: function (canvas) {
+            var $canvas = $(canvas.canvas);
+            this.canvas = canvas;
+            this.$canvas = $canvas;
+            $canvas.mouseenter($.proxy(this.mouseenter, this));
+            $canvas.mouseleave($.proxy(this.mouseleave, this));
+            $canvas.click($.proxy(this.mouseclick, this));
+        },
+
+        reset: function (removeTooltip) {
+            this.splist = [];
+            if (this.tooltip && removeTooltip) {
+                this.tooltip.remove();
+                this.tooltip = undefined;
+            }
+        },
+
+        mouseclick: function (e) {
+            var clickEvent = $.Event('sparklineClick');
+            clickEvent.originalEvent = e;
+            clickEvent.sparklines = this.splist;
+            this.$el.trigger(clickEvent);
+        },
+
+        mouseenter: function (e) {
+            $(document.body).unbind('mousemove.jqs');
+            $(document.body).bind('mousemove.jqs', $.proxy(this.mousemove, this));
+            this.over = true;
+            this.currentPageX = e.pageX;
+            this.currentPageY = e.pageY;
+            this.currentEl = e.target;
+            if (!this.tooltip && this.displayTooltips) {
+                this.tooltip = new Tooltip(this.options);
+                this.tooltip.updatePosition(e.pageX, e.pageY);
+            }
+            this.updateDisplay();
+        },
+
+        mouseleave: function () {
+            $(document.body).unbind('mousemove.jqs');
+            var splist = this.splist,
+                 spcount = splist.length,
+                 needsRefresh = false,
+                 sp, i;
+            this.over = false;
+            this.currentEl = null;
+
+            if (this.tooltip) {
+                this.tooltip.remove();
+                this.tooltip = null;
+            }
+
+            for (i = 0; i < spcount; i++) {
+                sp = splist[i];
+                if (sp.clearRegionHighlight()) {
+                    needsRefresh = true;
+                }
+            }
+
+            if (needsRefresh) {
+                this.canvas.render();
+            }
+        },
+
+        mousemove: function (e) {
+            this.currentPageX = e.pageX;
+            this.currentPageY = e.pageY;
+            this.currentEl = e.target;
+            if (this.tooltip) {
+                this.tooltip.updatePosition(e.pageX, e.pageY);
+            }
+            this.updateDisplay();
+        },
+
+        updateDisplay: function () {
+            var splist = this.splist,
+                 spcount = splist.length,
+                 needsRefresh = false,
+                 offset = this.$canvas.offset(),
+                 localX = this.currentPageX - offset.left,
+                 localY = this.currentPageY - offset.top,
+                 tooltiphtml, sp, i, result, changeEvent;
+            if (!this.over) {
+                return;
+            }
+            for (i = 0; i < spcount; i++) {
+                sp = splist[i];
+                result = sp.setRegionHighlight(this.currentEl, localX, localY);
+                if (result) {
+                    needsRefresh = true;
+                }
+            }
+            if (needsRefresh) {
+                changeEvent = $.Event('sparklineRegionChange');
+                changeEvent.sparklines = this.splist;
+                this.$el.trigger(changeEvent);
+                if (this.tooltip) {
+                    tooltiphtml = '';
+                    for (i = 0; i < spcount; i++) {
+                        sp = splist[i];
+                        tooltiphtml += sp.getCurrentRegionTooltip();
+                    }
+                    this.tooltip.setContent(tooltiphtml);
+                }
+                if (!this.disableHighlight) {
+                    this.canvas.render();
+                }
+            }
+            if (result === null) {
+                this.mouseleave();
+            }
+        }
+    });
+
+
+    Tooltip = createClass({
+        sizeStyle: 'position: static !important;' +
+            'display: block !important;' +
+            'visibility: hidden !important;' +
+            'float: left !important;',
+
+        init: function (options) {
+            var tooltipClassname = options.get('tooltipClassname', 'jqstooltip'),
+                sizetipStyle = this.sizeStyle,
+                offset;
+            this.container = options.get('tooltipContainer') || document.body;
+            this.tooltipOffsetX = options.get('tooltipOffsetX', 10);
+            this.tooltipOffsetY = options.get('tooltipOffsetY', 12);
+            // remove any previous lingering tooltip
+            $('#jqssizetip').remove();
+            $('#jqstooltip').remove();
+            this.sizetip = $('<div/>', {
+                id: 'jqssizetip',
+                style: sizetipStyle,
+                'class': tooltipClassname
+            });
+            this.tooltip = $('<div/>', {
+                id: 'jqstooltip',
+                'class': tooltipClassname
+            }).appendTo(this.container);
+            // account for the container's location
+            offset = this.tooltip.offset();
+            this.offsetLeft = offset.left;
+            this.offsetTop = offset.top;
+            this.hidden = true;
+            $(window).unbind('resize.jqs scroll.jqs');
+            $(window).bind('resize.jqs scroll.jqs', $.proxy(this.updateWindowDims, this));
+            this.updateWindowDims();
+        },
+
+        updateWindowDims: function () {
+            this.scrollTop = $(window).scrollTop();
+            this.scrollLeft = $(window).scrollLeft();
+            this.scrollRight = this.scrollLeft + $(window).width();
+            this.updatePosition();
+        },
+
+        getSize: function (content) {
+            this.sizetip.html(content).appendTo(this.container);
+            this.width = this.sizetip.width() + 1;
+            this.height = this.sizetip.height();
+            this.sizetip.remove();
+        },
+
+        setContent: function (content) {
+            if (!content) {
+                this.tooltip.css('visibility', 'hidden');
+                this.hidden = true;
+                return;
+            }
+            this.getSize(content);
+            this.tooltip.html(content)
+                .css({
+                    'width': this.width,
+                    'height': this.height,
+                    'visibility': 'visible'
+                });
+            if (this.hidden) {
+                this.hidden = false;
+                this.updatePosition();
+            }
+        },
+
+        updatePosition: function (x, y) {
+            if (x === undefined) {
+                if (this.mousex === undefined) {
+                    return;
+                }
+                x = this.mousex - this.offsetLeft;
+                y = this.mousey - this.offsetTop;
+
+            } else {
+                this.mousex = x = x - this.offsetLeft;
+                this.mousey = y = y - this.offsetTop;
+            }
+            if (!this.height || !this.width || this.hidden) {
+                return;
+            }
+
+            y -= this.height + this.tooltipOffsetY;
+            x += this.tooltipOffsetX;
+
+            if (y < this.scrollTop) {
+                y = this.scrollTop;
+            }
+            if (x < this.scrollLeft) {
+                x = this.scrollLeft;
+            } else if (x + this.width > this.scrollRight) {
+                x = this.scrollRight - this.width;
+            }
+
+            this.tooltip.css({
+                'left': x,
+                'top': y
+            });
+        },
+
+        remove: function () {
+            this.tooltip.remove();
+            this.sizetip.remove();
+            this.sizetip = this.tooltip = undefined;
+            $(window).unbind('resize.jqs scroll.jqs');
+        }
+    });
+
+    initStyles = function() {
+        addCSS(defaultStyles);
+    };
+
+    $(initStyles);
+
+    pending = [];
+    $.fn.sparkline = function (userValues, userOptions) {
+        return this.each(function () {
+            var options = new $.fn.sparkline.options(this, userOptions),
+                 $this = $(this),
+                 render, i;
+            render = function () {
+                var values, width, height, tmp, mhandler, sp, vals;
+                if (userValues === 'html' || userValues === undefined) {
+                    vals = this.getAttribute(options.get('tagValuesAttribute'));
+                    if (vals === undefined || vals === null) {
+                        vals = $this.html();
+                    }
+                    values = vals.replace(/(^\s*<!--)|(-->\s*$)|\s+/g, '').split(',');
+                } else {
+                    values = userValues;
+                }
+
+                width = options.get('width') === 'auto' ? values.length * options.get('defaultPixelsPerValue') : options.get('width');
+                if (options.get('height') === 'auto') {
+                    if (!options.get('composite') || !$.data(this, '_jqs_vcanvas')) {
+                        // must be a better way to get the line height
+                        tmp = document.createElement('span');
+                        tmp.innerHTML = 'a';
+                        $this.html(tmp);
+                        height = $(tmp).innerHeight() || $(tmp).height();
+                        $(tmp).remove();
+                        tmp = null;
+                    }
+                } else {
+                    height = options.get('height');
+                }
+
+                if (!options.get('disableInteraction')) {
+                    mhandler = $.data(this, '_jqs_mhandler');
+                    if (!mhandler) {
+                        mhandler = new MouseHandler(this, options);
+                        $.data(this, '_jqs_mhandler', mhandler);
+                    } else if (!options.get('composite')) {
+                        mhandler.reset();
+                    }
+                } else {
+                    mhandler = false;
+                }
+
+                if (options.get('composite') && !$.data(this, '_jqs_vcanvas')) {
+                    if (!$.data(this, '_jqs_errnotify')) {
+                        alert('Attempted to attach a composite sparkline to an element with no existing sparkline');
+                        $.data(this, '_jqs_errnotify', true);
+                    }
+                    return;
+                }
+
+                sp = new $.fn.sparkline[options.get('type')](this, values, options, width, height);
+
+                sp.render();
+
+                if (mhandler) {
+                    mhandler.registerSparkline(sp);
+                }
+            };
+            // jQuery 1.3.0 completely changed the meaning of :hidden :-/
+            if (($(this).html() && !options.get('disableHiddenCheck') && $(this).is(':hidden')) || ($.fn.jquery < '1.3.0' && $(this).parents().is(':hidden')) || !$(this).parents('body').length) {
+                if (!options.get('composite') && $.data(this, '_jqs_pending')) {
+                    // remove any existing references to the element
+                    for (i = pending.length; i; i--) {
+                        if (pending[i - 1][0] == this) {
+                            pending.splice(i - 1, 1);
+                        }
+                    }
+                }
+                pending.push([this, render]);
+                $.data(this, '_jqs_pending', true);
+            } else {
+                render.call(this);
+            }
+        });
+    };
+
+    $.fn.sparkline.defaults = getDefaults();
+
+
+    $.sparkline_display_visible = function () {
+        var el, i, pl;
+        var done = [];
+        for (i = 0, pl = pending.length; i < pl; i++) {
+            el = pending[i][0];
+            if ($(el).is(':visible') && !$(el).parents().is(':hidden')) {
+                pending[i][1].call(el);
+                $.data(pending[i][0], '_jqs_pending', false);
+                done.push(i);
+            } else if (!$(el).closest('html').length && !$.data(el, '_jqs_pending')) {
+                // element has been inserted and removed from the DOM
+                // If it was not yet inserted into the dom then the .data request
+                // will return true.
+                // removing from the dom causes the data to be removed.
+                $.data(pending[i][0], '_jqs_pending', false);
+                done.push(i);
+            }
+        }
+        for (i = done.length; i; i--) {
+            pending.splice(done[i - 1], 1);
+        }
+    };
+
+
+    /**
+     * User option handler
+     */
+    $.fn.sparkline.options = createClass({
+        init: function (tag, userOptions) {
+            var extendedOptions, defaults, base, tagOptionType;
+            this.userOptions = userOptions = userOptions || {};
+            this.tag = tag;
+            this.tagValCache = {};
+            defaults = $.fn.sparkline.defaults;
+            base = defaults.common;
+            this.tagOptionsPrefix = userOptions.enableTagOptions && (userOptions.tagOptionsPrefix || base.tagOptionsPrefix);
+
+            tagOptionType = this.getTagSetting('type');
+            if (tagOptionType === UNSET_OPTION) {
+                extendedOptions = defaults[userOptions.type || base.type];
+            } else {
+                extendedOptions = defaults[tagOptionType];
+            }
+            this.mergedOptions = $.extend({}, base, extendedOptions, userOptions);
+        },
+
+
+        getTagSetting: function (key) {
+            var prefix = this.tagOptionsPrefix,
+                val, i, pairs, keyval;
+            if (prefix === false || prefix === undefined) {
+                return UNSET_OPTION;
+            }
+            if (this.tagValCache.hasOwnProperty(key)) {
+                val = this.tagValCache.key;
+            } else {
+                val = this.tag.getAttribute(prefix + key);
+                if (val === undefined || val === null) {
+                    val = UNSET_OPTION;
+                } else if (val.substr(0, 1) === '[') {
+                    val = val.substr(1, val.length - 2).split(',');
+                    for (i = val.length; i--;) {
+                        val[i] = normalizeValue(val[i].replace(/(^\s*)|(\s*$)/g, ''));
+                    }
+                } else if (val.substr(0, 1) === '{') {
+                    pairs = val.substr(1, val.length - 2).split(',');
+                    val = {};
+                    for (i = pairs.length; i--;) {
+                        keyval = pairs[i].split(':', 2);
+                        val[keyval[0].replace(/(^\s*)|(\s*$)/g, '')] = normalizeValue(keyval[1].replace(/(^\s*)|(\s*$)/g, ''));
+                    }
+                } else {
+                    val = normalizeValue(val);
+                }
+                this.tagValCache.key = val;
+            }
+            return val;
+        },
+
+        get: function (key, defaultval) {
+            var tagOption = this.getTagSetting(key),
+                result;
+            if (tagOption !== UNSET_OPTION) {
+                return tagOption;
+            }
+            return (result = this.mergedOptions[key]) === undefined ? defaultval : result;
+        }
+    });
+
+
+    $.fn.sparkline._base = createClass({
+        disabled: false,
+
+        init: function (el, values, options, width, height) {
+            this.el = el;
+            this.$el = $(el);
+            this.values = values;
+            this.options = options;
+            this.width = width;
+            this.height = height;
+            this.currentRegion = undefined;
+        },
+
+        /**
+         * Setup the canvas
+         */
+        initTarget: function () {
+            var interactive = !this.options.get('disableInteraction');
+            if (!(this.target = this.$el.simpledraw(this.width, this.height, this.options.get('composite'), interactive))) {
+                this.disabled = true;
+            } else {
+                this.canvasWidth = this.target.pixelWidth;
+                this.canvasHeight = this.target.pixelHeight;
+            }
+        },
+
+        /**
+         * Actually render the chart to the canvas
+         */
+        render: function () {
+            if (this.disabled) {
+                this.el.innerHTML = '';
+                return false;
+            }
+            return true;
+        },
+
+        /**
+         * Return a region id for a given x/y co-ordinate
+         */
+        getRegion: function (x, y) {
+        },
+
+        /**
+         * Highlight an item based on the moused-over x,y co-ordinate
+         */
+        setRegionHighlight: function (el, x, y) {
+            var currentRegion = this.currentRegion,
+                highlightEnabled = !this.options.get('disableHighlight'),
+                newRegion;
+            if (x > this.canvasWidth || y > this.canvasHeight || x < 0 || y < 0) {
+                return null;
+            }
+            newRegion = this.getRegion(el, x, y);
+            if (currentRegion !== newRegion) {
+                if (currentRegion !== undefined && highlightEnabled) {
+                    this.removeHighlight();
+                }
+                this.currentRegion = newRegion;
+                if (newRegion !== undefined && highlightEnabled) {
+                    this.renderHighlight();
+                }
+                return true;
+            }
+            return false;
+        },
+
+        /**
+         * Reset any currently highlighted item
+         */
+        clearRegionHighlight: function () {
+            if (this.currentRegion !== undefined) {
+                this.removeHighlight();
+                this.currentRegion = undefined;
+                return true;
+            }
+            return false;
+        },
+
+        renderHighlight: function () {
+            this.changeHighlight(true);
+        },
+
+        removeHighlight: function () {
+            this.changeHighlight(false);
+        },
+
+        changeHighlight: function (highlight)  {},
+
+        /**
+         * Fetch the HTML to display as a tooltip
+         */
+        getCurrentRegionTooltip: function () {
+            var options = this.options,
+                header = '',
+                entries = [],
+                fields, formats, formatlen, fclass, text, i,
+                showFields, showFieldsKey, newFields, fv,
+                formatter, format, fieldlen, j;
+            if (this.currentRegion === undefined) {
+                return '';
+            }
+            fields = this.getCurrentRegionFields();
+            formatter = options.get('tooltipFormatter');
+            if (formatter) {
+                return formatter(this, options, fields);
+            }
+            if (options.get('tooltipChartTitle')) {
+                header += '<div class="jqs jqstitle">' + options.get('tooltipChartTitle') + '</div>\n';
+            }
+            formats = this.options.get('tooltipFormat');
+            if (!formats) {
+                return '';
+            }
+            if (!$.isArray(formats)) {
+                formats = [formats];
+            }
+            if (!$.isArray(fields)) {
+                fields = [fields];
+            }
+            showFields = this.options.get('tooltipFormatFieldlist');
+            showFieldsKey = this.options.get('tooltipFormatFieldlistKey');
+            if (showFields && showFieldsKey) {
+                // user-selected ordering of fields
+                newFields = [];
+                for (i = fields.length; i--;) {
+                    fv = fields[i][showFieldsKey];
+                    if ((j = $.inArray(fv, showFields)) != -1) {
+                        newFields[j] = fields[i];
+                    }
+                }
+                fields = newFields;
+            }
+            formatlen = formats.length;
+            fieldlen = fields.length;
+            for (i = 0; i < formatlen; i++) {
+                format = formats[i];
+                if (typeof format === 'string') {
+                    format = new SPFormat(format);
+                }
+                fclass = format.fclass || 'jqsfield';
+                for (j = 0; j < fieldlen; j++) {
+                    if (!fields[j].isNull || !options.get('tooltipSkipNull')) {
+                        $.extend(fields[j], {
+                            prefix: options.get('tooltipPrefix'),
+                            suffix: options.get('tooltipSuffix')
+                        });
+                        text = format.render(fields[j], options.get('tooltipValueLookups'), options);
+                        entries.push('<div class="' + fclass + '">' + text + '</div>');
+                    }
+                }
+            }
+            if (entries.length) {
+                return header + entries.join('\n');
+            }
+            return '';
+        },
+
+        getCurrentRegionFields: function () {},
+
+        calcHighlightColor: function (color, options) {
+            var highlightColor = options.get('highlightColor'),
+                lighten = options.get('highlightLighten'),
+                parse, mult, rgbnew, i;
+            if (highlightColor) {
+                return highlightColor;
+            }
+            if (lighten) {
+                // extract RGB values
+                parse = /^#([0-9a-f])([0-9a-f])([0-9a-f])$/i.exec(color) || /^#([0-9a-f]{2})([0-9a-f]{2})([0-9a-f]{2})$/i.exec(color);
+                if (parse) {
+                    rgbnew = [];
+                    mult = color.length === 4 ? 16 : 1;
+                    for (i = 0; i < 3; i++) {
+                        rgbnew[i] = clipval(Math.round(parseInt(parse[i + 1], 16) * mult * lighten), 0, 255);
+                    }
+                    return 'rgb(' + rgbnew.join(',') + ')';
+                }
+
+            }
+            return color;
+        }
+
+    });
+
+    barHighlightMixin = {
+        changeHighlight: function (highlight) {
+            var currentRegion = this.currentRegion,
+                target = this.target,
+                shapeids = this.regionShapes[currentRegion],
+                newShapes;
+            // will be null if the region value was null
+            if (shapeids) {
+                newShapes = this.renderRegion(currentRegion, highlight);
+                if ($.isArray(newShapes) || $.isArray(shapeids)) {
+                    target.replaceWithShapes(shapeids, newShapes);
+                    this.regionShapes[currentRegion] = $.map(newShapes, function (newShape) {
+                        return newShape.id;
+                    });
+                } else {
+                    target.replaceWithShape(shapeids, newShapes);
+                    this.regionShapes[currentRegion] = newShapes.id;
+                }
+            }
+        },
+
+        render: function () {
+            var values = this.values,
+                target = this.target,
+                regionShapes = this.regionShapes,
+                shapes, ids, i, j;
+
+            if (!this.cls._super.render.call(this)) {
+                return;
+            }
+            for (i = values.length; i--;) {
+                shapes = this.renderRegion(i);
+                if (shapes) {
+                    if ($.isArray(shapes)) {
+                        ids = [];
+                        for (j = shapes.length; j--;) {
+                            shapes[j].append();
+                            ids.push(shapes[j].id);
+                        }
+                        regionShapes[i] = ids;
+                    } else {
+                        shapes.append();
+                        regionShapes[i] = shapes.id; // store just the shapeid
+                    }
+                } else {
+                    // null value
+                    regionShapes[i] = null;
+                }
+            }
+            target.render();
+        }
+    };
+
+    /**
+     * Line charts
+     */
+    $.fn.sparkline.line = line = createClass($.fn.sparkline._base, {
+        type: 'line',
+
+        init: function (el, values, options, width, height) {
+            line._super.init.call(this, el, values, options, width, height);
+            this.vertices = [];
+            this.regionMap = [];
+            this.xvalues = [];
+            this.yvalues = [];
+            this.yminmax = [];
+            this.hightlightSpotId = null;
+            this.lastShapeId = null;
+            this.initTarget();
+        },
+
+        getRegion: function (el, x, y) {
+            var i,
+                regionMap = this.regionMap; // maps regions to value positions
+            for (i = regionMap.length; i--;) {
+                if (regionMap[i] !== null && x >= regionMap[i][0] && x <= regionMap[i][1]) {
+                    return regionMap[i][2];
+                }
+            }
+            return undefined;
+        },
+
+        getCurrentRegionFields: function () {
+            var currentRegion = this.currentRegion;
+            return {
+                isNull: this.yvalues[currentRegion] === null,
+                x: this.xvalues[currentRegion],
+                y: this.yvalues[currentRegion],
+                color: this.options.get('lineColor'),
+                fillColor: this.options.get('fillColor'),
+                offset: currentRegion
+            };
+        },
+
+        renderHighlight: function () {
+            var currentRegion = this.currentRegion,
+                target = this.target,
+                vertex = this.vertices[currentRegion],
+                options = this.options,
+                spotRadius = options.get('spotRadius'),
+                highlightSpotColor = options.get('highlightSpotColor'),
+                highlightLineColor = options.get('highlightLineColor'),
+                highlightSpot, highlightLine;
+
+            if (!vertex) {
+                return;
+            }
+            if (spotRadius && highlightSpotColor) {
+                highlightSpot = target.drawCircle(vertex[0], vertex[1],
+                    spotRadius, undefined, highlightSpotColor);
+                this.highlightSpotId = highlightSpot.id;
+                target.insertAfterShape(this.lastShapeId, highlightSpot);
+            }
+            if (highlightLineColor) {
+                highlightLine = target.drawLine(vertex[0], this.canvasTop, vertex[0],
+                    this.canvasTop + this.canvasHeight, highlightLineColor);
+                this.highlightLineId = highlightLine.id;
+                target.insertAfterShape(this.lastShapeId, highlightLine);
+            }
+        },
+
+        removeHighlight: function () {
+            var target = this.target;
+            if (this.highlightSpotId) {
+                target.removeShapeId(this.highlightSpotId);
+                this.highlightSpotId = null;
+            }
+            if (this.highlightLineId) {
+                target.removeShapeId(this.highlightLineId);
+                this.highlightLineId = null;
+            }
+        },
+
+        scanValues: function () {
+            var values = this.values,
+                valcount = values.length,
+                xvalues = this.xvalues,
+                yvalues = this.yvalues,
+                yminmax = this.yminmax,
+                i, val, isStr, isArray, sp;
+            for (i = 0; i < valcount; i++) {
+                val = values[i];
+                isStr = typeof(values[i]) === 'string';
+                isArray = typeof(values[i]) === 'object' && values[i] instanceof Array;
+                sp = isStr && values[i].split(':');
+                if (isStr && sp.length === 2) { // x:y
+                    xvalues.push(Number(sp[0]));
+                    yvalues.push(Number(sp[1]));
+                    yminmax.push(Number(sp[1]));
+                } else if (isArray) {
+                    xvalues.push(val[0]);
+                    yvalues.push(val[1]);
+                    yminmax.push(val[1]);
+                } else {
+                    xvalues.push(i);
+                    if (values[i] === null || values[i] === 'null') {
+                        yvalues.push(null);
+                    } else {
+                        yvalues.push(Number(val));
+                        yminmax.push(Number(val));
+                    }
+                }
+            }
+            if (this.options.get('xvalues')) {
+                xvalues = this.options.get('xvalues');
+            }
+
+            this.maxy = this.maxyorg = Math.max.apply(Math, yminmax);
+            this.miny = this.minyorg = Math.min.apply(Math, yminmax);
+
+            this.maxx = Math.max.apply(Math, xvalues);
+            this.minx = Math.min.apply(Math, xvalues);
+
+            this.xvalues = xvalues;
+            this.yvalues = yvalues;
+            this.yminmax = yminmax;
+
+        },
+
+        processRangeOptions: function () {
+            var options = this.options,
+                normalRangeMin = options.get('normalRangeMin'),
+                normalRangeMax = options.get('normalRangeMax');
+
+            if (normalRangeMin !== undefined) {
+                if (normalRangeMin < this.miny) {
+                    this.miny = normalRangeMin;
+                }
+                if (normalRangeMax > this.maxy) {
+                    this.maxy = normalRangeMax;
+                }
+            }
+            if (options.get('chartRangeMin') !== undefined && (options.get('chartRangeClip') || options.get('chartRangeMin') < this.miny)) {
+                this.miny = options.get('chartRangeMin');
+            }
+            if (options.get('chartRangeMax') !== undefined && (options.get('chartRangeClip') || options.get('chartRangeMax') > this.maxy)) {
+                this.maxy = options.get('chartRangeMax');
+            }
+            if (options.get('chartRangeMinX') !== undefined && (options.get('chartRangeClipX') || options.get('chartRangeMinX') < this.minx)) {
+                this.minx = options.get('chartRangeMinX');
+            }
+            if (options.get('chartRangeMaxX') !== undefined && (options.get('chartRangeClipX') || options.get('chartRangeMaxX') > this.maxx)) {
+                this.maxx = options.get('chartRangeMaxX');
+            }
+
+        },
+
+        drawNormalRange: function (canvasLeft, canvasTop, canvasHeight, canvasWidth, rangey) {
+            var normalRangeMin = this.options.get('normalRangeMin'),
+                normalRangeMax = this.options.get('normalRangeMax'),
+                ytop = canvasTop + Math.round(canvasHeight - (canvasHeight * ((normalRangeMax - this.miny) / rangey))),
+                height = Math.round((canvasHeight * (normalRangeMax - normalRangeMin)) / rangey);
+            this.target.drawRect(canvasLeft, ytop, canvasWidth, height, undefined, this.options.get('normalRangeColor')).append();
+        },
+
+        render: function () {
+            var options = this.options,
+                target = this.target,
+                canvasWidth = this.canvasWidth,
+                canvasHeight = this.canvasHeight,
+                vertices = this.vertices,
+                spotRadius = options.get('spotRadius'),
+                regionMap = this.regionMap,
+                rangex, rangey, yvallast,
+                canvasTop, canvasLeft,
+                vertex, path, paths, x, y, xnext, xpos, xposnext,
+                last, next, yvalcount, lineShapes, fillShapes, plen,
+                valueSpots, hlSpotsEnabled, color, xvalues, yvalues, i;
+
+            if (!line._super.render.call(this)) {
+                return;
+            }
+
+            this.scanValues();
+            this.processRangeOptions();
+
+            xvalues = this.xvalues;
+            yvalues = this.yvalues;
+
+            if (!this.yminmax.length || this.yvalues.length < 2) {
+                // empty or all null valuess
+                return;
+            }
+
+            canvasTop = canvasLeft = 0;
+
+            rangex = this.maxx - this.minx === 0 ? 1 : this.maxx - this.minx;
+            rangey = this.maxy - this.miny === 0 ? 1 : this.maxy - this.miny;
+            yvallast = this.yvalues.length - 1;
+
+            if (spotRadius && (canvasWidth < (spotRadius * 4) || canvasHeight < (spotRadius * 4))) {
+                spotRadius = 0;
+            }
+            if (spotRadius) {
+                // adjust the canvas size as required so that spots will fit
+                hlSpotsEnabled = options.get('highlightSpotColor') &&  !options.get('disableInteraction');
+                if (hlSpotsEnabled || options.get('minSpotColor') || (options.get('spotColor') && yvalues[yvallast] === this.miny)) {
+                    canvasHeight -= Math.ceil(spotRadius);
+                }
+                if (hlSpotsEnabled || options.get('maxSpotColor') || (options.get('spotColor') && yvalues[yvallast] === this.maxy)) {
+                    canvasHeight -= Math.ceil(spotRadius);
+                    canvasTop += Math.ceil(spotRadius);
+                }
+                if (hlSpotsEnabled ||
+                     ((options.get('minSpotColor') || options.get('maxSpotColor')) && (yvalues[0] === this.miny || yvalues[0] === this.maxy))) {
+                    canvasLeft += Math.ceil(spotRadius);
+                    canvasWidth -= Math.ceil(spotRadius);
+                }
+                if (hlSpotsEnabled || options.get('spotColor') ||
+                    (options.get('minSpotColor') || options.get('maxSpotColor') &&
+                        (yvalues[yvallast] === this.miny || yvalues[yvallast] === this.maxy))) {
+                    canvasWidth -= Math.ceil(spotRadius);
+                }
+            }
+
+
+            canvasHeight--;
+
+            if (options.get('normalRangeMin') !== undefined && !options.get('drawNormalOnTop')) {
+                this.drawNormalRange(canvasLeft, canvasTop, canvasHeight, canvasWidth, rangey);
+            }
+
+            path = [];
+            paths = [path];
+            last = next = null;
+            yvalcount = yvalues.length;
+            for (i = 0; i < yvalcount; i++) {
+                x = xvalues[i];
+                xnext = xvalues[i + 1];
+                y = yvalues[i];
+                xpos = canvasLeft + Math.round((x - this.minx) * (canvasWidth / rangex));
+                xposnext = i < yvalcount - 1 ? canvasLeft + Math.round((xnext - this.minx) * (canvasWidth / rangex)) : canvasWidth;
+                next = xpos + ((xposnext - xpos) / 2);
+                regionMap[i] = [last || 0, next, i];
+                last = next;
+                if (y === null) {
+                    if (i) {
+                        if (yvalues[i - 1] !== null) {
+                            path = [];
+                            paths.push(path);
+                        }
+                        vertices.push(null);
+                    }
+                } else {
+                    if (y < this.miny) {
+                        y = this.miny;
+                    }
+                    if (y > this.maxy) {
+                        y = this.maxy;
+                    }
+                    if (!path.length) {
+                        // previous value was null
+                        path.push([xpos, canvasTop + canvasHeight]);
+                    }
+                    vertex = [xpos, canvasTop + Math.round(canvasHeight - (canvasHeight * ((y - this.miny) / rangey)))];
+                    path.push(vertex);
+                    vertices.push(vertex);
+                }
+            }
+
+            lineShapes = [];
+            fillShapes = [];
+            plen = paths.length;
+            for (i = 0; i < plen; i++) {
+                path = paths[i];
+                if (path.length) {
+                    if (options.get('fillColor')) {
+                        path.push([path[path.length - 1][0], (canvasTop + canvasHeight)]);
+                        fillShapes.push(path.slice(0));
+                        path.pop();
+                    }
+                    // if there's only a single point in this path, then we want to display it
+                    // as a vertical line which means we keep path[0]  as is
+                    if (path.length > 2) {
+                        // else we want the first value
+                        path[0] = [path[0][0], path[1][1]];
+                    }
+                    lineShapes.push(path);
+                }
+            }
+
+            // draw the fill first, then optionally the normal range, then the line on top of that
+            plen = fillShapes.length;
+            for (i = 0; i < plen; i++) {
+                target.drawShape(fillShapes[i],
+                    options.get('fillColor'), options.get('fillColor')).append();
+            }
+
+            if (options.get('normalRangeMin') !== undefined && options.get('drawNormalOnTop')) {
+                this.drawNormalRange(canvasLeft, canvasTop, canvasHeight, canvasWidth, rangey);
+            }
+
+            plen = lineShapes.length;
+            for (i = 0; i < plen; i++) {
+                target.drawShape(lineShapes[i], options.get('lineColor'), undefined,
+                    options.get('lineWidth')).append();
+            }
+
+            if (spotRadius && options.get('valueSpots')) {
+                valueSpots = options.get('valueSpots');
+                if (valueSpots.get === undefined) {
+                    valueSpots = new RangeMap(valueSpots);
+                }
+                for (i = 0; i < yvalcount; i++) {
+                    color = valueSpots.get(yvalues[i]);
+                    if (color) {
+                        target.drawCircle(canvasLeft + Math.round((xvalues[i] - this.minx) * (canvasWidth / rangex)),
+                            canvasTop + Math.round(canvasHeight - (canvasHeight * ((yvalues[i] - this.miny) / rangey))),
+                            spotRadius, undefined,
+                            color).append();
+                    }
+                }
+
+            }
+            if (spotRadius && options.get('spotColor') && yvalues[yvallast] !== null) {
+                target.drawCircle(canvasLeft + Math.round((xvalues[xvalues.length - 1] - this.minx) * (canvasWidth / rangex)),
+                    canvasTop + Math.round(canvasHeight - (canvasHeight * ((yvalues[yvallast] - this.miny) / rangey))),
+                    spotRadius, undefined,
+                    options.get('spotColor')).append();
+            }
+            if (this.maxy !== this.minyorg) {
+                if (spotRadius && options.get('minSpotColor')) {
+                    x = xvalues[$.inArray(this.minyorg, yvalues)];
+                    target.drawCircle(canvasLeft + Math.round((x - this.minx) * (canvasWidth / rangex)),
+                        canvasTop + Math.round(canvasHeight - (canvasHeight * ((this.minyorg - this.miny) / rangey))),
+                        spotRadius, undefined,
+                        options.get('minSpotColor')).append();
+                }
+                if (spotRadius && options.get('maxSpotColor')) {
+                    x = xvalues[$.inArray(this.maxyorg, yvalues)];
+                    target.drawCircle(canvasLeft + Math.round((x - this.minx) * (canvasWidth / rangex)),
+                        canvasTop + Math.round(canvasHeight - (canvasHeight * ((this.maxyorg - this.miny) / rangey))),
+                        spotRadius, undefined,
+                        options.get('maxSpotColor')).append();
+                }
+            }
+
+            this.lastShapeId = target.getLastShapeId();
+            this.canvasTop = canvasTop;
+            target.render();
+        }
+    });
+
+    /**
+     * Bar charts
+     */
+    $.fn.sparkline.bar = bar = createClass($.fn.sparkline._base, barHighlightMixin, {
+        type: 'bar',
+
+        init: function (el, values, options, width, height) {
+            var barWidth = parseInt(options.get('barWidth'), 10),
+                barSpacing = parseInt(options.get('barSpacing'), 10),
+                chartRangeMin = options.get('chartRangeMin'),
+                chartRangeMax = options.get('chartRangeMax'),
+                chartRangeClip = options.get('chartRangeClip'),
+                stackMin = Infinity,
+                stackMax = -Infinity,
+                isStackString, groupMin, groupMax, stackRanges,
+                numValues, i, vlen, range, zeroAxis, xaxisOffset, min, max, clipMin, clipMax,
+                stacked, vlist, j, slen, svals, val, yoffset, yMaxCalc, canvasHeightEf;
+            bar._super.init.call(this, el, values, options, width, height);
+
+            // scan values to determine whether to stack bars
+            for (i = 0, vlen = values.length; i < vlen; i++) {
+                val = values[i];
+                isStackString = typeof(val) === 'string' && val.indexOf(':') > -1;
+                if (isStackString || $.isArray(val)) {
+                    stacked = true;
+                    if (isStackString) {
+                        val = values[i] = normalizeValues(val.split(':'));
+                    }
+                    val = remove(val, null); // min/max will treat null as zero
+                    groupMin = Math.min.apply(Math, val);
+                    groupMax = Math.max.apply(Math, val);
+                    if (groupMin < stackMin) {
+                        stackMin = groupMin;
+                    }
+                    if (groupMax > stackMax) {
+                        stackMax = groupMax;
+                    }
+                }
+            }
+
+            this.stacked = stacked;
+            this.regionShapes = {};
+            this.barWidth = barWidth;
+            this.barSpacing = barSpacing;
+            this.totalBarWidth = barWidth + barSpacing;
+            this.width = width = (values.length * barWidth) + ((values.length - 1) * barSpacing);
+
+            this.initTarget();
+
+            if (chartRangeClip) {
+                clipMin = chartRangeMin === undefined ? -Infinity : chartRangeMin;
+                clipMax = chartRangeMax === undefined ? Infinity : chartRangeMax;
+            }
+
+            numValues = [];
+            stackRanges = stacked ? [] : numValues;
+            var stackTotals = [];
+            var stackRangesNeg = [];
+            for (i = 0, vlen = values.length; i < vlen; i++) {
+                if (stacked) {
+                    vlist = values[i];
+                    values[i] = svals = [];
+                    stackTotals[i] = 0;
+                    stackRanges[i] = stackRangesNeg[i] = 0;
+                    for (j = 0, slen = vlist.length; j < slen; j++) {
+                        val = svals[j] = chartRangeClip ? clipval(vlist[j], clipMin, clipMax) : vlist[j];
+                        if (val !== null) {
+                            if (val > 0) {
+                                stackTotals[i] += val;
+                            }
+                            if (stackMin < 0 && stackMax > 0) {
+                                if (val < 0) {
+                                    stackRangesNeg[i] += Math.abs(val);
+                                } else {
+                                    stackRanges[i] += val;
+                                }
+                            } else {
+                                stackRanges[i] += Math.abs(val - (val < 0 ? stackMax : stackMin));
+                            }
+                            numValues.push(val);
+                        }
+                    }
+                } else {
+                    val = chartRangeClip ? clipval(values[i], clipMin, clipMax) : values[i];
+                    val = values[i] = normalizeValue(val);
+                    if (val !== null) {
+                        numValues.push(val);
+                    }
+                }
+            }
+            this.max = max = Math.max.apply(Math, numValues);
+            this.min = min = Math.min.apply(Math, numValues);
+            this.stackMax = stackMax = stacked ? Math.max.apply(Math, stackTotals) : max;
+            this.stackMin = stackMin = stacked ? Math.min.apply(Math, numValues) : min;
+
+            if (options.get('chartRangeMin') !== undefined && (options.get('chartRangeClip') || options.get('chartRangeMin') < min)) {
+                min = options.get('chartRangeMin');
+            }
+            if (options.get('chartRangeMax') !== undefined && (options.get('chartRangeClip') || options.get('chartRangeMax') > max)) {
+                max = options.get('chartRangeMax');
+            }
+
+            this.zeroAxis = zeroAxis = options.get('zeroAxis', true);
+            if (min <= 0 && max >= 0 && zeroAxis) {
+                xaxisOffset = 0;
+            } else if (zeroAxis == false) {
+                xaxisOffset = min;
+            } else if (min > 0) {
+                xaxisOffset = min;
+            } else {
+                xaxisOffset = max;
+            }
+            this.xaxisOffset = xaxisOffset;
+
+            range = stacked ? (Math.max.apply(Math, stackRanges) + Math.max.apply(Math, stackRangesNeg)) : max - min;
+
+            // as we plot zero/min values a single pixel line, we add a pixel to all other
+            // values - Reduce the effective canvas size to suit
+            this.canvasHeightEf = (zeroAxis && min < 0) ? this.canvasHeight - 2 : this.canvasHeight - 1;
+
+            if (min < xaxisOffset) {
+                yMaxCalc = (stacked && max >= 0) ? stackMax : max;
+                yoffset = (yMaxCalc - xaxisOffset) / range * this.canvasHeight;
+                if (yoffset !== Math.ceil(yoffset)) {
+                    this.canvasHeightEf -= 2;
+                    yoffset = Math.ceil(yoffset);
+                }
+            } else {
+                yoffset = this.canvasHeight;
+            }
+            this.yoffset = yoffset;
+
+            if ($.isArray(options.get('colorMap'))) {
+                this.colorMapByIndex = options.get('colorMap');
+                this.colorMapByValue = null;
+            } else {
+                this.colorMapByIndex = null;
+                this.colorMapByValue = options.get('colorMap');
+                if (this.colorMapByValue && this.colorMapByValue.get === undefined) {
+                    this.colorMapByValue = new RangeMap(this.colorMapByValue);
+                }
+            }
+
+            this.range = range;
+        },
+
+        getRegion: function (el, x, y) {
+            var result = Math.floor(x / this.totalBarWidth);
+            return (result < 0 || result >= this.values.length) ? undefined : result;
+        },
+
+        getCurrentRegionFields: function () {
+            var currentRegion = this.currentRegion,
+                values = ensureArray(this.values[currentRegion]),
+                result = [],
+                value, i;
+            for (i = values.length; i--;) {
+                value = values[i];
+                result.push({
+                    isNull: value === null,
+                    value: value,
+                    color: this.calcColor(i, value, currentRegion),
+                    offset: currentRegion
+                });
+            }
+            return result;
+        },
+
+        calcColor: function (stacknum, value, valuenum) {
+            var colorMapByIndex = this.colorMapByIndex,
+                colorMapByValue = this.colorMapByValue,
+                options = this.options,
+                color, newColor;
+            if (this.stacked) {
+                color = options.get('stackedBarColor');
+            } else {
+                color = (value < 0) ? options.get('negBarColor') : options.get('barColor');
+            }
+            if (value === 0 && options.get('zeroColor') !== undefined) {
+                color = options.get('zeroColor');
+            }
+            if (colorMapByValue && (newColor = colorMapByValue.get(value))) {
+                color = newColor;
+            } else if (colorMapByIndex && colorMapByIndex.length > valuenum) {
+                color = colorMapByIndex[valuenum];
+            }
+            return $.isArray(color) ? color[stacknum % color.length] : color;
+        },
+
+        /**
+         * Render bar(s) for a region
+         */
+        renderRegion: function (valuenum, highlight) {
+            var vals = this.values[valuenum],
+                options = this.options,
+                xaxisOffset = this.xaxisOffset,
+                result = [],
+                range = this.range,
+                stacked = this.stacked,
+                target = this.target,
+                x = valuenum * this.totalBarWidth,
+                canvasHeightEf = this.canvasHeightEf,
+                yoffset = this.yoffset,
+                y, height, color, isNull, yoffsetNeg, i, valcount, val, minPlotted, allMin;
+
+            vals = $.isArray(vals) ? vals : [vals];
+            valcount = vals.length;
+            val = vals[0];
+            isNull = all(null, vals);
+            allMin = all(xaxisOffset, vals, true);
+
+            if (isNull) {
+                if (options.get('nullColor')) {
+                    color = highlight ? options.get('nullColor') : this.calcHighlightColor(options.get('nullColor'), options);
+                    y = (yoffset > 0) ? yoffset - 1 : yoffset;
+                    return target.drawRect(x, y, this.barWidth - 1, 0, color, color);
+                } else {
+                    return undefined;
+                }
+            }
+            yoffsetNeg = yoffset;
+            for (i = 0; i < valcount; i++) {
+                val = vals[i];
+
+                if (stacked && val === xaxisOffset) {
+                    if (!allMin || minPlotted) {
+                        continue;
+                    }
+                    minPlotted = true;
+                }
+
+                if (range > 0) {
+                    height = Math.floor(canvasHeightEf * ((Math.abs(val - xaxisOffset) / range))) + 1;
+                } else {
+                    height = 1;
+                }
+                if (val < xaxisOffset || (val === xaxisOffset && yoffset === 0)) {
+                    y = yoffsetNeg;
+                    yoffsetNeg += height;
+                } else {
+                    y = yoffset - height;
+                    yoffset -= height;
+                }
+                color = this.calcColor(i, val, valuenum);
+                if (highlight) {
+                    color = this.calcHighlightColor(color, options);
+                }
+                result.push(target.drawRect(x, y, this.barWidth - 1, height - 1, color, color));
+            }
+            if (result.length === 1) {
+                return result[0];
+            }
+            return result;
+        }
+    });
+
+    /**
+     * Tristate charts
+     */
+    $.fn.sparkline.tristate = tristate = createClass($.fn.sparkline._base, barHighlightMixin, {
+        type: 'tristate',
+
+        init: function (el, values, options, width, height) {
+            var barWidth = parseInt(options.get('barWidth'), 10),
+                barSpacing = parseInt(options.get('barSpacing'), 10);
+            tristate._super.init.call(this, el, values, options, width, height);
+
+            this.regionShapes = {};
+            this.barWidth = barWidth;
+            this.barSpacing = barSpacing;
+            this.totalBarWidth = barWidth + barSpacing;
+            this.values = $.map(values, Number);
+            this.width = width = (values.length * barWidth) + ((values.length - 1) * barSpacing);
+
+            if ($.isArray(options.get('colorMap'))) {
+                this.colorMapByIndex = options.get('colorMap');
+                this.colorMapByValue = null;
+            } else {
+                this.colorMapByIndex = null;
+                this.colorMapByValue = options.get('colorMap');
+                if (this.colorMapByValue && this.colorMapByValue.get === undefined) {
+                    this.colorMapByValue = new RangeMap(this.colorMapByValue);
+                }
+            }
+            this.initTarget();
+        },
+
+        getRegion: function (el, x, y) {
+            return Math.floor(x / this.totalBarWidth);
+        },
+
+        getCurrentRegionFields: function () {
+            var currentRegion = this.currentRegion;
+            return {
+                isNull: this.values[currentRegion] === undefined,
+                value: this.values[currentRegion],
+                color: this.calcColor(this.values[currentRegion], currentRegion),
+                offset: currentRegion
+            };
+        },
+
+        calcColor: function (value, valuenum) {
+            var values = this.values,
+                options = this.options,
+                colorMapByIndex = this.colorMapByIndex,
+                colorMapByValue = this.colorMapByValue,
+                color, newColor;
+
+            if (colorMapByValue && (newColor = colorMapByValue.get(value))) {
+                color = newColor;
+            } else if (colorMapByIndex && colorMapByIndex.length > valuenum) {
+                color = colorMapByIndex[valuenum];
+            } else if (values[valuenum] < 0) {
+                color = options.get('negBarColor');
+            } else if (values[valuenum] > 0) {
+                color = options.get('posBarColor');
+            } else {
+                color = options.get('zeroBarColor');
+            }
+            return color;
+        },
+
+        renderRegion: function (valuenum, highlight) {
+            var values = this.values,
+                options = this.options,
+                target = this.target,
+                canvasHeight, height, halfHeight,
+                x, y, color;
+
+            canvasHeight = target.pixelHeight;
+            halfHeight = Math.round(canvasHeight / 2);
+
+            x = valuenum * this.totalBarWidth;
+            if (values[valuenum] < 0) {
+                y = halfHeight;
+                height = halfHeight - 1;
+            } else if (values[valuenum] > 0) {
+                y = 0;
+                height = halfHeight - 1;
+            } else {
+                y = halfHeight - 1;
+                height = 2;
+            }
+            color = this.calcColor(values[valuenum], valuenum);
+            if (color === null) {
+                return;
+            }
+            if (highlight) {
+                color = this.calcHighlightColor(color, options);
+            }
+            return target.drawRect(x, y, this.barWidth - 1, height - 1, color, color);
+        }
+    });
+
+    /**
+     * Discrete charts
+     */
+    $.fn.sparkline.discrete = discrete = createClass($.fn.sparkline._base, barHighlightMixin, {
+        type: 'discrete',
+
+        init: function (el, values, options, width, height) {
+            discrete._super.init.call(this, el, values, options, width, height);
+
+            this.regionShapes = {};
+            this.values = values = $.map(values, Number);
+            this.min = Math.min.apply(Math, values);
+            this.max = Math.max.apply(Math, values);
+            this.range = this.max - this.min;
+            this.width = width = options.get('width') === 'auto' ? values.length * 2 : this.width;
+            this.interval = Math.floor(width / values.length);
+            this.itemWidth = width / values.length;
+            if (options.get('chartRangeMin') !== undefined && (options.get('chartRangeClip') || options.get('chartRangeMin') < this.min)) {
+                this.min = options.get('chartRangeMin');
+            }
+            if (options.get('chartRangeMax') !== undefined && (options.get('chartRangeClip') || options.get('chartRangeMax') > this.max)) {
+                this.max = options.get('chartRangeMax');
+            }
+            this.initTarget();
+            if (this.target) {
+                this.lineHeight = options.get('lineHeight') === 'auto' ? Math.round(this.canvasHeight * 0.3) : options.get('lineHeight');
+            }
+        },
+
+        getRegion: function (el, x, y) {
+            return Math.floor(x / this.itemWidth);
+        },
+
+        getCurrentRegionFields: function () {
+            var currentRegion = this.currentRegion;
+            return {
+                isNull: this.values[currentRegion] === undefined,
+                value: this.values[currentRegion],
+                offset: currentRegion
+            };
+        },
+
+        renderRegion: function (valuenum, highlight) {
+            var values = this.values,
+                options = this.options,
+                min = this.min,
+                max = this.max,
+                range = this.range,
+                interval = this.interval,
+                target = this.target,
+                canvasHeight = this.canvasHeight,
+                lineHeight = this.lineHeight,
+                pheight = canvasHeight - lineHeight,
+                ytop, val, color, x;
+
+            val = clipval(values[valuenum], min, max);
+            x = valuenum * interval;
+            ytop = Math.round(pheight - pheight * ((val - min) / range));
+            color = (options.get('thresholdColor') && val < options.get('thresholdValue')) ? options.get('thresholdColor') : options.get('lineColor');
+            if (highlight) {
+                color = this.calcHighlightColor(color, options);
+            }
+            return target.drawLine(x, ytop, x, ytop + lineHeight, color);
+        }
+    });
+
+    /**
+     * Bullet charts
+     */
+    $.fn.sparkline.bullet = bullet = createClass($.fn.sparkline._base, {
+        type: 'bullet',
+
+        init: function (el, values, options, width, height) {
+            var min, max, vals;
+            bullet._super.init.call(this, el, values, options, width, height);
+
+            // values: target, performance, range1, range2, range3
+            this.values = values = normalizeValues(values);
+            // target or performance could be null
+            vals = values.slice();
+            vals[0] = vals[0] === null ? vals[2] : vals[0];
+            vals[1] = values[1] === null ? vals[2] : vals[1];
+            min = Math.min.apply(Math, values);
+            max = Math.max.apply(Math, values);
+            if (options.get('base') === undefined) {
+                min = min < 0 ? min : 0;
+            } else {
+                min = options.get('base');
+            }
+            this.min = min;
+            this.max = max;
+            this.range = max - min;
+            this.shapes = {};
+            this.valueShapes = {};
+            this.regiondata = {};
+            this.width = width = options.get('width') === 'auto' ? '4.0em' : width;
+            this.target = this.$el.simpledraw(width, height, options.get('composite'));
+            if (!values.length) {
+                this.disabled = true;
+            }
+            this.initTarget();
+        },
+
+        getRegion: function (el, x, y) {
+            var shapeid = this.target.getShapeAt(el, x, y);
+            return (shapeid !== undefined && this.shapes[shapeid] !== undefined) ? this.shapes[shapeid] : undefined;
+        },
+
+        getCurrentRegionFields: function () {
+            var currentRegion = this.currentRegion;
+            return {
+                fieldkey: currentRegion.substr(0, 1),
+                value: this.values[currentRegion.substr(1)],
+                region: currentRegion
+            };
+        },
+
+        changeHighlight: function (highlight) {
+            var currentRegion = this.currentRegion,
+                shapeid = this.valueShapes[currentRegion],
+                shape;
+            delete this.shapes[shapeid];
+            switch (currentRegion.substr(0, 1)) {
+                case 'r':
+                    shape = this.renderRange(currentRegion.substr(1), highlight);
+                    break;
+                case 'p':
+                    shape = this.renderPerformance(highlight);
+                    break;
+                case 't':
+                    shape = this.renderTarget(highlight);
+                    break;
+            }
+            this.valueShapes[currentRegion] = shape.id;
+            this.shapes[shape.id] = currentRegion;
+            this.target.replaceWithShape(shapeid, shape);
+        },
+
+        renderRange: function (rn, highlight) {
+            var rangeval = this.values[rn],
+                rangewidth = Math.round(this.canvasWidth * ((rangeval - this.min) / this.range)),
+                color = this.options.get('rangeColors')[rn - 2];
+            if (highlight) {
+                color = this.calcHighlightColor(color, this.options);
+            }
+            return this.target.drawRect(0, 0, rangewidth - 1, this.canvasHeight - 1, color, color);
+        },
+
+        renderPerformance: function (highlight) {
+            var perfval = this.values[1],
+                perfwidth = Math.round(this.canvasWidth * ((perfval - this.min) / this.range)),
+                color = this.options.get('performanceColor');
+            if (highlight) {
+                color = this.calcHighlightColor(color, this.options);
+            }
+            return this.target.drawRect(0, Math.round(this.canvasHeight * 0.3), perfwidth - 1,
+                Math.round(this.canvasHeight * 0.4) - 1, color, color);
+        },
+
+        renderTarget: function (highlight) {
+            var targetval = this.values[0],
+                x = Math.round(this.canvasWidth * ((targetval - this.min) / this.range) - (this.options.get('targetWidth') / 2)),
+                targettop = Math.round(this.canvasHeight * 0.10),
+                targetheight = this.canvasHeight - (targettop * 2),
+                color = this.options.get('targetColor');
+            if (highlight) {
+                color = this.calcHighlightColor(color, this.options);
+            }
+            return this.target.drawRect(x, targettop, this.options.get('targetWidth') - 1, targetheight - 1, color, color);
+        },
+
+        render: function () {
+            var vlen = this.values.length,
+                target = this.target,
+                i, shape;
+            if (!bullet._super.render.call(this)) {
+                return;
+            }
+            for (i = 2; i < vlen; i++) {
+                shape = this.renderRange(i).append();
+                this.shapes[shape.id] = 'r' + i;
+                this.valueShapes['r' + i] = shape.id;
+            }
+            if (this.values[1] !== null) {
+                shape = this.renderPerformance().append();
+                this.shapes[shape.id] = 'p1';
+                this.valueShapes.p1 = shape.id;
+            }
+            if (this.values[0] !== null) {
+                shape = this.renderTarget().append();
+                this.shapes[shape.id] = 't0';
+                this.valueShapes.t0 = shape.id;
+            }
+            target.render();
+        }
+    });
+
+    /**
+     * Pie charts
+     */
+    $.fn.sparkline.pie = pie = createClass($.fn.sparkline._base, {
+        type: 'pie',
+
+        init: function (el, values, options, width, height) {
+            var total = 0, i;
+
+            pie._super.init.call(this, el, values, options, width, height);
+
+            this.shapes = {}; // map shape ids to value offsets
+            this.valueShapes = {}; // maps value offsets to shape ids
+            this.values = values = $.map(values, Number);
+
+            if (options.get('width') === 'auto') {
+                this.width = this.height;
+            }
+
+            if (values.length > 0) {
+                for (i = values.length; i--;) {
+                    total += values[i];
+                }
+            }
+            this.total = total;
+            this.initTarget();
+            this.radius = Math.floor(Math.min(this.canvasWidth, this.canvasHeight) / 2);
+        },
+
+        getRegion: function (el, x, y) {
+            var shapeid = this.target.getShapeAt(el, x, y);
+            return (shapeid !== undefined && this.shapes[shapeid] !== undefined) ? this.shapes[shapeid] : undefined;
+        },
+
+        getCurrentRegionFields: function () {
+            var currentRegion = this.currentRegion;
+            return {
+                isNull: this.values[currentRegion] === undefined,
+                value: this.values[currentRegion],
+                percent: this.values[currentRegion] / this.total * 100,
+                color: this.options.get('sliceColors')[currentRegion % this.options.get('sliceColors').length],
+                offset: currentRegion
+            };
+        },
+
+        changeHighlight: function (highlight) {
+            var currentRegion = this.currentRegion,
+                 newslice = this.renderSlice(currentRegion, highlight),
+                 shapeid = this.valueShapes[currentRegion];
+            delete this.shapes[shapeid];
+            this.target.replaceWithShape(shapeid, newslice);
+            this.valueShapes[currentRegion] = newslice.id;
+            this.shapes[newslice.id] = currentRegion;
+        },
+
+        renderSlice: function (valuenum, highlight) {
+            var target = this.target,
+                options = this.options,
+                radius = this.radius,
+                borderWidth = options.get('borderWidth'),
+                offset = options.get('offset'),
+                circle = 2 * Math.PI,
+                values = this.values,
+                total = this.total,
+                next = offset ? (2*Math.PI)*(offset/360) : 0,
+                start, end, i, vlen, color;
+
+            vlen = values.length;
+            for (i = 0; i < vlen; i++) {
+                start = next;
+                end = next;
+                if (total > 0) {  // avoid divide by zero
+                    end = next + (circle * (values[i] / total));
+                }
+                if (valuenum === i) {
+                    color = options.get('sliceColors')[i % options.get('sliceColors').length];
+                    if (highlight) {
+                        color = this.calcHighlightColor(color, options);
+                    }
+
+                    return target.drawPieSlice(radius, radius, radius - borderWidth, start, end, undefined, color);
+                }
+                next = end;
+            }
+        },
+
+        render: function () {
+            var target = this.target,
+                values = this.values,
+                options = this.options,
+                radius = this.radius,
+                borderWidth = options.get('borderWidth'),
+                shape, i;
+
+            if (!pie._super.render.call(this)) {
+                return;
+            }
+            if (borderWidth) {
+                target.drawCircle(radius, radius, Math.floor(radius - (borderWidth / 2)),
+                    options.get('borderColor'), undefined, borderWidth).append();
+            }
+            for (i = values.length; i--;) {
+                if (values[i]) { // don't render zero values
+                    shape = this.renderSlice(i).append();
+                    this.valueShapes[i] = shape.id; // store just the shapeid
+                    this.shapes[shape.id] = i;
+                }
+            }
+            target.render();
+        }
+    });
+
+    /**
+     * Box plots
+     */
+    $.fn.sparkline.box = box = createClass($.fn.sparkline._base, {
+        type: 'box',
+
+        init: function (el, values, options, width, height) {
+            box._super.init.call(this, el, values, options, width, height);
+            this.values = $.map(values, Number);
+            this.width = options.get('width') === 'auto' ? '4.0em' : width;
+            this.initTarget();
+            if (!this.values.length) {
+                this.disabled = 1;
+            }
+        },
+
+        /**
+         * Simulate a single region
+         */
+        getRegion: function () {
+            return 1;
+        },
+
+        getCurrentRegionFields: function () {
+            var result = [
+                { field: 'lq', value: this.quartiles[0] },
+                { field: 'med', value: this.quartiles[1] },
+                { field: 'uq', value: this.quartiles[2] }
+            ];
+            if (this.loutlier !== undefined) {
+                result.push({ field: 'lo', value: this.loutlier});
+            }
+            if (this.routlier !== undefined) {
+                result.push({ field: 'ro', value: this.routlier});
+            }
+            if (this.lwhisker !== undefined) {
+                result.push({ field: 'lw', value: this.lwhisker});
+            }
+            if (this.rwhisker !== undefined) {
+                result.push({ field: 'rw', value: this.rwhisker});
+            }
+            return result;
+        },
+
+        render: function () {
+            var target = this.target,
+                values = this.values,
+                vlen = values.length,
+                options = this.options,
+                canvasWidth = this.canvasWidth,
+                canvasHeight = this.canvasHeight,
+                minValue = options.get('chartRangeMin') === undefined ? Math.min.apply(Math, values) : options.get('chartRangeMin'),
+                maxValue = options.get('chartRangeMax') === undefined ? Math.max.apply(Math, values) : options.get('chartRangeMax'),
+                canvasLeft = 0,
+                lwhisker, loutlier, iqr, q1, q2, q3, rwhisker, routlier, i,
+                size, unitSize;
+
+            if (!box._super.render.call(this)) {
+                return;
+            }
+
+            if (options.get('raw')) {
+                if (options.get('showOutliers') && values.length > 5) {
+                    loutlier = values[0];
+                    lwhisker = values[1];
+                    q1 = values[2];
+                    q2 = values[3];
+                    q3 = values[4];
+                    rwhisker = values[5];
+                    routlier = values[6];
+                } else {
+                    lwhisker = values[0];
+                    q1 = values[1];
+                    q2 = values[2];
+                    q3 = values[3];
+                    rwhisker = values[4];
+                }
+            } else {
+                values.sort(function (a, b) { return a - b; });
+                q1 = quartile(values, 1);
+                q2 = quartile(values, 2);
+                q3 = quartile(values, 3);
+                iqr = q3 - q1;
+                if (options.get('showOutliers')) {
+                    lwhisker = rwhisker = undefined;
+                    for (i = 0; i < vlen; i++) {
+                        if (lwhisker === undefined && values[i] > q1 - (iqr * options.get('outlierIQR'))) {
+                            lwhisker = values[i];
+                        }
+                        if (values[i] < q3 + (iqr * options.get('outlierIQR'))) {
+                            rwhisker = values[i];
+                        }
+                    }
+                    loutlier = values[0];
+                    routlier = values[vlen - 1];
+                } else {
+                    lwhisker = values[0];
+                    rwhisker = values[vlen - 1];
+                }
+            }
+            this.quartiles = [q1, q2, q3];
+            this.lwhisker = lwhisker;
+            this.rwhisker = rwhisker;
+            this.loutlier = loutlier;
+            this.routlier = routlier;
+
+            unitSize = canvasWidth / (maxValue - minValue + 1);
+            if (options.get('showOutliers')) {
+                canvasLeft = Math.ceil(options.get('spotRadius'));
+                canvasWidth -= 2 * Math.ceil(options.get('spotRadius'));
+                unitSize = canvasWidth / (maxValue - minValue + 1);
+                if (loutlier < lwhisker) {
+                    target.drawCircle((loutlier - minValue) * unitSize + canvasLeft,
+                        canvasHeight / 2,
+                        options.get('spotRadius'),
+                        options.get('outlierLineColor'),
+                        options.get('outlierFillColor')).append();
+                }
+                if (routlier > rwhisker) {
+                    target.drawCircle((routlier - minValue) * unitSize + canvasLeft,
+                        canvasHeight / 2,
+                        options.get('spotRadius'),
+                        options.get('outlierLineColor'),
+                        options.get('outlierFillColor')).append();
+                }
+            }
+
+            // box
+            target.drawRect(
+                Math.round((q1 - minValue) * unitSize + canvasLeft),
+                Math.round(canvasHeight * 0.1),
+                Math.round((q3 - q1) * unitSize),
+                Math.round(canvasHeight * 0.8),
+                options.get('boxLineColor'),
+                options.get('boxFillColor')).append();
+            // left whisker
+            target.drawLine(
+                Math.round((lwhisker - minValue) * unitSize + canvasLeft),
+                Math.round(canvasHeight / 2),
+                Math.round((q1 - minValue) * unitSize + canvasLeft),
+                Math.round(canvasHeight / 2),
+                options.get('lineColor')).append();
+            target.drawLine(
+                Math.round((lwhisker - minValue) * unitSize + canvasLeft),
+                Math.round(canvasHeight / 4),
+                Math.round((lwhisker - minValue) * unitSize + canvasLeft),
+                Math.round(canvasHeight - canvasHeight / 4),
+                options.get('whiskerColor')).append();
+            // right whisker
+            target.drawLine(Math.round((rwhisker - minValue) * unitSize + canvasLeft),
+                Math.round(canvasHeight / 2),
+                Math.round((q3 - minValue) * unitSize + canvasLeft),
+                Math.round(canvasHeight / 2),
+                options.get('lineColor')).append();
+            target.drawLine(
+                Math.round((rwhisker - minValue) * unitSize + canvasLeft),
+                Math.round(canvasHeight / 4),
+                Math.round((rwhisker - minValue) * unitSize + canvasLeft),
+                Math.round(canvasHeight - canvasHeight / 4),
+                options.get('whiskerColor')).append();
+            // median line
+            target.drawLine(
+                Math.round((q2 - minValue) * unitSize + canvasLeft),
+                Math.round(canvasHeight * 0.1),
+                Math.round((q2 - minValue) * unitSize + canvasLeft),
+                Math.round(canvasHeight * 0.9),
+                options.get('medianColor')).append();
+            if (options.get('target')) {
+                size = Math.ceil(options.get('spotRadius'));
+                target.drawLine(
+                    Math.round((options.get('target') - minValue) * unitSize + canvasLeft),
+                    Math.round((canvasHeight / 2) - size),
+                    Math.round((options.get('target') - minValue) * unitSize + canvasLeft),
+                    Math.round((canvasHeight / 2) + size),
+                    options.get('targetColor')).append();
+                target.drawLine(
+                    Math.round((options.get('target') - minValue) * unitSize + canvasLeft - size),
+                    Math.round(canvasHeight / 2),
+                    Math.round((options.get('target') - minValue) * unitSize + canvasLeft + size),
+                    Math.round(canvasHeight / 2),
+                    options.get('targetColor')).append();
+            }
+            target.render();
+        }
+    });
+
+    // Setup a very simple "virtual canvas" to make drawing the few shapes we need easier
+    // This is accessible as $(foo).simpledraw()
+
+    // Detect browser renderer support
+    (function() {
+        if (document.namespaces && !document.namespaces.v) {
+            $.fn.sparkline.hasVML = true;
+            document.namespaces.add('v', 'urn:schemas-microsoft-com:vml', '#default#VML');
+        } else {
+            $.fn.sparkline.hasVML = false;
+        }
+
+        var el = document.createElement('canvas');
+        $.fn.sparkline.hasCanvas = !!(el.getContext && el.getContext('2d'));
+
+    })()
+
+    VShape = createClass({
+        init: function (target, id, type, args) {
+            this.target = target;
+            this.id = id;
+            this.type = type;
+            this.args = args;
+        },
+        append: function () {
+            this.target.appendShape(this);
+            return this;
+        }
+    });
+
+    VCanvas_base = createClass({
+        _pxregex: /(\d+)(px)?\s*$/i,
+
+        init: function (width, height, target) {
+            if (!width) {
+                return;
+            }
+            this.width = width;
+            this.height = height;
+            this.target = target;
+            this.lastShapeId = null;
+            if (target[0]) {
+                target = target[0];
+            }
+            $.data(target, '_jqs_vcanvas', this);
+        },
+
+        drawLine: function (x1, y1, x2, y2, lineColor, lineWidth) {
+            return this.drawShape([[x1, y1], [x2, y2]], lineColor, lineWidth);
+        },
+
+        drawShape: function (path, lineColor, fillColor, lineWidth) {
+            return this._genShape('Shape', [path, lineColor, fillColor, lineWidth]);
+        },
+
+        drawCircle: function (x, y, radius, lineColor, fillColor, lineWidth) {
+            return this._genShape('Circle', [x, y, radius, lineColor, fillColor, lineWidth]);
+        },
+
+        drawPieSlice: function (x, y, radius, startAngle, endAngle, lineColor, fillColor) {
+            return this._genShape('PieSlice', [x, y, radius, startAngle, endAngle, lineColor, fillColor]);
+        },
+
+        drawRect: function (x, y, width, height, lineColor, fillColor) {
+            return this._genShape('Rect', [x, y, width, height, lineColor, fillColor]);
+        },
+
+        getElement: function () {
+            return this.canvas;
+        },
+
+        /**
+         * Return the most recently inserted shape id
+         */
+        getLastShapeId: function () {
+            return this.lastShapeId;
+        },
+
+        /**
+         * Clear and reset the canvas
+         */
+        reset: function () {
+            alert('reset not implemented');
+        },
+
+        _insert: function (el, target) {
+            $(target).html(el);
+        },
+
+        /**
+         * Calculate the pixel dimensions of the canvas
+         */
+        _calculatePixelDims: function (width, height, canvas) {
+            // XXX This should probably be a configurable option
+            var match;
+            match = this._pxregex.exec(height);
+            if (match) {
+                this.pixelHeight = match[1];
+            } else {
+                this.pixelHeight = $(canvas).height();
+            }
+            match = this._pxregex.exec(width);
+            if (match) {
+                this.pixelWidth = match[1];
+            } else {
+                this.pixelWidth = $(canvas).width();
+            }
+        },
+
+        /**
+         * Generate a shape object and id for later rendering
+         */
+        _genShape: function (shapetype, shapeargs) {
+            var id = shapeCount++;
+            shapeargs.unshift(id);
+            return new VShape(this, id, shapetype, shapeargs);
+        },
+
+        /**
+         * Add a shape to the end of the render queue
+         */
+        appendShape: function (shape) {
+            alert('appendShape not implemented');
+        },
+
+        /**
+         * Replace one shape with another
+         */
+        replaceWithShape: function (shapeid, shape) {
+            alert('replaceWithShape not implemented');
+        },
+
+        /**
+         * Insert one shape after another in the render queue
+         */
+        insertAfterShape: function (shapeid, shape) {
+            alert('insertAfterShape not implemented');
+        },
+
+        /**
+         * Remove a shape from the queue
+         */
+        removeShapeId: function (shapeid) {
+            alert('removeShapeId not implemented');
+        },
+
+        /**
+         * Find a shape at the specified x/y co-ordinates
+         */
+        getShapeAt: function (el, x, y) {
+            alert('getShapeAt not implemented');
+        },
+
+        /**
+         * Render all queued shapes onto the canvas
+         */
+        render: function () {
+            alert('render not implemented');
+        }
+    });
+
+    VCanvas_canvas = createClass(VCanvas_base, {
+        init: function (width, height, target, interact) {
+            VCanvas_canvas._super.init.call(this, width, height, target);
+            this.canvas = document.createElement('canvas');
+            if (target[0]) {
+                target = target[0];
+            }
+            $.data(target, '_jqs_vcanvas', this);
+            $(this.canvas).css({ display: 'inline-block', width: width, height: height, verticalAlign: 'top' });
+            this._insert(this.canvas, target);
+            this._calculatePixelDims(width, height, this.canvas);
+            this.canvas.width = this.pixelWidth;
+            this.canvas.height = this.pixelHeight;
+            this.interact = interact;
+            this.shapes = {};
+            this.shapeseq = [];
+            this.currentTargetShapeId = undefined;
+            $(this.canvas).css({width: this.pixelWidth, height: this.pixelHeight});
+        },
+
+        _getContext: function (lineColor, fillColor, lineWidth) {
+            var context = this.canvas.getContext('2d');
+            if (lineColor !== undefined) {
+                context.strokeStyle = lineColor;
+            }
+            context.lineWidth = lineWidth === undefined ? 1 : lineWidth;
+            if (fillColor !== undefined) {
+                context.fillStyle = fillColor;
+            }
+            return context;
+        },
+
+        reset: function () {
+            var context = this._getContext();
+            context.clearRect(0, 0, this.pixelWidth, this.pixelHeight);
+            this.shapes = {};
+            this.shapeseq = [];
+            this.currentTargetShapeId = undefined;
+        },
+
+        _drawShape: function (shapeid, path, lineColor, fillColor, lineWidth) {
+            var context = this._getContext(lineColor, fillColor, lineWidth),
+                i, plen;
+            context.beginPath();
+            context.moveTo(path[0][0] + 0.5, path[0][1] + 0.5);
+            for (i = 1, plen = path.length; i < plen; i++) {
+                context.lineTo(path[i][0] + 0.5, path[i][1] + 0.5); // the 0.5 offset gives us crisp pixel-width lines
+            }
+            if (lineColor !== undefined) {
+                context.stroke();
+            }
+            if (fillColor !== undefined) {
+                context.fill();
+            }
+            if (this.targetX !== undefined && this.targetY !== undefined &&
+                context.isPointInPath(this.targetX, this.targetY)) {
+                this.currentTargetShapeId = shapeid;
+            }
+        },
+
+        _drawCircle: function (shapeid, x, y, radius, lineColor, fillColor, lineWidth) {
+            var context = this._getContext(lineColor, fillColor, lineWidth);
+            context.beginPath();
+            context.arc(x, y, radius, 0, 2 * Math.PI, false);
+            if (this.targetX !== undefined && this.targetY !== undefined &&
+                context.isPointInPath(this.targetX, this.targetY)) {
+                this.currentTargetShapeId = shapeid;
+            }
+            if (lineColor !== undefined) {
+                context.stroke();
+            }
+            if (fillColor !== undefined) {
+                context.fill();
+            }
+        },
+
+        _drawPieSlice: function (shapeid, x, y, radius, startAngle, endAngle, lineColor, fillColor) {
+            var context = this._getContext(lineColor, fillColor);
+            context.beginPath();
+            context.moveTo(x, y);
+            context.arc(x, y, radius, startAngle, endAngle, false);
+            context.lineTo(x, y);
+            context.closePath();
+            if (lineColor !== undefined) {
+                context.stroke();
+            }
+            if (fillColor) {
+                context.fill();
+            }
+            if (this.targetX !== undefined && this.targetY !== undefined &&
+                context.isPointInPath(this.targetX, this.targetY)) {
+                this.currentTargetShapeId = shapeid;
+            }
+        },
+
+        _drawRect: function (shapeid, x, y, width, height, lineColor, fillColor) {
+            return this._drawShape(shapeid, [[x, y], [x + width, y], [x + width, y + height], [x, y + height], [x, y]], lineColor, fillColor);
+        },
+
+        appendShape: function (shape) {
+            this.shapes[shape.id] = shape;
+            this.shapeseq.push(shape.id);
+            this.lastShapeId = shape.id;
+            return shape.id;
+        },
+
+        replaceWithShape: function (shapeid, shape) {
+            var shapeseq = this.shapeseq,
+                i;
+            this.shapes[shape.id] = shape;
+            for (i = shapeseq.length; i--;) {
+                if (shapeseq[i] == shapeid) {
+                    shapeseq[i] = shape.id;
+                }
+            }
+            delete this.shapes[shapeid];
+        },
+
+        replaceWithShapes: function (shapeids, shapes) {
+            var shapeseq = this.shapeseq,
+                shapemap = {},
+                sid, i, first;
+
+            for (i = shapeids.length; i--;) {
+                shapemap[shapeids[i]] = true;
+            }
+            for (i = shapeseq.length; i--;) {
+                sid = shapeseq[i];
+                if (shapemap[sid]) {
+                    shapeseq.splice(i, 1);
+                    delete this.shapes[sid];
+                    first = i;
+                }
+            }
+            for (i = shapes.length; i--;) {
+                shapeseq.splice(first, 0, shapes[i].id);
+                this.shapes[shapes[i].id] = shapes[i];
+            }
+
+        },
+
+        insertAfterShape: function (shapeid, shape) {
+            var shapeseq = this.shapeseq,
+                i;
+            for (i = shapeseq.length; i--;) {
+                if (shapeseq[i] === shapeid) {
+                    shapeseq.splice(i + 1, 0, shape.id);
+                    this.shapes[shape.id] = shape;
+                    return;
+                }
+            }
+        },
+
+        removeShapeId: function (shapeid) {
+            var shapeseq = this.shapeseq,
+                i;
+            for (i = shapeseq.length; i--;) {
+                if (shapeseq[i] === shapeid) {
+                    shapeseq.splice(i, 1);
+                    break;
+                }
+            }
+            delete this.shapes[shapeid];
+        },
+
+        getShapeAt: function (el, x, y) {
+            this.targetX = x;
+            this.targetY = y;
+            this.render();
+            return this.currentTargetShapeId;
+        },
+
+        render: function () {
+            var shapeseq = this.shapeseq,
+                shapes = this.shapes,
+                shapeCount = shapeseq.length,
+                context = this._getContext(),
+                shapeid, shape, i;
+            context.clearRect(0, 0, this.pixelWidth, this.pixelHeight);
+            for (i = 0; i < shapeCount; i++) {
+                shapeid = shapeseq[i];
+                shape = shapes[shapeid];
+                this['_draw' + shape.type].apply(this, shape.args);
+            }
+            if (!this.interact) {
+                // not interactive so no need to keep the shapes array
+                this.shapes = {};
+                this.shapeseq = [];
+            }
+        }
+
+    });
+
+    VCanvas_vml = createClass(VCanvas_base, {
+        init: function (width, height, target) {
+            var groupel;
+            VCanvas_vml._super.init.call(this, width, height, target);
+            if (target[0]) {
+                target = target[0];
+            }
+            $.data(target, '_jqs_vcanvas', this);
+            this.canvas = document.createElement('span');
+            $(this.canvas).css({ display: 'inline-block', position: 'relative', overflow: 'hidden', width: width, height: height, margin: '0px', padding: '0px', verticalAlign: 'top'});
+            this._insert(this.canvas, target);
+            this._calculatePixelDims(width, height, this.canvas);
+            this.canvas.width = this.pixelWidth;
+            this.canvas.height = this.pixelHeight;
+            groupel = '<v:group coordorigin="0 0" coordsize="' + this.pixelWidth + ' ' + this.pixelHeight + '"' +
+                    ' style="position:absolute;top:0;left:0;width:' + this.pixelWidth + 'px;height=' + this.pixelHeight + 'px;"></v:group>';
+            this.canvas.insertAdjacentHTML('beforeEnd', groupel);
+            this.group = $(this.canvas).children()[0];
+            this.rendered = false;
+            this.prerender = '';
+        },
+
+        _drawShape: function (shapeid, path, lineColor, fillColor, lineWidth) {
+            var vpath = [],
+                initial, stroke, fill, closed, vel, plen, i;
+            for (i = 0, plen = path.length; i < plen; i++) {
+                vpath[i] = '' + (path[i][0]) + ',' + (path[i][1]);
+            }
+            initial = vpath.splice(0, 1);
+            lineWidth = lineWidth === undefined ? 1 : lineWidth;
+            stroke = lineColor === undefined ? ' stroked="false" ' : ' strokeWeight="' + lineWidth + 'px" strokeColor="' + lineColor + '" ';
+            fill = fillColor === undefined ? ' filled="false"' : ' fillColor="' + fillColor + '" filled="true" ';
+            closed = vpath[0] === vpath[vpath.length - 1] ? 'x ' : '';
+            vel = '<v:shape coordorigin="0 0" coordsize="' + this.pixelWidth + ' ' + this.pixelHeight + '" ' +
+                 ' id="jqsshape' + shapeid + '" ' +
+                 stroke +
+                 fill +
+                ' style="position:absolute;left:0px;top:0px;height:' + this.pixelHeight + 'px;width:' + this.pixelWidth + 'px;padding:0px;margin:0px;" ' +
+                ' path="m ' + initial + ' l ' + vpath.join(', ') + ' ' + closed + 'e">' +
+                ' </v:shape>';
+            return vel;
+        },
+
+        _drawCircle: function (shapeid, x, y, radius, lineColor, fillColor, lineWidth) {
+            var stroke, fill, vel;
+            x -= radius;
+            y -= radius;
+            stroke = lineColor === undefined ? ' stroked="false" ' : ' strokeWeight="' + lineWidth + 'px" strokeColor="' + lineColor + '" ';
+            fill = fillColor === undefined ? ' filled="false"' : ' fillColor="' + fillColor + '" filled="true" ';
+            vel = '<v:oval ' +
+                 ' id="jqsshape' + shapeid + '" ' +
+                stroke +
+                fill +
+                ' style="position:absolute;top:' + y + 'px; left:' + x + 'px; width:' + (radius * 2) + 'px; height:' + (radius * 2) + 'px"></v:oval>';
+            return vel;
+
+        },
+
+        _drawPieSlice: function (shapeid, x, y, radius, startAngle, endAngle, lineColor, fillColor) {
+            var vpath, startx, starty, endx, endy, stroke, fill, vel;
+            if (startAngle === endAngle) {
+                return '';  // VML seems to have problem when start angle equals end angle.
+            }
+            if ((endAngle - startAngle) === (2 * Math.PI)) {
+                startAngle = 0.0;  // VML seems to have a problem when drawing a full circle that doesn't start 0
+                endAngle = (2 * Math.PI);
+            }
+
+            startx = x + Math.round(Math.cos(startAngle) * radius);
+            starty = y + Math.round(Math.sin(startAngle) * radius);
+            endx = x + Math.round(Math.cos(endAngle) * radius);
+            endy = y + Math.round(Math.sin(endAngle) * radius);
+
+            if (startx === endx && starty === endy) {
+                if ((endAngle - startAngle) < Math.PI) {
+                    // Prevent very small slices from being mistaken as a whole pie
+                    return '';
+                }
+                // essentially going to be the entire circle, so ignore startAngle
+                startx = endx = x + radius;
+                starty = endy = y;
+            }
+
+            if (startx === endx && starty === endy && (endAngle - startAngle) < Math.PI) {
+                return '';
+            }
+
+            vpath = [x - radius, y - radius, x + radius, y + radius, startx, starty, endx, endy];
+            stroke = lineColor === undefined ? ' stroked="false" ' : ' strokeWeight="1px" strokeColor="' + lineColor + '" ';
+            fill = fillColor === undefined ? ' filled="false"' : ' fillColor="' + fillColor + '" filled="true" ';
+            vel = '<v:shape coordorigin="0 0" coordsize="' + this.pixelWidth + ' ' + this.pixelHeight + '" ' +
+                 ' id="jqsshape' + shapeid + '" ' +
+                 stroke +
+                 fill +
+                ' style="position:absolute;left:0px;top:0px;height:' + this.pixelHeight + 'px;width:' + this.pixelWidth + 'px;padding:0px;margin:0px;" ' +
+                ' path="m ' + x + ',' + y + ' wa ' + vpath.join(', ') + ' x e">' +
+                ' </v:shape>';
+            return vel;
+        },
+
+        _drawRect: function (shapeid, x, y, width, height, lineColor, fillColor) {
+            return this._drawShape(shapeid, [[x, y], [x, y + height], [x + width, y + height], [x + width, y], [x, y]], lineColor, fillColor);
+        },
+
+        reset: function () {
+            this.group.innerHTML = '';
+        },
+
+        appendShape: function (shape) {
+            var vel = this['_draw' + shape.type].apply(this, shape.args);
+            if (this.rendered) {
+                this.group.insertAdjacentHTML('beforeEnd', vel);
+            } else {
+                this.prerender += vel;
+            }
+            this.lastShapeId = shape.id;
+            return shape.id;
+        },
+
+        replaceWithShape: function (shapeid, shape) {
+            var existing = $('#jqsshape' + shapeid),
+                vel = this['_draw' + shape.type].apply(this, shape.args);
+            existing[0].outerHTML = vel;
+        },
+
+        replaceWithShapes: function (shapeids, shapes) {
+            // replace the first shapeid with all the new shapes then toast the remaining old shapes
+            var existing = $('#jqsshape' + shapeids[0]),
+                replace = '',
+                slen = shapes.length,
+                i;
+            for (i = 0; i < slen; i++) {
+                replace += this['_draw' + shapes[i].type].apply(this, shapes[i].args);
+            }
+            existing[0].outerHTML = replace;
+            for (i = 1; i < shapeids.length; i++) {
+                $('#jqsshape' + shapeids[i]).remove();
+            }
+        },
+
+        insertAfterShape: function (shapeid, shape) {
+            var existing = $('#jqsshape' + shapeid),
+                 vel = this['_draw' + shape.type].apply(this, shape.args);
+            existing[0].insertAdjacentHTML('afterEnd', vel);
+        },
+
+        removeShapeId: function (shapeid) {
+            var existing = $('#jqsshape' + shapeid);
+            this.group.removeChild(existing[0]);
+        },
+
+        getShapeAt: function (el, x, y) {
+            var shapeid = el.id.substr(8);
+            return shapeid;
+        },
+
+        render: function () {
+            if (!this.rendered) {
+                // batch the intial render into a single repaint
+                this.group.innerHTML = this.prerender;
+                this.rendered = true;
+            }
+        }
+    });
+
+}));
diff --git a/addons/crm/static/src/css/crm.css b/addons/crm/static/src/css/crm.css
index 3ad3840a4e1..ba4473edc26 100644
--- a/addons/crm/static/src/css/crm.css
+++ b/addons/crm/static/src/css/crm.css
@@ -20,15 +20,27 @@
 }
 
 .openerp .oe_kanban_view .oe_kanban_crm_salesteams .oe_items_list {
-    margin: 10px 0;
+    position: relative;
+    margin: 10px;
 }
-.openerp .oe_kanban_view .oe_kanban_crm_salesteams .oe_items_list a {
-    width: 110px;
+.openerp .oe_kanban_view .oe_kanban_crm_salesteams .oe_items_list div {
+    width: 160px;
+    height: 22px;
+    margin: 0 !important;
+    position: relative;
     display: inline-block;
 }
 .openerp .oe_kanban_view .oe_kanban_crm_salesteams .oe_items_list a:hover {
     text-decoration: underline !important;
 }
+.openerp .oe_kanban_view .oe_kanban_crm_salesteams .oe_items_list div a:nth-child(2n) {
+    position: absolute;
+    left: 90px;
+    top: 0;
+}
+.openerp .oe_kanban_view .oe_kanban_crm_salesteams .oe_items_list div:nth-child(2n) a:nth-child(2n) {
+    left: 110px;
+}
 .openerp .oe_kanban_view .oe_kanban_crm_salesteams .oe_center {
     text-align: center;
     margin: 3px 0;
@@ -40,3 +52,13 @@
 .openerp .oe_kanban_view .oe_kanban_crm_salesteams .oe_center .oe_subsum {
     font-size: 10px;
 }
+
+.openerp .oe_kanban_view .oe_justgage {
+    color: black;
+    display: inline-block;
+}
+
+.openerp .oe_kanban_view .oe_sparkline_bar {
+    height: 20px;
+    width: 36px;
+}
\ No newline at end of file
diff --git a/addons/crm/static/src/js/crm.js b/addons/crm/static/src/js/crm.js
deleted file mode 100644
index e027313d6dc..00000000000
--- a/addons/crm/static/src/js/crm.js
+++ /dev/null
@@ -1,11 +0,0 @@
-openerp.crm = function(openerp) {
-    openerp.web_kanban.KanbanRecord.include({
-        on_card_clicked: function() {
-            if (this.view.dataset.model === 'crm.case.section') {
-                this.$('.oe_kanban_crm_salesteams_list a').first().click();
-            } else {
-                this._super.apply(this, arguments);
-            }
-        },
-    });
-};
diff --git a/addons/crm/static/src/js/crm_case_section.js b/addons/crm/static/src/js/crm_case_section.js
new file mode 100644
index 00000000000..2b4ca741d75
--- /dev/null
+++ b/addons/crm/static/src/js/crm_case_section.js
@@ -0,0 +1,34 @@
+openerp.crm = function(openerp) {
+    openerp.web_kanban.KanbanRecord.include({
+        on_card_clicked: function() {
+            if (this.view.dataset.model === 'crm.case.section') {
+                this.$('.oe_kanban_crm_salesteams_list a').first().click();
+            } else {
+                this._super.apply(this, arguments);
+            }
+        },
+    });
+
+    openerp.crm.SparklineBarWidget = openerp.web_kanban.AbstractField.extend({
+        className: "oe_sparkline_bar",
+        start: function() {
+            var self = this;
+            var title = this.$node.html();
+            setTimeout(function () {
+                var value = _.pluck(self.field.value, 'value');
+                var tooltips = _.pluck(self.field.value, 'tooltip');
+                self.$el.sparkline(value, {
+                    type: 'bar',
+                    barWidth: 5,
+                    tooltipFormat: '{{offset:offset}} {{value}}',
+                    tooltipValueLookups: {
+                        'offset': tooltips
+                    },
+                });
+                self.$el.tipsy({'delayIn': 0, 'html': true, 'title': function(){return title}, 'gravity': 'n'});
+            }, 0);
+        },
+    });
+    openerp.web_kanban.fields_registry.add("sparkline_bar", "openerp.crm.SparklineBarWidget");
+
+};
diff --git a/addons/crm/test/crm_lead_cancel.yml b/addons/crm/test/crm_lead_cancel.yml
index bbd17dc2bb0..13c3c18ed26 100644
--- a/addons/crm/test/crm_lead_cancel.yml
+++ b/addons/crm/test/crm_lead_cancel.yml
@@ -1,10 +1,12 @@
 -
-  Salesman can also cancelled unqualified lead and re-open lead so giving access rights of salesman.
+  I set a new sale team (with Marketing at parent) and I cancel unqualified lead giving access rights of salesman.
 -
   !context
     uid: 'crm_res_users_salesman'
 -
   !python {model: crm.lead}: |
+    section_id = self.pool.get('crm.case.section').create(cr, uid, {'name': "Phone Marketing", 'parent_id': ref("crm.crm_case_section_2")})
+    self.write(cr, uid, [ref("crm_case_1")], {'section_id': section_id})
     self.case_cancel(cr, uid, [ref("crm_case_1")])
 -
   Salesman check cancelled lead.
@@ -45,4 +47,4 @@
   Salesman check the lead is correctly escalated to the parent team.
 -
   !assert {model: crm.lead, id: crm.crm_case_1, string: Escalate lead to parent team}:
-    - section_id.name == "Support Department"
+    - section_id.name == "Marketing"
diff --git a/addons/crm_claim/crm_claim.py b/addons/crm_claim/crm_claim.py
index 275d9edaab4..774571b0314 100644
--- a/addons/crm_claim/crm_claim.py
+++ b/addons/crm_claim/crm_claim.py
@@ -105,7 +105,7 @@ class crm_claim(base_stage, osv.osv):
         'email_from': fields.char('Email', size=128, help="Destination email for email gateway."),
         'partner_phone': fields.char('Phone', size=32),
         'stage_id': fields.many2one ('crm.claim.stage', 'Stage', track_visibility='onchange',
-                domain="['&',('fold', '=', False),'|', ('section_ids', '=', section_id), ('case_default', '=', True)]"),
+                domain="['|', ('section_ids', '=', section_id), ('case_default', '=', True)]"),
         'cause': fields.text('Root Cause'),
         'state': fields.related('stage_id', 'state', type="selection", store=True,
                 selection=crm.AVAILABLE_STATES, string="Status", readonly=True,
diff --git a/addons/crm_claim/i18n/ru.po b/addons/crm_claim/i18n/ru.po
index afcf4702a67..4579b6d8557 100644
--- a/addons/crm_claim/i18n/ru.po
+++ b/addons/crm_claim/i18n/ru.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-10-24 05:01+0000\n"
+"PO-Revision-Date: 2013-05-30 14:03+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: Russian <ru@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: 2013-03-16 05:44+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-05-31 05:38+0000\n"
+"X-Generator: Launchpad (build 16660)\n"
 
 #. module: crm_claim
 #: help:crm.claim.stage,fold:0
@@ -23,6 +23,8 @@ msgid ""
 "This stage is not visible, for example in status bar or kanban view, when "
 "there are no records in that stage to display."
 msgstr ""
+"Эта стадия не видима, например в статус-баре или виде канбан, когда нет "
+"записей этой стадии для отображения."
 
 #. module: crm_claim
 #: field:crm.claim.report,nbr:0
@@ -46,11 +48,13 @@ msgid ""
 "Allows you to configure your incoming mail server, and create claims from "
 "incoming emails."
 msgstr ""
+"Позволяет настроить сервер входящей почты и создавать претензии из входящих "
+"эл. писем."
 
 #. module: crm_claim
 #: model:ir.model,name:crm_claim.model_crm_claim_stage
 msgid "Claim stages"
-msgstr ""
+msgstr "Этапы претензии"
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
@@ -65,7 +69,7 @@ msgstr "Задержка закрытия"
 #. module: crm_claim
 #: field:crm.claim,message_unread:0
 msgid "Unread Messages"
-msgstr ""
+msgstr "Непрочитанные"
 
 #. module: crm_claim
 #: field:crm.claim,resolution:0
@@ -100,12 +104,12 @@ msgstr "# претензий"
 #. module: crm_claim
 #: field:crm.claim.stage,name:0
 msgid "Stage Name"
-msgstr ""
+msgstr "Название этапа"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Salesperson"
-msgstr ""
+msgstr "Продавец"
 
 #. module: crm_claim
 #: selection:crm.claim,priority:0
@@ -149,7 +153,7 @@ msgstr "Предупредительная мера"
 #. module: crm_claim
 #: help:crm.claim,message_unread:0
 msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "Если отмечено, новые сообщения требуют вашего внимания."
 
 #. module: crm_claim
 #: field:crm.claim.report,date_closed:0
@@ -182,6 +186,8 @@ msgid ""
 "Holds the Chatter summary (number of messages, ...). This summary is "
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
+"Содержит сводку по Чаттеру (количество сообщений,...). Эта сводка в формате "
+"html для возможности использования в канбан виде"
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -235,12 +241,12 @@ msgstr "Важность"
 #. module: crm_claim
 #: field:crm.claim.stage,fold:0
 msgid "Hide in Views when Empty"
-msgstr ""
+msgstr "Скрыть вид, если пусто"
 
 #. module: crm_claim
 #: field:crm.claim,message_follower_ids:0
 msgid "Followers"
-msgstr ""
+msgstr "Подписчики"
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -254,7 +260,7 @@ msgstr "Новый"
 #. module: crm_claim
 #: field:crm.claim.stage,section_ids:0
 msgid "Sections"
-msgstr ""
+msgstr "Секции"
 
 #. module: crm_claim
 #: field:crm.claim,email_from:0
@@ -290,7 +296,7 @@ msgstr "Предмет претензии"
 #. module: crm_claim
 #: model:crm.claim.stage,name:crm_claim.stage_claim3
 msgid "Rejected"
-msgstr ""
+msgstr "Отклонено"
 
 #. module: crm_claim
 #: field:crm.claim,date_action_next:0
@@ -344,7 +350,7 @@ msgstr ""
 #: code:addons/crm_claim/crm_claim.py:194
 #, python-format
 msgid "No Subject"
-msgstr ""
+msgstr "Без темы"
 
 #. module: crm_claim
 #: help:crm.claim.stage,state:0
@@ -358,7 +364,7 @@ msgstr ""
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Settle"
-msgstr ""
+msgstr "Решать"
 
 #. module: crm_claim
 #: model:ir.ui.menu,name:crm_claim.menu_claim_stage_view
@@ -384,7 +390,7 @@ msgstr "Отчет о претензиях"
 #. module: crm_claim
 #: view:sale.config.settings:0
 msgid "Configure"
-msgstr ""
+msgstr "Настроить"
 
 #. module: crm_claim
 #: model:crm.case.resource.type,name:crm_claim.type_claim1
@@ -430,6 +436,8 @@ msgid ""
 "If you check this field, this stage will be proposed by default on each "
 "sales team. It will not assign this stage to existing teams."
 msgstr ""
+"Если вы отметите это поле, этот этап будет предложен по умолчанию каждому "
+"отделу продаж. Этот этап не будет назначен существующим отделам."
 
 #. module: crm_claim
 #: field:crm.claim,categ_id:0
@@ -485,7 +493,7 @@ msgstr "Закрыто"
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Reject"
-msgstr ""
+msgstr "Отклонить"
 
 #. module: crm_claim
 #: view:res.partner:0
@@ -495,7 +503,7 @@ msgstr "Претензии партнера"
 #. module: crm_claim
 #: view:crm.claim.stage:0
 msgid "Claim Stage"
-msgstr ""
+msgstr "Этап претензии"
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -513,7 +521,7 @@ msgstr "Отложено"
 #: field:crm.claim.report,state:0
 #: field:crm.claim.stage,state:0
 msgid "Status"
-msgstr ""
+msgstr "Статус"
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
@@ -529,7 +537,7 @@ msgstr "Обычный"
 #. module: crm_claim
 #: help:crm.claim.stage,sequence:0
 msgid "Used to order stages. Lower is better."
-msgstr ""
+msgstr "Используется для упорядочивания этапов. Меньше - лучше."
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
@@ -549,7 +557,7 @@ msgstr "Телефон"
 #. module: crm_claim
 #: field:crm.claim,message_is_follower:0
 msgid "Is a Follower"
-msgstr ""
+msgstr "Подписан"
 
 #. module: crm_claim
 #: field:crm.claim.report,user_id:0
@@ -581,6 +589,10 @@ msgid ""
 "the case needs to be reviewed then the status is                       set "
 "to 'Pending'."
 msgstr ""
+"Статус устанавливается в \"Черновик\", при создании  дела. Если дело в "
+"процессе, то статус - «Открыт». Когда дело закончено, устанавливается статус "
+"\"Готово\". Если дело должно быть пересмотрено то статус установлен в "
+"'Ожидание'."
 
 #. module: crm_claim
 #: field:crm.claim,active:0
@@ -628,7 +640,7 @@ msgstr "Дата претензии"
 #. module: crm_claim
 #: field:crm.claim,message_summary:0
 msgid "Summary"
-msgstr ""
+msgstr "Итог"
 
 #. module: crm_claim
 #: model:ir.actions.act_window,name:crm_claim.crm_claim_categ_action
@@ -638,7 +650,7 @@ msgstr "Категории претензий"
 #. module: crm_claim
 #: field:crm.claim.stage,case_default:0
 msgid "Common to All Teams"
-msgstr ""
+msgstr "Общее для всех отделов"
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -677,7 +689,7 @@ msgstr "Претензия"
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "My Company"
-msgstr ""
+msgstr "Моя компания"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
@@ -807,7 +819,7 @@ msgstr "Февраль"
 #. module: crm_claim
 #: model:ir.model,name:crm_claim.model_sale_config_settings
 msgid "sale.config.settings"
-msgstr ""
+msgstr "sale.config.settings"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
@@ -833,22 +845,22 @@ msgstr "Мои дела"
 #. module: crm_claim
 #: model:crm.claim.stage,name:crm_claim.stage_claim2
 msgid "Settled"
-msgstr ""
+msgstr "Решено"
 
 #. module: crm_claim
 #: help:crm.claim,message_ids:0
 msgid "Messages and communication history"
-msgstr ""
+msgstr "Сообщения и история общения"
 
 #. module: crm_claim
 #: field:sale.config.settings,fetchmail_claim:0
 msgid "Create claims from incoming mails"
-msgstr ""
+msgstr "Создать претензии из входящей почты"
 
 #. module: crm_claim
 #: field:crm.claim.stage,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Нумерация"
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -883,6 +895,8 @@ msgid ""
 "Link between stages and sales teams. When set, this limitate the current "
 "stage to the selected sales teams."
 msgstr ""
+"Связь между этапами и отделами продаж. При установке, ограничивает этап для "
+"выбранного отдела продаж."
 
 #. module: crm_claim
 #: help:crm.claim.stage,case_refused:0
diff --git a/addons/crm_claim/report/crm_claim_report_view.xml b/addons/crm_claim/report/crm_claim_report_view.xml
index 530eb6061a3..bae02ef8c0c 100644
--- a/addons/crm_claim/report/crm_claim_report_view.xml
+++ b/addons/crm_claim/report/crm_claim_report_view.xml
@@ -55,7 +55,7 @@
                     <filter icon="terp-camera_test" string="Open" domain="[('state','=','open')]"/>
                     <filter icon="terp-gtk-media-pause" string="Pending" domain="[('state','=','pending')]"/>
                     <separator/>
-                    <filter string="My Sales Team(s)" icon="terp-personal+" context="{'invisible_section': False}" domain="[('section_id.user_id','=',uid)]" help="My Sales Team(s)" />
+                    <filter string="My Sales Team(s)" icon="terp-personal+" context="{'invisible_section': False}" domain="[('section_id.user_id','=',uid)]" help="My Sales Team(s)" groups="base.group_multi_salesteams"/>
                     <separator/>
                     <filter string="My Company" icon="terp-go-home" context="{'invisible_section': False}" domain="[('section_id.user_id.company_id','=',uid)]" help="My company"/>
                     <separator/>
@@ -78,7 +78,7 @@
                     </group>
                     <group  expand="1" string="Group By...">
                         <filter string="Salesperson" name="Salesperson" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}" />
-                        <filter string="Sales Team" icon="terp-personal+" domain="[]" context="{'group_by':'section_id'}" />
+                        <filter string="Sales Team" icon="terp-personal+" domain="[]" context="{'group_by':'section_id'}"  groups="base.group_multi_salesteams"/>
                         <filter string="Partner" name="partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}" />
                         <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}" />
                         <filter string="Priority" icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}" />
diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml
index 6e3521be6f2..f97fe654166 100644
--- a/addons/crm_helpdesk/crm_helpdesk_view.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_view.xml
@@ -151,14 +151,14 @@
                     <filter icon="terp-gtk-media-pause" string="Pending" domain="[('state','=','pending')]" help="All pending Helpdesk Request" />
                     <separator/>
                     <filter string="Assigned to Me or My Sales Team(s)" icon="terp-personal+" domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
-                            help="Helpdesk requests that are assigned to me or to one of the sale teams I manage" />
+                            help="Helpdesk requests that are assigned to me or to one of the sale teams I manage" groups="base.group_multi_salesteams"/>
                     <field name="partner_id" filter_domain="[('partner_id','child_of',self)]"/>
                     <field name="user_id"/>
                     <field name="section_id" string="Sales Team" groups="base.group_multi_salesteams"/>
                     <group expand="0" string="Group By...">
                         <filter string="Partner" icon="terp-partner" domain="[]" help="Partner" context="{'group_by':'partner_id'}" />
                         <filter string="Responsible" icon="terp-personal" domain="[]" help="Responsible User" context="{'group_by':'user_id'}" />
-                        <filter string="Sales Team" icon="terp-personal+" domain="[]" help="Sales Team" context="{'group_by':'section_id'}" />
+                        <filter string="Sales Team" icon="terp-personal+" domain="[]" help="Sales Team" context="{'group_by':'section_id'}" groups="base.group_multi_salesteams"/>
                         <filter string="Priority" icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}" />
                         <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}" />
                         <filter string="Date" icon="terp-go-month" domain="[]" help="Request Date" context="{'group_by':'date'}" />
diff --git a/addons/crm_helpdesk/i18n/ru.po b/addons/crm_helpdesk/i18n/ru.po
index e8eb90af9d7..bb53c03294f 100644
--- a/addons/crm_helpdesk/i18n/ru.po
+++ b/addons/crm_helpdesk/i18n/ru.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-10-24 05:08+0000\n"
+"PO-Revision-Date: 2013-05-30 14:09+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: Russian <ru@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: 2013-03-16 05:46+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-05-31 05:38+0000\n"
+"X-Generator: Launchpad (build 16660)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
@@ -46,7 +46,7 @@ msgstr "Март"
 #. module: crm_helpdesk
 #: field:crm.helpdesk,message_unread:0
 msgid "Unread Messages"
-msgstr ""
+msgstr "Непрочитанные"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk,company_id:0
@@ -63,7 +63,7 @@ msgstr "Адреса наблюдателей"
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
 msgid "Salesperson"
-msgstr ""
+msgstr "Продавец"
 
 #. module: crm_helpdesk
 #: selection:crm.helpdesk,priority:0
@@ -106,7 +106,7 @@ msgstr "Отменено"
 #. module: crm_helpdesk
 #: help:crm.helpdesk,message_unread:0
 msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "Если отмечено, новые сообщения требуют вашего внимания."
 
 #. module: crm_helpdesk
 #: model:ir.actions.act_window,name:crm_helpdesk.action_report_crm_helpdesk
@@ -136,6 +136,8 @@ msgid ""
 "Holds the Chatter summary (number of messages, ...). This summary is "
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
+"Содержит сводку по Чаттеру (количество сообщений,...). Эта сводка в формате "
+"html для возможности использования в канбан виде"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
@@ -176,7 +178,7 @@ msgstr "Приоритет"
 #. module: crm_helpdesk
 #: field:crm.helpdesk,message_follower_ids:0
 msgid "Followers"
-msgstr ""
+msgstr "Подписчики"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
@@ -400,7 +402,7 @@ msgstr "В ожидании"
 #: view:crm.helpdesk.report:0
 #: field:crm.helpdesk.report,state:0
 msgid "Status"
-msgstr ""
+msgstr "Статус"
 
 #. module: crm_helpdesk
 #: selection:crm.helpdesk.report,month:0
@@ -454,7 +456,7 @@ msgstr "Планируемая выручка"
 #. module: crm_helpdesk
 #: field:crm.helpdesk,message_is_follower:0
 msgid "Is a Follower"
-msgstr ""
+msgstr "Подписан"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,user_id:0
@@ -501,7 +503,7 @@ msgstr "Январь"
 #. module: crm_helpdesk
 #: field:crm.helpdesk,message_summary:0
 msgid "Summary"
-msgstr ""
+msgstr "Итог"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
@@ -517,7 +519,7 @@ msgstr "Прочее"
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
 msgid "My Company"
-msgstr ""
+msgstr "Моя компания"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
@@ -666,7 +668,7 @@ msgstr ""
 #. module: crm_helpdesk
 #: help:crm.helpdesk,message_ids:0
 msgid "Messages and communication history"
-msgstr ""
+msgstr "Сообщения и история общения"
 
 #. module: crm_helpdesk
 #: model:ir.actions.act_window,help:crm_helpdesk.crm_helpdesk_categ_action
diff --git a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
index 6ce2c60093f..c1ffc00303d 100644
--- a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
+++ b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
@@ -56,7 +56,7 @@
                     <separator/>
                     <filter icon="terp-personal" string="My Case(s)" help="My Case(s)" domain="[('user_id','=',uid)]" />
                     <separator/>
-                    <filter string="My Sales Team(s)" icon="terp-personal+" context="{'invisible_section': False}" domain="[('section_id.user_id','=',uid)]" help="My Sales Team(s)" />
+                    <filter string="My Sales Team(s)" icon="terp-personal+" context="{'invisible_section': False}" domain="[('section_id.user_id','=',uid)]" help="My Sales Team(s)"  groups="base.group_multi_salesteams"/>
                     <separator/>
                     <filter string="My Company" icon="terp-go-home" context="{'invisible_section': False}" domain="[('section_id.user_id.company_id','=',uid)]" help="My company"/>
                     <field name="user_id" string="Salesperson"/>
@@ -71,7 +71,7 @@
                     </group>
                     <group expand="1" string="Group By...">
                         <filter string="Salesperson" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
-                        <filter string="Sales Team" icon="terp-personal+" domain="[]" context="{'group_by':'section_id'}" />
+                        <filter string="Sales Team" icon="terp-personal+" domain="[]" context="{'group_by':'section_id'}" groups="base.group_multi_salesteams"/>
                         <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}" />
                         <filter string="Channel" icon="terp-call-start" domain="[]" context="{'group_by':'channel_id'}" />
                         <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}" />
diff --git a/addons/crm_helpdesk/test/customer_question.eml b/addons/crm_helpdesk/test/customer_question.eml
index 38a4c95fb0c..9bc7c91cb41 100644
--- a/addons/crm_helpdesk/test/customer_question.eml
+++ b/addons/crm_helpdesk/test/customer_question.eml
@@ -3,7 +3,7 @@ Date: Tue, 25 Oct 2011 13:41:17 +0530
 From: Mr. John Right <info@customer.com>
 User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.2.14) Gecko/20110223 Lightning/1.0b2 Thunderbird/3.1.8
 MIME-Version: 1.0
-To: info@my.com
+To: _helpdesk@my.com
 Subject: Where is download link of user manual of your product ? 
 Content-Type: text/plain; charset=ISO-8859-1; format=flowed
 Content-Transfer-Encoding: 8bit
diff --git a/addons/crm_partner_assign/i18n/ru.po b/addons/crm_partner_assign/i18n/ru.po
index f0a7ff509c9..53a2929be4e 100644
--- a/addons/crm_partner_assign/i18n/ru.po
+++ b/addons/crm_partner_assign/i18n/ru.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2011-03-23 13:46+0000\n"
+"PO-Revision-Date: 2013-05-30 14:10+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: Russian <ru@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: 2013-03-16 05:47+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-05-31 05:38+0000\n"
+"X-Generator: Launchpad (build 16660)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_close:0
@@ -25,7 +25,7 @@ msgstr "Задержка закрытия"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,author_id:0
 msgid "Author"
-msgstr ""
+msgstr "Автор"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,planned_revenue:0
@@ -38,6 +38,9 @@ msgid ""
 "Message type: email for email message, notification for system message, "
 "comment for other messages such as user replies"
 msgstr ""
+"Тип сообщения: эл. почта - для эл. почты, уведомление - для системных "
+"сообщений, комментарий - для остальных сообщений таких как сообщения "
+"пользователя"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,nbr:0
@@ -53,7 +56,7 @@ msgstr "Группировать по ..."
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,body:0
 msgid "Automatically sanitized HTML contents"
-msgstr ""
+msgstr "Автоматически обработанное HTML содержимое"
 
 #. module: crm_partner_assign
 #: view:crm.lead:0
@@ -68,7 +71,7 @@ msgstr "Геолоцировать"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,starred:0
 msgid "Starred"
-msgstr ""
+msgstr "Отмеченные"
 
 #. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
@@ -81,6 +84,8 @@ msgid ""
 "Email address of the sender. This field is set when no matching partner is "
 "found for incoming emails."
 msgstr ""
+"Адрес эл. почты отправителя. Это поле устанавливается когда партнер не "
+"определен для входящих писем."
 
 #. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
@@ -111,7 +116,7 @@ msgstr "Компания"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,notification_ids:0
 msgid "Notifications"
-msgstr ""
+msgstr "Уведомления"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,date_assign:0
@@ -123,7 +128,7 @@ msgstr "Дата партнера"
 #: view:crm.partner.report.assign:0
 #: view:res.partner:0
 msgid "Salesperson"
-msgstr ""
+msgstr "Продавец"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
@@ -170,12 +175,12 @@ msgstr "Географическое назначение"
 #. module: crm_partner_assign
 #: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
 msgid "Email composition wizard"
-msgstr ""
+msgstr "Мастер составления эл. почты"
 
 #. module: crm_partner_assign
 #: field:crm.partner.report.assign,turnover:0
 msgid "Turnover"
-msgstr ""
+msgstr "Оборот"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,date_closed:0
@@ -199,7 +204,7 @@ msgstr ""
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "System notification"
-msgstr ""
+msgstr "Системное уведомление"
 
 #. module: crm_partner_assign
 #: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
@@ -271,7 +276,7 @@ msgstr "Тип"
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Email"
-msgstr ""
+msgstr "Эл. почта"
 
 #. module: crm_partner_assign
 #: help:crm.lead,partner_assigned_id:0
@@ -286,7 +291,7 @@ msgstr "Низший"
 #. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Date Invoice"
-msgstr ""
+msgstr "Дата счета"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,template_id:0
@@ -311,12 +316,12 @@ msgstr "Дата создания"
 #. module: crm_partner_assign
 #: model:ir.model,name:crm_partner_assign.model_res_partner_activation
 msgid "res.partner.activation"
-msgstr ""
+msgstr "res.partner.activation"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,parent_id:0
 msgid "Parent Message"
-msgstr ""
+msgstr "Родительское сообщение"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,res_id:0
@@ -358,12 +363,12 @@ msgstr "Этап"
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,state:0
 msgid "Status"
-msgstr ""
+msgstr "Статус"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,to_read:0
 msgid "To read"
-msgstr ""
+msgstr "Прочитать"
 
 #. module: crm_partner_assign
 #: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
@@ -418,12 +423,12 @@ msgstr "Количество дней, для закрытия вопроса"
 #: help:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid ""
 "Partners that have a notification pushing this message in their mailboxes"
-msgstr ""
+msgstr "Партнеры которые имеют уведомление доставляемое в их почтовые ящики"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Comment"
-msgstr ""
+msgstr "Комментарий"
 
 #. module: crm_partner_assign
 #: field:res.partner,partner_weight:0
@@ -451,7 +456,7 @@ msgstr "Декабрь"
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Users that voted for this message"
-msgstr ""
+msgstr "Пользователи, которые проголосовали за это сообщение"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
@@ -467,7 +472,7 @@ msgstr "Дата открытия"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,child_ids:0
 msgid "Child Messages"
-msgstr ""
+msgstr "Связанные сообщения"
 
 #. module: crm_partner_assign
 #: field:crm.partner.report.assign,date_review:0
@@ -483,17 +488,17 @@ msgstr "Тема"
 #. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "or"
-msgstr ""
+msgstr "или"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,body:0
 msgid "Contents"
-msgstr ""
+msgstr "Содержимое"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Votes"
-msgstr ""
+msgstr "Голоса"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
@@ -504,6 +509,8 @@ msgstr "# Предложений"
 #: help:crm.lead.forward.to.partner,starred:0
 msgid "Current user has a starred notification linked to this message"
 msgstr ""
+"Текущий пользователь имеет отмеченное уведомление, связанное с этим "
+"сообщением"
 
 #. module: crm_partner_assign
 #: field:crm.partner.report.assign,date_partnership:0
@@ -561,7 +568,7 @@ msgstr "Август"
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,record_name:0
 msgid "Name get of the related document."
-msgstr ""
+msgstr "Название связанного документа."
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
@@ -684,7 +691,7 @@ msgstr "Вложения"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,record_name:0
 msgid "Message Record Name"
-msgstr ""
+msgstr "Название записи сообщения"
 
 #. module: crm_partner_assign
 #: field:res.partner.activation,sequence:0
@@ -724,7 +731,7 @@ msgstr "Открыто"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,subtype_id:0
 msgid "Subtype"
-msgstr ""
+msgstr "Подтип"
 
 #. module: crm_partner_assign
 #: field:res.partner,date_localization:0
@@ -739,12 +746,12 @@ msgstr "Текущий"
 #. module: crm_partner_assign
 #: model:ir.model,name:crm_partner_assign.model_crm_lead
 msgid "Lead/Opportunity"
-msgstr ""
+msgstr "Кандидат/Предложение"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid "Notified partners"
-msgstr ""
+msgstr "Уведомленные партнеры"
 
 #. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
@@ -775,7 +782,7 @@ msgstr "Вероятная выручка"
 #: field:res.partner,activation:0
 #: view:res.partner.activation:0
 msgid "Activation"
-msgstr ""
+msgstr "Активация"
 
 #. module: crm_partner_assign
 #: view:crm.lead:0
@@ -792,6 +799,8 @@ msgstr ""
 #: help:crm.lead.forward.to.partner,to_read:0
 msgid "Current user has an unread notification linked to this message"
 msgstr ""
+"Текущий пользователь имеет непрочитанные уведомления, связанные с этим "
+"сообщением"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
@@ -860,6 +869,8 @@ msgid ""
 "Technical field holding the message notifications. Use notified_partner_ids "
 "to access notified partners."
 msgstr ""
+"Техническое поле, содержащее уведомления. Используйте notified_partner_ids "
+"для доступа к оповещаемым партнерам."
 
 #. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
@@ -874,12 +885,12 @@ msgstr "CRM - отчет по кандидатам"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,composition_mode:0
 msgid "Composition mode"
-msgstr ""
+msgstr "Режим составления"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,model:0
 msgid "Related Document Model"
-msgstr ""
+msgstr "Модель связанного документа"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
@@ -892,6 +903,8 @@ msgid ""
 "Author of the message. If not set, email_from may hold an email address that "
 "did not match any partner."
 msgstr ""
+"Автор сообщения. Если не установлен, email_from может содержать адрес почты, "
+"который не соответствует ни одному партнеру."
 
 #. module: crm_partner_assign
 #: model:ir.model,name:crm_partner_assign.model_crm_partner_report_assign
@@ -906,12 +919,12 @@ msgstr "Высокий"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,partner_ids:0
 msgid "Additional contacts"
-msgstr ""
+msgstr "Дополнительные контакты"
 
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,parent_id:0
 msgid "Initial thread message."
-msgstr ""
+msgstr "Первое сообщение цепочки."
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,create_date:0
diff --git a/addons/crm_partner_assign/wizard/crm_forward_to_partner.py b/addons/crm_partner_assign/wizard/crm_forward_to_partner.py
index 91d462de015..924f96180cc 100644
--- a/addons/crm_partner_assign/wizard/crm_forward_to_partner.py
+++ b/addons/crm_partner_assign/wizard/crm_forward_to_partner.py
@@ -105,10 +105,17 @@ class crm_lead_forward_to_partner(osv.TransientModel):
         """ Forward the lead to a partner """
         if context is None:
             context = {}
+        # TDE FIX in 7.0: force mass_mailing mode; this way, the message will be
+        # send only to partners; default subtype of mass_mailing is indeed False
+        # Chatter will show 'logged a note', but partner_ids (aka, the assigned partner)
+        # will effectively receive the message if present in the composition window
+        self.write(cr, uid, ids, {'composition_mode': 'mass_mail'}, context=context)
         res = {'type': 'ir.actions.act_window_close'}
         wizard = self.browse(cr, uid, ids[0], context=context)
         if wizard.model not in ('crm.lead'):
             return res
+        if context.get('active_ids') is None:
+            context['active_ids'] = [wizard.res_id]
 
         lead = self.pool[wizard.model]
         lead_ids = wizard.res_id and [wizard.res_id] or []
@@ -116,6 +123,7 @@ class crm_lead_forward_to_partner(osv.TransientModel):
         if wizard.composition_mode == 'mass_mail':
             lead_ids = context and context.get('active_ids', []) or []
             value = self.default_get(cr, uid, ['body', 'email_to', 'email_cc', 'subject', 'history_mode'], context=context)
+            value.pop('composition_mode')
             self.write(cr, uid, ids, value, context=context)
 
         return self.send_mail(cr, uid, ids, context=context)
diff --git a/addons/crm_profiling/i18n/ru.po b/addons/crm_profiling/i18n/ru.po
index 8cbe1695e82..a7325d894c5 100644
--- a/addons/crm_profiling/i18n/ru.po
+++ b/addons/crm_profiling/i18n/ru.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-05-10 17:51+0000\n"
+"PO-Revision-Date: 2013-05-30 14:05+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@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: 2013-03-16 05:32+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-05-31 05:38+0000\n"
+"X-Generator: Launchpad (build 16660)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
@@ -151,7 +151,7 @@ msgstr "Используйте правила профилирования"
 #. module: crm_profiling
 #: constraint:crm.segmentation:0
 msgid "Error ! You cannot create recursive profiles."
-msgstr ""
+msgstr "Ошибка ! Нельзя создать рекурсивный профиль."
 
 #. module: crm_profiling
 #: field:crm.segmentation,answer_yes:0
@@ -200,7 +200,7 @@ msgstr "Сохранить данные"
 #. module: crm_profiling
 #: view:open.questionnaire:0
 msgid "or"
-msgstr ""
+msgstr "или"
 
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
diff --git a/addons/document/odt2txt.py b/addons/document/odt2txt.py
old mode 100644
new mode 100755
diff --git a/addons/document_webdav/__openerp__.py b/addons/document_webdav/__openerp__.py
index ec112ec7c38..befb87829ed 100644
--- a/addons/document_webdav/__openerp__.py
+++ b/addons/document_webdav/__openerp__.py
@@ -24,7 +24,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
 ##############################################################################
 
diff --git a/addons/document_webdav/test_davclient.py b/addons/document_webdav/test_davclient.py
index 058dc1c748d..f3a8b35b582 100644
--- a/addons/document_webdav/test_davclient.py
+++ b/addons/document_webdav/test_davclient.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- encoding: utf-8 -*-
 #
 # Copyright P. Christeas <p_christ@hol.gr> 2008,2009
@@ -24,7 +23,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 ###############################################################################
 
 """ A trivial HTTP/WebDAV client, used for testing the server
diff --git a/addons/document_webdav/webdav_server.py b/addons/document_webdav/webdav_server.py
index f67de272e29..e495f5c9f2f 100644
--- a/addons/document_webdav/webdav_server.py
+++ b/addons/document_webdav/webdav_server.py
@@ -30,7 +30,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 ###############################################################################
 
 
diff --git a/addons/document_webdav/webdav_setup.xml b/addons/document_webdav/webdav_setup.xml
index d75c416a93e..dbf6bc8fbcc 100644
--- a/addons/document_webdav/webdav_setup.xml
+++ b/addons/document_webdav/webdav_setup.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0"?>
 <openerp>
 <data noupdate="1">
 <!--This file contains a typical setup of a WebDAV folders' structure, 
@@ -25,7 +24,7 @@
             <field eval="0" name="ressource_tree"/>
             <field name="user_id" eval="False"/>
             <field name="company_id" ref="base.main_company"/>
-            <field model="document.directory" name="parent_id" ref="document_directory_principals0"/>
+            <field name="parent_id" ref="document_directory_principals0"/>
             <field name="type">directory</field>
             <field eval="[(6,0,[])]" name="group_ids"/>
             <field name="name">groups</field>
@@ -36,7 +35,7 @@
             <field eval="1" name="resource_find_all"/>
             <field eval="0" name="ressource_tree"/>
             <field name="company_id" ref="base.main_company"/>
-            <field model="document.directory" name="parent_id" ref="document_directory_principals0"/>
+            <field name="parent_id" ref="document_directory_principals0"/>
             <field name="type">directory</field>
             <field eval="[(6,0,[])]" name="group_ids"/>
             <field name="name">resources</field>
@@ -48,7 +47,7 @@
             <field name="user_id" eval="False"/>
             <field name="resource_field" ref="base.field_res_users_login"/>
             <field name="company_id" ref="base.main_company"/>
-            <field model="document.directory" name="parent_id" ref="document_directory_principals0"/>
+            <field name="parent_id" ref="document_directory_principals0"/>
             <field name="type">ressource</field>
             <field name="ressource_type_id" ref="base.model_res_users"/>
             <field eval="[(6,0,[])]" name="group_ids"/>
@@ -61,7 +60,7 @@
             <field name="user_id" eval="False"/>
             <field name="resource_field" ref="base.field_res_users_login"/>
             <field name="company_id" ref="base.main_company"/>
-            <field model="document.directory" name="parent_id" ref="document_directory_principals0"/>
+            <field name="parent_id" ref="document_directory_principals0"/>
             <field name="type">ressource</field>
             <field name="ressource_type_id" ref="base.model_res_users"/>
             <field eval="[(6,0,[])]" name="group_ids"/>
@@ -72,7 +71,7 @@
             <field eval="1" name="resource_find_all"/>
             <field eval="0" name="ressource_tree"/>
             <field name="company_id" ref="base.main_company"/>
-            <field model="document.directory" name="parent_id" ref="document_directory_principals0"/>
+            <field name="parent_id" ref="document_directory_principals0"/>
             <field name="type">directory</field>
             <field eval="[(6,0,[])]" name="group_ids"/>
             <field name="name">locations</field>
@@ -91,4 +90,4 @@
         </record>
 
 </data>
-</openerp>
+</openerp>
\ No newline at end of file
diff --git a/addons/edi/i18n/ru.po b/addons/edi/i18n/ru.po
index dad4bf0dcda..3ac2689bc57 100644
--- a/addons/edi/i18n/ru.po
+++ b/addons/edi/i18n/ru.po
@@ -8,35 +8,35 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-09-10 15:12+0000\n"
+"PO-Revision-Date: 2013-05-30 13:32+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: Russian <ru@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: 2013-03-16 05:50+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-05-31 05:38+0000\n"
+"X-Generator: Launchpad (build 16660)\n"
 
 #. module: edi
 #. openerp-web
 #: code:addons/edi/static/src/js/edi.js:67
 #, python-format
 msgid "Reason:"
-msgstr ""
+msgstr "Причина:"
 
 #. module: edi
 #. openerp-web
 #: code:addons/edi/static/src/js/edi.js:60
 #, python-format
 msgid "The document has been successfully imported!"
-msgstr ""
+msgstr "Документ был успешно импортирован!"
 
 #. module: edi
 #. openerp-web
 #: code:addons/edi/static/src/js/edi.js:65
 #, python-format
 msgid "Sorry, the document could not be imported."
-msgstr ""
+msgstr "Извините, документ не может быть импортирован."
 
 #. module: edi
 #: model:ir.model,name:edi.model_res_company
@@ -53,13 +53,13 @@ msgstr "Валюта"
 #: code:addons/edi/static/src/js/edi.js:71
 #, python-format
 msgid "Document Import Notification"
-msgstr ""
+msgstr "Уведомление об импорте документа"
 
 #. module: edi
 #: code:addons/edi/models/edi.py:130
 #, python-format
 msgid "Missing application."
-msgstr ""
+msgstr "Отсутствующее приложение."
 
 #. module: edi
 #: code:addons/edi/models/edi.py:131
@@ -69,12 +69,15 @@ msgid ""
 "You can install it by connecting as the administrator and opening the "
 "configuration assistant."
 msgstr ""
+"Документу, который вы пытаетесь импортировать, необходимо OpenERP приложение "
+"'%s'. Вы можете установить его, выполнив вход под администратором и открыв "
+"настройки."
 
 #. module: edi
 #: code:addons/edi/models/edi.py:47
 #, python-format
 msgid "'%s' is an invalid external ID"
-msgstr ""
+msgstr "'%s' это неверный внешний идентификатор"
 
 #. module: edi
 #: model:ir.model,name:edi.model_res_partner
@@ -84,7 +87,7 @@ msgstr "Контрагент"
 #. module: edi
 #: model:ir.model,name:edi.model_edi_edi
 msgid "EDI Subsystem"
-msgstr ""
+msgstr "Подсистема электронного документооборота"
 
 #~ msgid "The currency code must be unique per company!"
 #~ msgstr "Код валюты должен быть уникальным в компании!"
diff --git a/addons/email_template/email_template.py b/addons/email_template/email_template.py
index 00285ebcd91..2a7990e301b 100644
--- a/addons/email_template/email_template.py
+++ b/addons/email_template/email_template.py
@@ -358,7 +358,7 @@ class email_template(osv.osv):
         values['attachment_ids'] = attachment_ids
         return values
 
-    def send_mail(self, cr, uid, template_id, res_id, force_send=False, context=None):
+    def send_mail(self, cr, uid, template_id, res_id, force_send=False, raise_exception=False, context=None):
         """Generates a new mail message for the given template and record,
            and schedules it for delivery through the ``mail`` module's scheduler.
 
@@ -382,6 +382,7 @@ class email_template(osv.osv):
         attachment_ids = values.pop('attachment_ids', [])
         attachments = values.pop('attachments', [])
         msg_id = mail_mail.create(cr, uid, values, context=context)
+        mail = mail_mail.browse(cr, uid, msg_id, context=context)
 
         # manage attachments
         for attachment in attachments:
@@ -390,7 +391,7 @@ class email_template(osv.osv):
                     'datas_fname': attachment[0],
                     'datas': attachment[1],
                     'res_model': 'mail.message',
-                    'res_id': msg_id,
+                    'res_id': mail.mail_message_id.id,
             }
             context.pop('default_type', None)
             attachment_ids.append(ir_attachment.create(cr, uid, attachment_data, context=context))
@@ -399,7 +400,7 @@ class email_template(osv.osv):
             mail_mail.write(cr, uid, msg_id, {'attachment_ids': [(6, 0, attachment_ids)]}, context=context)
 
         if force_send:
-            mail_mail.send(cr, uid, [msg_id], context=context)
+            mail_mail.send(cr, uid, [msg_id], raise_exception=raise_exception, context=context)
         return msg_id
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/email_template/html2text.py b/addons/email_template/html2text.py
old mode 100644
new mode 100755
diff --git a/addons/email_template/i18n/ru.po b/addons/email_template/i18n/ru.po
index e12ebd076cc..2e592ecea35 100644
--- a/addons/email_template/i18n/ru.po
+++ b/addons/email_template/i18n/ru.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-12-25 12:16+0000\n"
-"Last-Translator: Olga <chikiro.spam@gmail.com>\n"
+"PO-Revision-Date: 2013-05-30 13:33+0000\n"
+"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: Russian <ru@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: 2013-03-16 05:42+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-05-31 05:38+0000\n"
+"X-Generator: Launchpad (build 16660)\n"
 
 #. module: email_template
 #: field:email.template,email_from:0
@@ -37,7 +37,7 @@ msgstr "Кнопка боковой панели для открытия дей
 #. module: email_template
 #: field:res.partner,opt_out:0
 msgid "Opt-Out"
-msgstr ""
+msgstr "Без уведомлений"
 
 #. module: email_template
 #: field:email.template,email_to:0
@@ -510,7 +510,7 @@ msgstr ""
 #. module: email_template
 #: view:email.template:0
 msgid "Contents"
-msgstr ""
+msgstr "Содержимое"
 
 #. module: email_template
 #: field:email.template,subject:0
diff --git a/addons/email_template/wizard/mail_compose_message_view.xml b/addons/email_template/wizard/mail_compose_message_view.xml
index 46ed49e6627..3cb83896ca2 100644
--- a/addons/email_template/wizard/mail_compose_message_view.xml
+++ b/addons/email_template/wizard/mail_compose_message_view.xml
@@ -28,7 +28,7 @@
                         <div>Use template
                             <!--FIX: To avoid css issue of many2one field in footer temporary used oe_form (BUG:1152464)-->
                             <field name="template_id" nolabel="1" class='oe_inline'
-                                on_change="onchange_template_id(template_id, composition_mode, model, res_id, context)" domain="[('model_id','=',context.get('default_model'))]"/>
+                                on_change="onchange_template_id(template_id, composition_mode, model, res_id, context)" domain="[('model_id.model','=',model)]"/>
                         </div>
                         <button icon="/email_template/static/src/img/email_template_save.png"
                             type="object" name="save_as_template" string="Save as new template" class="oe_link"
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 8efae21f676..4f5e33eeafd 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -6,7 +6,7 @@
             <field name="res_model">event.registration</field>
             <field name="view_type">form</field>
             <field name="name">Registrations</field>
-            <field name="view_mode">calendar,tree,form,graph</field>
+            <field name="view_mode">tree,form,calendar,graph</field>
             <field name="context">{'search_default_event_id': active_id, 'default_event_id': active_id}</field>
         </record>
 
@@ -93,6 +93,7 @@
                                    </div>
                             </group>
                             <group>
+                                <field name="user_id"/>
                                 <field name="type" on_change="onchange_event_type(type,context)" />
                                 <field name="date_begin" on_change="onchange_start_date(date_begin,date_end)"/>
                                 <field name="date_end"/>
@@ -100,19 +101,13 @@
                             </group>
                         </group>
                         <notebook>
-                            <page string="Email Configuration" groups="base.group_no_one">
-                                <group>
+                            <page string="Event Details" groups="base.group_no_one">
+                                <group colspan="4">
                                     <field name="reply_to"/>
-                                    <group>
-                                        <field name="email_registration_id"/>
-                                    </group>
-                                    <group>
-                                        <field name="email_confirmation_id"/>
-                                    </group>
+                                    <field name="email_registration_id"/>
+                                    <field name="email_confirmation_id"/>
                                 </group>
-                            </page>
-                            <page string="Event Description">
-                                <field name="note" colspan="4" nolabel="1"/>
+                                <field name="note" nolabel="1" placeholder="Event Description..."/>
                             </page>
                             <page string="Registrations">
                                 <group>
diff --git a/addons/event_sale/event_sale.py b/addons/event_sale/event_sale.py
index ec583a58cbf..8bacd37fc15 100644
--- a/addons/event_sale/event_sale.py
+++ b/addons/event_sale/event_sale.py
@@ -70,6 +70,8 @@ class sale_order_line(osv.osv):
         '''
         create registration with sales order
         '''
+        if context is None:
+            context = {}
         registration_obj = self.pool.get('event.registration')
         sale_obj = self.pool.get('sale.order')
         for order_line in self.browse(cr, uid, ids, context=context):
@@ -83,7 +85,8 @@ class sale_order_line(osv.osv):
                     'origin': order_line.order_id.name,
                     'event_id': order_line.event_id.id,
                 }
+                message = _("The registration has been created for event <i>%s</i> from the Sale Order %s. ") % (order_line.event_id.name, order_line.order_id.name)
+                context.update({'mail_create_nolog': True})
                 registration_id = registration_obj.create(cr, uid, dic, context=context)
-                message = _("The registration %s has been created from the Sales Order %s.") % (registration_id, order_line.order_id.name)
                 registration_obj.message_post(cr, uid, [registration_id], body=message, context=context)
         return super(sale_order_line, self).button_confirm(cr, uid, ids, context=context)
diff --git a/addons/fetchmail/fetchmail_view.xml b/addons/fetchmail/fetchmail_view.xml
index 4e653adce28..5ee17c61b6f 100644
--- a/addons/fetchmail/fetchmail_view.xml
+++ b/addons/fetchmail/fetchmail_view.xml
@@ -97,15 +97,17 @@
         <record id="inherit_view_general_configuration" model="ir.ui.view">
             <field name="name">General Settings</field>
             <field name="model">base.config.settings</field>
-              <field name="inherit_id" ref="base_setup.view_general_configuration"/>
-              <field name="arch" type="xml">
-                  <div name="email" position="inside">
-                      <button type="action"
-                            name="%(action_email_server_tree)d"
-                            string="Configure the incoming email gateway" class="oe_link"/>
-                  </div>
-              </field>
-      </record>
+            <field name="inherit_id" ref="base_setup.view_general_configuration"/>
+            <field name="arch" type="xml">
+                <div name="email.outgoing_server" position="after">
+                    <div name="email.incoming_server">
+                        <button type="action"
+                                name="%(action_email_server_tree)d"
+                                string="Configure the incoming email gateway" class="oe_link"/>
+                    </div>
+                </div>
+            </field>
+        </record>
 
 
         <menuitem
diff --git a/addons/fleet/i18n/de.po b/addons/fleet/i18n/de.po
index f9f0523056e..b47b8ba2074 100644
--- a/addons/fleet/i18n/de.po
+++ b/addons/fleet/i18n/de.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-21 17:06+0000\n"
-"PO-Revision-Date: 2013-01-06 11:09+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2013-06-03 05:25+0000\n"
+"Last-Translator: Armin GREGOR <armin.gregor@gmail.com>\n"
 "Language-Team: German <de@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: 2013-03-16 05:52+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-06-04 05:20+0000\n"
+"X-Generator: Launchpad (build 16660)\n"
 
 #. module: fleet
 #: selection:fleet.vehicle,fuel_type:0
@@ -35,7 +35,7 @@ msgstr "Ersatz Kälteklimakompressor"
 #. module: fleet
 #: help:fleet.vehicle,vin_sn:0
 msgid "Unique number written on the vehicle motor (VIN/SN number)"
-msgstr "Eindeutige Fahrzeug-Identifizierungsnummer (FIN)"
+msgstr "Fahrgestellnummer"
 
 #. module: fleet
 #: selection:fleet.service.type,category:0
@@ -157,7 +157,7 @@ msgstr "Batterie Inspektion"
 #. module: fleet
 #: field:fleet.vehicle,company_id:0
 msgid "Company"
-msgstr "Unternehmen"
+msgstr "Firma"
 
 #. module: fleet
 #: view:fleet.vehicle.log.contract:0
@@ -324,7 +324,7 @@ msgstr "Ersatz Luftfilter"
 #. module: fleet
 #: model:ir.model,name:fleet.model_fleet_vehicle_tag
 msgid "fleet.vehicle.tag"
-msgstr ""
+msgstr "fleet.vehicle.tag"
 
 #. module: fleet
 #: view:fleet.vehicle:0
@@ -339,7 +339,7 @@ msgstr "Bezeichnung des zu erneuernden Vertrags"
 #. module: fleet
 #: model:fleet.vehicle.tag,name:fleet.vehicle_tag_senior
 msgid "Senior"
-msgstr ""
+msgstr "Senior"
 
 #. module: fleet
 #: help:fleet.vehicle.log.contract,state:0
@@ -490,6 +490,8 @@ msgid ""
 "$('.oe_picture').load(function() { if($(this).width() > $(this).height()) { "
 "$(this).addClass('oe_employee_picture_wide') } });"
 msgstr ""
+"$('.oe_picture').load(function() { if($(this).width() > $(this).height()) { "
+"$(this).addClass('oe_employee_picture_wide') } });"
 
 #. module: fleet
 #: view:board.board:0
@@ -737,7 +739,7 @@ msgstr "Aktueller Fahrzeugzustand"
 #. module: fleet
 #: selection:fleet.vehicle,transmission:0
 msgid "Manual"
-msgstr "Betriebsanleitung"
+msgstr "Handbuch"
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_52
@@ -917,7 +919,7 @@ msgstr "Kaufdatum des Fahrzeugs"
 #. module: fleet
 #: view:fleet.vehicle.model:0
 msgid "Models"
-msgstr "Modell"
+msgstr "Modelle"
 
 #. module: fleet
 #: view:fleet.vehicle.log.contract:0
@@ -1055,7 +1057,7 @@ msgstr "Kraftstoffart"
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_22
 msgid "Fuel Injector Replacement"
-msgstr "Ersatz Einfüllstutzen"
+msgstr "Ersatz Einspritzdüse"
 
 #. module: fleet
 #: model:ir.actions.act_window,name:fleet.fleet_vehicle_state_act
@@ -1101,7 +1103,7 @@ msgstr "Datum Vertragsbeginn"
 #. module: fleet
 #: selection:fleet.vehicle,fuel_type:0
 msgid "Electric"
-msgstr "Elektrisch"
+msgstr "Elektrik"
 
 #. module: fleet
 #: field:fleet.vehicle,tag_ids:0
@@ -1174,7 +1176,7 @@ msgstr "Ersatz Lichtmaschine"
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_3
 msgid "A/C Diagnosis"
-msgstr "Diagnose Batterie"
+msgstr "Diagnose Klimaanlage"
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_23
@@ -1199,7 +1201,7 @@ msgstr "Ersatz Wärmepumpe"
 #. module: fleet
 #: view:fleet.vehicle:0
 msgid "show all the costs for this vehicle"
-msgstr "gesamte Kostenübersicht der Fahrzeuge"
+msgstr "gesamte Kostenübersicht des Fahrzeugs"
 
 #. module: fleet
 #: view:fleet.vehicle.odometer:0
@@ -1534,7 +1536,7 @@ msgstr "Achsvermessung"
 #. module: fleet
 #: model:fleet.vehicle.tag,name:fleet.vehicle_tag_purchased
 msgid "Purchased"
-msgstr "Ersatzteil"
+msgstr "Eingekauft"
 
 #. module: fleet
 #: model:ir.actions.act_window,help:fleet.fleet_vehicle_odometer_act
@@ -1747,7 +1749,7 @@ msgstr "Preis"
 #: field:fleet.vehicle.cost,odometer:0
 #: field:fleet.vehicle.odometer,value:0
 msgid "Odometer Value"
-msgstr "Tachostand"
+msgstr "Kilometerstand"
 
 #. module: fleet
 #: view:fleet.vehicle:0
@@ -1805,7 +1807,7 @@ msgstr "Schreiben Sie hier alle erforderlichen Zusatzinformationen auf."
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_29
 msgid "Ignition Coil Replacement"
-msgstr "Ersatz Zündkerzen"
+msgstr "Ersatz Zündspule"
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_service_16
@@ -1815,7 +1817,7 @@ msgstr "Optionen"
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_contract_repairing
 msgid "Repairing"
-msgstr "Reparieren"
+msgstr "Wird repariert"
 
 #. module: fleet
 #: model:ir.actions.act_window,name:fleet.action_fleet_reporting_costs
@@ -1853,7 +1855,7 @@ msgstr "Getriebe"
 #. module: fleet
 #: field:fleet.vehicle,vin_sn:0
 msgid "Chassis Number"
-msgstr "Fahrzeuqinformationsnummer"
+msgstr "Fahrgestellnummer"
 
 #. module: fleet
 #: help:fleet.vehicle,color:0
@@ -2009,7 +2011,7 @@ msgstr "Reifenwechsel"
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_42
 msgid "Starter Replacement"
-msgstr "Erstinspektion"
+msgstr "Ersatz Anlasser"
 
 #. module: fleet
 #: view:fleet.vehicle.cost:0
diff --git a/addons/fleet/i18n/hu.po b/addons/fleet/i18n/hu.po
new file mode 100644
index 00000000000..eca6519a11b
--- /dev/null
+++ b/addons/fleet/i18n/hu.po
@@ -0,0 +1,1912 @@
+# Hungarian 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: 2012-12-21 17:06+0000\n"
+"PO-Revision-Date: 2013-05-19 20:39+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Hungarian <hu@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: 2013-05-20 05:34+0000\n"
+"X-Generator: Launchpad (build 16626)\n"
+
+#. module: fleet
+#: selection:fleet.vehicle,fuel_type:0
+msgid "Hybrid"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.vehicle.tag,name:fleet.vehicle_tag_compact
+msgid "Compact"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_1
+msgid "A/C Compressor Replacement"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,vin_sn:0
+msgid "Unique number written on the vehicle motor (VIN/SN number)"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.service.type,category:0
+#: view:fleet.vehicle.log.contract:0
+#: view:fleet.vehicle.log.services:0
+msgid "Service"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle.log.contract,cost_frequency:0
+msgid "Monthly"
+msgstr ""
+
+#. module: fleet
+#: code:addons/fleet/fleet.py:62
+#, python-format
+msgid "Unknown"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_20
+msgid "Engine/Drive Belt(s) Replacement"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.cost:0
+msgid "Vehicle costs"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle,fuel_type:0
+msgid "Diesel"
+msgstr ""
+
+#. module: fleet
+#: code:addons/fleet/fleet.py:421
+#, python-format
+msgid "License Plate: from '%s' to '%s'"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_38
+msgid "Resurface Rotors"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.cost:0
+#: view:fleet.vehicle.model:0
+msgid "Group By..."
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_32
+msgid "Oil Pump Replacement"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_18
+msgid "Engine Belt Inspection"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle.log.contract,cost_frequency:0
+msgid "No"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,power:0
+msgid "Power in kW of the vehicle"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_2
+msgid "Depreciation and Interests"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.log.contract,insurer_id:0
+#: field:fleet.vehicle.log.fuel,vendor_id:0
+#: field:fleet.vehicle.log.services,vendor_id:0
+msgid "Supplier"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_35
+msgid "Power Steering Hose Replacement"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.contract:0
+msgid "Odometer details"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+msgid "Has Alert(s)"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.log.fuel,liter:0
+msgid "Liter"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.client,name:fleet.action_fleet_menu
+msgid "Open Fleet Menu"
+msgstr ""
+
+#. module: fleet
+#: view:board.board:0
+msgid "Fuel Costs"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_9
+msgid "Battery Inspection"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.contract:0
+msgid "Invoice Date"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.fuel:0
+msgid "Refueling Details"
+msgstr ""
+
+#. module: fleet
+#: code:addons/fleet/fleet.py:669
+#, python-format
+msgid "%s contract(s) need(s) to be renewed and/or closed!"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.cost:0
+msgid "Indicative Costs"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_16
+msgid "Charging System Diagnosis"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,car_value:0
+msgid "Value of the bought vehicle"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_44
+msgid "Tie Rod End Replacement"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_24
+msgid "Head Gasket(s) Replacement"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+#: selection:fleet.vehicle.cost,cost_type:0
+msgid "Services"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,odometer:0
+#: help:fleet.vehicle.cost,odometer:0
+#: help:fleet.vehicle.cost,odometer_id:0
+msgid "Odometer measure of the vehicle at the moment of this log"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.contract:0
+#: field:fleet.vehicle.log.contract,notes:0
+msgid "Terms and Conditions"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.action_fleet_vehicle_kanban
+msgid "Vehicles with alerts"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.fleet_vehicle_costs_act
+#: model:ir.ui.menu,name:fleet.fleet_vehicle_costs_menu
+msgid "Vehicle Costs"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.cost:0
+msgid "Total Cost"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.service.type,category:0
+msgid "Both"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.log.contract,cost_id:0
+#: field:fleet.vehicle.log.fuel,cost_id:0
+#: field:fleet.vehicle.log.services,cost_id:0
+msgid "Automatically created field to link to parent fleet.vehicle.cost"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.contract:0
+msgid "Terminate Contract"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.cost,parent_id:0
+msgid "Parent cost to this current cost"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.log.contract,cost_frequency:0
+msgid "Frequency of the recuring cost"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_1
+msgid "Calculation Benefit In Kind"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.log.contract,expiration_date:0
+msgid ""
+"Date when the coverage of the contract expirates (by default, one year after "
+"begin date)"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.fuel:0
+#: field:fleet.vehicle.log.fuel,notes:0
+#: view:fleet.vehicle.log.services:0
+#: field:fleet.vehicle.log.services,notes:0
+msgid "Notes"
+msgstr ""
+
+#. module: fleet
+#: code:addons/fleet/fleet.py:47
+#, python-format
+msgid "Operation not allowed!"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: fleet
+#: model:res.groups,name:fleet.group_fleet_user
+msgid "User"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.cost,vehicle_id:0
+msgid "Vehicle concerned by this log"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.log.contract,cost_amount:0
+#: field:fleet.vehicle.log.fuel,cost_amount:0
+#: field:fleet.vehicle.log.services,cost_amount:0
+msgid "Amount"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_6
+msgid "Air Filter Replacement"
+msgstr ""
+
+#. module: fleet
+#: model:ir.model,name:fleet.model_fleet_vehicle_tag
+msgid "fleet.vehicle.tag"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+msgid "show the services logs for this vehicle"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,contract_renewal_name:0
+msgid "Name of contract to renew soon"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.vehicle.tag,name:fleet.vehicle_tag_senior
+msgid "Senior"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.log.contract,state:0
+msgid "Choose wheter the contract is still valid or not"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle,transmission:0
+msgid "Automatic"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: fleet
+#: code:addons/fleet/fleet.py:414
+#, python-format
+msgid "Driver: from '%s' to '%s'"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+msgid "and"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.model.brand,image_medium:0
+msgid "Medium-sized photo"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_34
+msgid "Oxygen Sensor Replacement"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.services:0
+msgid "Service Type"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,transmission:0
+msgid "Transmission Used by the vehicle"
+msgstr ""
+
+#. module: fleet
+#: code:addons/fleet/fleet.py:740
+#: view:fleet.vehicle.log.contract:0
+#: model:ir.actions.act_window,name:fleet.act_renew_contract
+#, python-format
+msgid "Renew Contract"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+msgid "show the odometer logs for this vehicle"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,odometer_unit:0
+msgid "Unit of the odometer "
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.services:0
+msgid "Services Costs Per Month"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.cost:0
+msgid "Effective Costs"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_8
+msgid "Repair and maintenance"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.log.contract,purchaser_id:0
+msgid "Person to which the contract is signed for"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,help:fleet.fleet_vehicle_log_contract_act
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new contract. \n"
+"              </p><p>\n"
+"                Manage all your contracts (leasing, insurances, etc.) with\n"
+"                their related services, costs. OpenERP will automatically "
+"warn\n"
+"                you when some contracts have to be renewed.\n"
+"              </p><p>\n"
+"                Each contract (e.g.: leasing) may include several services\n"
+"                (reparation, insurances, periodic maintenance).\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: fleet
+#: model:ir.model,name:fleet.model_fleet_service_type
+msgid "Type of services available on a vehicle"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.fleet_vehicle_service_types_act
+#: model:ir.ui.menu,name:fleet.fleet_vehicle_service_types_menu
+msgid "Service Types"
+msgstr ""
+
+#. module: fleet
+#: view:board.board:0
+msgid "Contracts Costs"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.fleet_vehicle_log_services_act
+#: model:ir.ui.menu,name:fleet.fleet_vehicle_log_services_menu
+msgid "Vehicles Services Logs"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.fleet_vehicle_log_fuel_act
+#: model:ir.ui.menu,name:fleet.fleet_vehicle_log_fuel_menu
+msgid "Vehicles Fuel Logs"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.model.brand:0
+msgid ""
+"$('.oe_picture').load(function() { if($(this).width() > $(this).height()) { "
+"$(this).addClass('oe_employee_picture_wide') } });"
+msgstr ""
+
+#. module: fleet
+#: view:board.board:0
+msgid "Vehicles With Alerts"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,help:fleet.fleet_vehicle_costs_act
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new cost.\n"
+"              </p><p>\n"
+"                OpenERP helps you managing the costs for your different\n"
+"                vehicles. Costs are created automatically from services,\n"
+"                contracts (fixed or recurring) and fuel logs.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+msgid "show the fuel logs for this vehicle"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.log.contract,purchaser_id:0
+msgid "Contractor"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,license_plate:0
+msgid "License Plate"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle.log.contract,state:0
+msgid "To Close"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.log.contract,cost_frequency:0
+msgid "Recurring Cost Frequency"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.log.fuel,inv_ref:0
+#: field:fleet.vehicle.log.services,inv_ref:0
+msgid "Invoice Reference"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,location:0
+msgid "Location"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.cost:0
+msgid "Costs Per Month"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.contract.state,name:0
+msgid "Contract Status"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,contract_renewal_total:0
+msgid "Total of contracts due or overdue minus one"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.cost,cost_subtype_id:0
+msgid "Type"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,contract_renewal_overdue:0
+msgid "Has Contracts Overdued"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.cost,amount:0
+msgid "Total Price"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_27
+msgid "Heater Core Replacement"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_14
+msgid "Car Wash"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,driver_id:0
+msgid "Driver of the vehicle"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+msgid "other(s)"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_refueling
+msgid "Refueling"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_5
+msgid "A/C Recharge"
+msgstr ""
+
+#. module: fleet
+#: model:ir.model,name:fleet.model_fleet_vehicle_log_fuel
+msgid "Fuel log for vehicles"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+msgid "Engine Options"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.fuel:0
+msgid "Fuel Costs Per Month"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.vehicle.tag,name:fleet.vehicle_tag_sedan
+msgid "Sedan"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,seats:0
+msgid "Seats Number"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.vehicle.tag,name:fleet.vehicle_tag_convertible
+msgid "Convertible"
+msgstr ""
+
+#. module: fleet
+#: model:ir.ui.menu,name:fleet.fleet_configuration
+msgid "Configuration"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.contract:0
+#: field:fleet.vehicle.log.contract,sum_cost:0
+msgid "Indicative Costs Total"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.vehicle.tag,name:fleet.vehicle_tag_junior
+msgid "Junior"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,model_id:0
+msgid "Model of the vehicle"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,help:fleet.fleet_vehicle_state_act
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a vehicule status.\n"
+"              </p><p>\n"
+"                You can customize available status to track the evolution "
+"of\n"
+"                each vehicule. Example: Active, Being Repaired, Sold.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+#: field:fleet.vehicle,log_fuel:0
+#: view:fleet.vehicle.log.fuel:0
+msgid "Fuel Logs"
+msgstr ""
+
+#. module: fleet
+#: code:addons/fleet/fleet.py:409
+#: code:addons/fleet/fleet.py:413
+#: code:addons/fleet/fleet.py:417
+#: code:addons/fleet/fleet.py:420
+#, python-format
+msgid "None"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.action_fleet_reporting_costs_non_effective
+#: model:ir.ui.menu,name:fleet.menu_fleet_reporting_indicative_costs
+msgid "Indicative Costs Analysis"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_12
+msgid "Brake Inspection"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,state_id:0
+msgid "Current state of the vehicle"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle,transmission:0
+msgid "Manual"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_52
+msgid "Wheel Bearing Replacement"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.cost,cost_subtype_id:0
+msgid "Cost type purchased with this cost"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle,fuel_type:0
+msgid "Gasoline"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,help:fleet.fleet_vehicle_model_brand_act
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new brand.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.log.contract,start_date:0
+msgid "Contract Start Date"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,odometer_unit:0
+msgid "Odometer Unit"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_30
+msgid "Intake Manifold Gasket Replacement"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle.log.contract,cost_frequency:0
+msgid "Daily"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_6
+msgid "Snow tires"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.cost,date:0
+msgid "Date when the cost has been executed"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.cost:0
+#: view:fleet.vehicle.model:0
+msgid "Vehicles costs"
+msgstr ""
+
+#. module: fleet
+#: model:ir.model,name:fleet.model_fleet_vehicle_log_services
+msgid "Services for vehicles"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.contract:0
+msgid "Indicative Cost"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_26
+msgid "Heater Control Valve Replacement"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.contract:0
+msgid ""
+"Create a new contract automatically with all the same informations except "
+"for the date that will start at the end of current contract"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle.log.contract,state:0
+msgid "Terminated"
+msgstr ""
+
+#. module: fleet
+#: model:ir.model,name:fleet.model_fleet_vehicle_cost
+msgid "Cost related to a vehicle"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_33
+msgid "Other Maintenance"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.cost:0
+#: field:fleet.vehicle.cost,parent_id:0
+msgid "Parent"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,state_id:0
+#: view:fleet.vehicle.state:0
+msgid "State"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.log.contract,cost_generated:0
+msgid "Recurring Cost Amount"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_49
+msgid "Transmission Replacement"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,help:fleet.fleet_vehicle_log_fuel_act
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new fuel log. \n"
+"              </p><p>\n"
+"                Here you can add refuelling entries for all vehicles.  You "
+"can\n"
+"                also filter logs of a particular vehicle using the search\n"
+"                field.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_11
+msgid "Brake Caliper Replacement"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,odometer:0
+msgid "Last Odometer"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.fleet_vehicle_model_act
+#: model:ir.ui.menu,name:fleet.fleet_vehicle_model_menu
+msgid "Vehicle Model"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,doors:0
+msgid "Doors Number"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,acquisition_date:0
+msgid "Date when the vehicle has been bought"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.model:0
+msgid "Models"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.contract:0
+msgid "amount"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,fuel_type:0
+msgid "Fuel Used by the vehicle"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.contract:0
+msgid "Set Contract In Progress"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.cost,odometer_unit:0
+#: field:fleet.vehicle.odometer,unit:0
+msgid "Unit"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,message_is_follower:0
+msgid "Is a Follower"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,horsepower:0
+msgid "Horsepower"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,image:0
+#: field:fleet.vehicle,image_medium:0
+#: field:fleet.vehicle,image_small:0
+#: field:fleet.vehicle.model,image:0
+#: field:fleet.vehicle.model,image_medium:0
+#: field:fleet.vehicle.model,image_small:0
+#: field:fleet.vehicle.model.brand,image:0
+msgid "Logo"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,horsepower_tax:0
+msgid "Horsepower Taxation"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,log_services:0
+#: view:fleet.vehicle.log.services:0
+msgid "Services Logs"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.model:0
+msgid "Brand"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_43
+msgid "Thermostat Replacement"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.service.type,category:0
+msgid "Category"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.action_fleet_vehicle_log_fuel_graph
+msgid "Fuel Costs by Month"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.model.brand,image:0
+msgid ""
+"This field holds the image used as logo for the brand, limited to "
+"1024x1024px."
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_11
+msgid "Management Fee"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+msgid "All vehicles"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.fuel:0
+#: view:fleet.vehicle.log.services:0
+msgid "Additional Details"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.action_fleet_vehicle_log_services_graph
+msgid "Services Costs by Month"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_9
+msgid "Assistance"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.log.fuel,price_per_liter:0
+msgid "Price Per Liter"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_17
+msgid "Door Window Motor/Regulator Replacement"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_46
+msgid "Tire Service"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_8
+msgid "Ball Joint Replacement"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,fuel_type:0
+msgid "Fuel Type"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_22
+msgid "Fuel Injector Replacement"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.fleet_vehicle_state_act
+#: model:ir.ui.menu,name:fleet.fleet_vehicle_state_menu
+msgid "Vehicle Status"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_50
+msgid "Water Pump Replacement"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,location:0
+msgid "Location of the vehicle (garage, ...)"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_28
+msgid "Heater Hose Replacement"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.log.contract,state:0
+msgid "Status"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_40
+msgid "Rotor Replacement"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.model,brand_id:0
+msgid "Brand of the vehicle"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.log.contract,start_date:0
+msgid "Date when the coverage of the contract begins"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle,fuel_type:0
+msgid "Electric"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,tag_ids:0
+msgid "Tags"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+#: field:fleet.vehicle,log_contracts:0
+msgid "Contracts"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_13
+msgid "Brake Pad(s) Replacement"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.fuel:0
+#: view:fleet.vehicle.log.services:0
+msgid "Odometer Details"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,driver_id:0
+msgid "Driver"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.model.brand,image_small:0
+msgid ""
+"Small-sized photo of the brand. It is automatically resized as a 64x64px "
+"image, with aspect ratio preserved. Use this field anywhere a small image is "
+"required."
+msgstr ""
+
+#. module: fleet
+#: view:board.board:0
+msgid "Fleet Dashboard"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.vehicle.tag,name:fleet.vehicle_tag_break
+msgid "Break"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_contract_omnium
+msgid "Omnium"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.services:0
+msgid "Services Details"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_15
+msgid "Residual value (Excluding VAT)"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_7
+msgid "Alternator Replacement"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_3
+msgid "A/C Diagnosis"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_23
+msgid "Fuel Pump Replacement"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.contract:0
+msgid "Activation Cost"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.cost:0
+msgid "Cost Type"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_4
+msgid "A/C Evaporator Replacement"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+msgid "show all the costs for this vehicle"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.odometer:0
+msgid "Odometer Values Per Month"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,help:fleet.fleet_vehicle_model_act
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new model.\n"
+"              </p><p>\n"
+"                You can define several models (e.g. A3, A4) for each brand "
+"(Audi).\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,help:fleet.fleet_vehicle_act
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new vehicle. \n"
+"              </p><p>\n"
+"                You will be able to manage your fleet by keeping track of "
+"the\n"
+"                contracts, services, fixed and recurring costs, odometers "
+"and\n"
+"                fuel logs associated to each vehicle.\n"
+"            </p><p>\n"
+"                OpenERP will warn you when services or contract have to be\n"
+"                renewed.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_13
+msgid "Entry into service tax"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.log.contract,expiration_date:0
+msgid "Contract Expiration Date"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.cost:0
+msgid "Cost Subtype"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,help:fleet.open_board_fleet
+msgid ""
+"<div class=\"oe_empty_custom_dashboard\">\n"
+"                  <p>\n"
+"                    <b>Fleet dashboard is empty.</b>\n"
+"                  </p><p>\n"
+"                    To add your first report into this dashboard, go to any\n"
+"                    menu, switch to list or graph view, and click <i>'Add "
+"to\n"
+"                    Dashboard'</i> in the extended search options.\n"
+"                  </p><p>\n"
+"                    You can filter and group data before inserting into the\n"
+"                    dashboard using the search options.\n"
+"                  </p>\n"
+"              </div>\n"
+"            "
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_12
+msgid "Rent (Excluding VAT)"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle,odometer_unit:0
+msgid "Kilometers"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.fuel:0
+msgid "Vehicle Details"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.service.type,category:0
+#: field:fleet.vehicle.cost,contract_id:0
+#: selection:fleet.vehicle.cost,cost_type:0
+msgid "Contract"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.fleet_vehicle_model_brand_act
+#: model:ir.ui.menu,name:fleet.fleet_vehicle_model_brand_menu
+msgid "Model brand of Vehicle"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_10
+msgid "Battery Replacement"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.cost:0
+#: field:fleet.vehicle.cost,date:0
+#: field:fleet.vehicle.odometer,date:0
+msgid "Date"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.fleet_vehicle_act
+#: model:ir.ui.menu,name:fleet.fleet_vehicle_menu
+#: model:ir.ui.menu,name:fleet.fleet_vehicles
+msgid "Vehicles"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle,odometer_unit:0
+msgid "Miles"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.log.contract,cost_generated:0
+msgid ""
+"Costs paid at regular intervals, depending on the cost frequency. If the "
+"cost frequency is set to unique, the cost will be logged at the start date"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_17
+msgid "Emissions"
+msgstr ""
+
+#. module: fleet
+#: model:ir.model,name:fleet.model_fleet_vehicle_model
+msgid "Model of a vehicle"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,help:fleet.action_fleet_reporting_costs
+#: model:ir.actions.act_window,help:fleet.action_fleet_reporting_costs_non_effective
+msgid ""
+"<p>\n"
+"          OpenERP helps you managing the costs for your different vehicles\n"
+"          Costs are generally created from services and contract and appears "
+"here.\n"
+"        </p>\n"
+"        <p>\n"
+"          Thanks to the different filters, OpenERP can only print the "
+"effective\n"
+"          costs, sort them by type and by vehicle.\n"
+"        </p>\n"
+"      "
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,car_value:0
+msgid "Car Value"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.open_board_fleet
+#: model:ir.module.category,name:fleet.module_fleet_category
+#: model:ir.ui.menu,name:fleet.menu_fleet_dashboard
+#: model:ir.ui.menu,name:fleet.menu_fleet_reporting
+#: model:ir.ui.menu,name:fleet.menu_root
+msgid "Fleet"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_14
+msgid "Total expenses (Excluding VAT)"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.cost,odometer_id:0
+msgid "Odometer"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_45
+msgid "Tire Replacement"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.service.type:0
+msgid "Service types"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.log.fuel,purchaser_id:0
+#: field:fleet.vehicle.log.services,purchaser_id:0
+msgid "Purchaser"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_3
+msgid "Tax roll"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.model:0
+#: field:fleet.vehicle.model,vendors:0
+msgid "Vendors"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_contract_leasing
+msgid "Leasing"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.model.brand,image_medium:0
+msgid ""
+"Medium-sized logo of the brand. It is automatically resized as a 128x128px "
+"image, with aspect ratio preserved. Use this field in form views or some "
+"kanban views."
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle.log.contract,cost_frequency:0
+msgid "Weekly"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+#: view:fleet.vehicle.odometer:0
+msgid "Odometer Logs"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,acquisition_date:0
+msgid "Acquisition Date"
+msgstr ""
+
+#. module: fleet
+#: model:ir.model,name:fleet.model_fleet_vehicle_odometer
+msgid "Odometer log for a vehicle"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.cost,cost_type:0
+msgid "Category of the cost"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_5
+#: model:fleet.service.type,name:fleet.type_service_service_7
+msgid "Summer tires"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,contract_renewal_due_soon:0
+msgid "Has Contracts to renew"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_31
+msgid "Oil Change"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.model.brand,image_small:0
+msgid "Smal-sized photo"
+msgstr ""
+
+#. module: fleet
+#: model:ir.model,name:fleet.model_fleet_vehicle_model_brand
+msgid "Brand model of the vehicle"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_51
+msgid "Wheel Alignment"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.vehicle.tag,name:fleet.vehicle_tag_purchased
+msgid "Purchased"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,help:fleet.fleet_vehicle_odometer_act
+msgid ""
+"<p>\n"
+"                Here you can add various odometer entries for all vehicles.\n"
+"                You can also show odometer value for a particular vehicle "
+"using\n"
+"                the search field.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.model,brand_id:0
+#: view:fleet.vehicle.model.brand:0
+msgid "Model Brand"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+msgid "General Properties"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_21
+msgid "Exhaust Manifold Replacement"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_47
+msgid "Transmission Filter Replacement"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_10
+msgid "Replacement Vehicle"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle.log.contract,state:0
+msgid "In Progress"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle.log.contract,cost_frequency:0
+msgid "Yearly"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.model,modelname:0
+msgid "Model name"
+msgstr ""
+
+#. module: fleet
+#: view:board.board:0
+#: model:ir.actions.act_window,name:fleet.action_fleet_vehicle_costs_graph
+msgid "Costs by Month"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_18
+msgid "Touring Assistance"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,power:0
+msgid "Power (kW)"
+msgstr ""
+
+#. module: fleet
+#: code:addons/fleet/fleet.py:418
+#, python-format
+msgid "State: from '%s' to '%s'"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_2
+msgid "A/C Condenser Replacement"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_19
+msgid "Engine Coolant Replacement"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.cost:0
+msgid "Cost Details"
+msgstr ""
+
+#. module: fleet
+#: code:addons/fleet/fleet.py:410
+#, python-format
+msgid "Model: from '%s' to '%s'"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle.cost,cost_type:0
+msgid "Other"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.contract:0
+msgid "Contract details"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.vehicle.tag,name:fleet.vehicle_tag_leasing
+msgid "Employee Car"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.cost,auto_generated:0
+msgid "Automatically Generated"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle.cost,cost_type:0
+msgid "Fuel"
+msgstr ""
+
+#. module: fleet
+#: sql_constraint:fleet.vehicle.state:0
+msgid "State name already exists"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_37
+msgid "Radiator Repair"
+msgstr ""
+
+#. module: fleet
+#: model:ir.model,name:fleet.model_fleet_vehicle_log_contract
+msgid "Contract information on a vehicle"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.log.contract,days_left:0
+msgid "Warning Date"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_19
+msgid "Residual value in %"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+msgid "Additional Properties"
+msgstr ""
+
+#. module: fleet
+#: model:ir.model,name:fleet.model_fleet_vehicle_state
+msgid "fleet.vehicle.state"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.contract:0
+msgid "Contract Costs Per Month"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.fleet_vehicle_log_contract_act
+#: model:ir.ui.menu,name:fleet.fleet_vehicle_log_contract_menu
+msgid "Vehicles Contracts"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_48
+msgid "Transmission Fluid Replacement"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.model.brand,name:0
+msgid "Brand Name"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_36
+msgid "Power Steering Pump Replacement"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.cost,contract_id:0
+msgid "Contract attached to this cost"
+msgstr ""
+
+#. module: fleet
+#: code:addons/fleet/fleet.py:397
+#, python-format
+msgid "Vehicle %s has been added to the fleet!"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.contract:0
+#: view:fleet.vehicle.log.fuel:0
+#: view:fleet.vehicle.log.services:0
+msgid "Price"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.cost,odometer:0
+#: field:fleet.vehicle.odometer,value:0
+msgid "Odometer Value"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+#: view:fleet.vehicle.cost:0
+#: field:fleet.vehicle.cost,vehicle_id:0
+#: field:fleet.vehicle.odometer,vehicle_id:0
+msgid "Vehicle"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.cost,cost_ids:0
+#: view:fleet.vehicle.log.contract:0
+#: view:fleet.vehicle.log.services:0
+msgid "Included Services"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,help:fleet.action_fleet_vehicle_kanban
+msgid ""
+"<p>\n"
+"          Here are displayed vehicles for which one or more contracts need "
+"to be renewed. If you see this message, then there is no contracts to "
+"renew.\n"
+"        </p>\n"
+"      "
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_15
+msgid "Catalytic Converter Replacement"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_25
+msgid "Heater Blower Motor Replacement"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.fleet_vehicle_odometer_act
+#: model:ir.ui.menu,name:fleet.fleet_vehicle_odometer_menu
+msgid "Vehicles Odometer"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.log.contract,notes:0
+msgid "Write here all supplementary informations relative to this contract"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_29
+msgid "Ignition Coil Replacement"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_16
+msgid "Options"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_contract_repairing
+msgid "Repairing"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.action_fleet_reporting_costs
+#: model:ir.ui.menu,name:fleet.menu_fleet_reporting_costs
+msgid "Costs Analysis"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.log.contract,ins_ref:0
+msgid "Contract Reference"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.service.type,name:0
+#: field:fleet.vehicle,name:0
+#: field:fleet.vehicle.cost,name:0
+#: field:fleet.vehicle.log.contract,name:0
+#: field:fleet.vehicle.model,name:0
+#: field:fleet.vehicle.odometer,name:0
+#: field:fleet.vehicle.state,name:0
+#: field:fleet.vehicle.tag,name:0
+msgid "Name"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,doors:0
+msgid "Number of doors of the vehicle"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,transmission:0
+msgid "Transmission"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,vin_sn:0
+msgid "Chassis Number"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,color:0
+msgid "Color of the vehicle"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,help:fleet.fleet_vehicle_log_services_act
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new service entry. \n"
+"              </p><p>\n"
+"                OpenERP helps you keeping track of all the services done\n"
+"                on your vehicle. Services can be of many type: occasional\n"
+"                repair, fixed maintenance, etc.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,co2:0
+msgid "CO2 Emissions"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.contract:0
+msgid "Contract logs"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+msgid "Costs"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.action_fleet_vehicle_log_contract_graph
+msgid "Contracts Costs by Month"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,model_id:0
+#: view:fleet.vehicle.model:0
+msgid "Model"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_41
+msgid "Spark Plug Replacement"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: fleet
+#: model:ir.model,name:fleet.model_fleet_vehicle
+msgid "Information on a vehicle"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,co2:0
+msgid "CO2 emissions of the vehicle"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_53
+msgid "Windshield Wiper(s) Replacement"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.contract:0
+#: field:fleet.vehicle.log.contract,generated_cost_ids:0
+msgid "Generated Costs"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.state,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,color:0
+msgid "Color"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,help:fleet.fleet_vehicle_service_types_act
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new type of service.\n"
+"              </p><p>\n"
+"                Each service can used in contracts, as a standalone service "
+"or both.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: fleet
+#: view:board.board:0
+msgid "Services Costs"
+msgstr ""
+
+#. module: fleet
+#: code:addons/fleet/fleet.py:47
+#, python-format
+msgid "Emptying the odometer value of a vehicle is not allowed."
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,seats:0
+msgid "Number of seats of the vehicle"
+msgstr ""
+
+#. module: fleet
+#: model:res.groups,name:fleet.group_fleet_manager
+msgid "Manager"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.services:0
+msgid "Cost"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_39
+msgid "Rotate Tires"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_42
+msgid "Starter Replacement"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.cost:0
+#: field:fleet.vehicle.cost,year:0
+msgid "Year"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,license_plate:0
+msgid "License plate number of the vehicle (ie: plate number for a car)"
+msgstr ""
+
+#. module: fleet
+#: model:ir.model,name:fleet.model_fleet_contract_state
+msgid "Contains the different possible status of a leasing contract"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+msgid "show the contract for this vehicle"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.services:0
+msgid "Total"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.service.type,category:0
+msgid ""
+"Choose wheter the service refer to contracts, vehicle services or both"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.cost,cost_type:0
+msgid "For internal purpose only"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.state,sequence:0
+msgid "Used to order the note stages"
+msgstr ""
diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index 585e5ce81a4..7f704e42e5e 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -23,6 +23,7 @@ import logging
 
 from openerp.modules.module import get_module_resource
 from openerp.osv import fields, osv
+from openerp.tools.translate import _
 from openerp import tools
 
 _logger = logging.getLogger(__name__)
@@ -221,7 +222,7 @@ class hr_employee(osv.osv):
             (model, mail_group_id) = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'mail', 'group_all_employees')
             employee = self.browse(cr, uid, employee_id, context=context)
             self.pool.get('mail.group').message_post(cr, uid, [mail_group_id],
-                body='Welcome to %s! Please help him/her take the first steps with OpenERP!' % (employee.name),
+                body=_('Welcome to %s! Please help him/her take the first steps with OpenERP!') % (employee.name),
                 subtype='mail.mt_comment', context=context)
         except:
             pass # group deleted: do not push a message
diff --git a/addons/hr/html/crm_game_01.png b/addons/hr/html/crm_game_01.png
new file mode 100644
index 00000000000..a3cd109c2de
Binary files /dev/null and b/addons/hr/html/crm_game_01.png differ
diff --git a/addons/hr/html/crm_game_02.png b/addons/hr/html/crm_game_02.png
new file mode 100644
index 00000000000..1a747e1ffe8
Binary files /dev/null and b/addons/hr/html/crm_game_02.png differ
diff --git a/addons/hr/html/crm_game_03.png b/addons/hr/html/crm_game_03.png
new file mode 100644
index 00000000000..2fd14886179
Binary files /dev/null and b/addons/hr/html/crm_game_03.png differ
diff --git a/addons/hr/html/hr_appraisal.png b/addons/hr/html/hr_appraisal.png
new file mode 100644
index 00000000000..f0052bfda61
Binary files /dev/null and b/addons/hr/html/hr_appraisal.png differ
diff --git a/addons/hr/html/hr_employee.png b/addons/hr/html/hr_employee.png
new file mode 100644
index 00000000000..eff8730863f
Binary files /dev/null and b/addons/hr/html/hr_employee.png differ
diff --git a/addons/hr/html/hr_expense.png b/addons/hr/html/hr_expense.png
new file mode 100644
index 00000000000..7fbc35711e1
Binary files /dev/null and b/addons/hr/html/hr_expense.png differ
diff --git a/addons/hr/html/hr_illu_01.png b/addons/hr/html/hr_illu_01.png
new file mode 100644
index 00000000000..ad65bb9b407
Binary files /dev/null and b/addons/hr/html/hr_illu_01.png differ
diff --git a/addons/hr/html/hr_illu_02.png b/addons/hr/html/hr_illu_02.png
new file mode 100644
index 00000000000..b5416926793
Binary files /dev/null and b/addons/hr/html/hr_illu_02.png differ
diff --git a/addons/hr/html/hr_kanban.png b/addons/hr/html/hr_kanban.png
new file mode 100644
index 00000000000..c0782d6adca
Binary files /dev/null and b/addons/hr/html/hr_kanban.png differ
diff --git a/addons/hr/html/hr_recruitment.png b/addons/hr/html/hr_recruitment.png
new file mode 100644
index 00000000000..1951b54a6f2
Binary files /dev/null and b/addons/hr/html/hr_recruitment.png differ
diff --git a/addons/hr/html/hr_social.png b/addons/hr/html/hr_social.png
new file mode 100644
index 00000000000..215d4e3ba70
Binary files /dev/null and b/addons/hr/html/hr_social.png differ
diff --git a/addons/hr/html/hr_timesheet.png b/addons/hr/html/hr_timesheet.png
new file mode 100644
index 00000000000..d06c3a924ec
Binary files /dev/null and b/addons/hr/html/hr_timesheet.png differ
diff --git a/addons/hr/html/index.html b/addons/hr/html/index.html
new file mode 100644
index 00000000000..0bc3db084a4
--- /dev/null
+++ b/addons/hr/html/index.html
@@ -0,0 +1,209 @@
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan">Human Resources</h2>
+        <h3 class="oe_slogan">Manage the most important asset in your company: People</h3>
+        <div class="oe_span6">
+            <div class="oe_demo oe_picture oe_screenshot">
+                <a href="https://www.openerp.com/saas_master/demo?lang=en_US&module=hr">
+                    <img src="hr_kanban.png">
+                </a>
+                <div class="oe_demo_footer oe_centeralign">Online Demo</div>
+            </div>
+        </div>
+        <div class="oe_span6">
+            <p class='oe_mt32'>
+Get all your HR operations managed easily: knowledge sharing, recruitments, appraisals, timesheets, contracts, attendances, payroll, etc.
+           </p><p>
+		   Each need is provided by a specific app that you activate on demand.
+           </p>
+            <div class="oe_centeralign oe_websiteonly">
+                <a href="http://www.openerp.com/start" class="oe_button oe_big oe_tacky">Start your <span class="oe_emph">free</span> trial</a>
+            </div>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container oe_dark">
+    <div class="oe_row">
+         <h2 class="oe_slogan">Manage Your Employees</h2>
+         <div class="oe_span6">
+            <p class='oe_mt32'>
+Oversee all important information in your company address book. Some information are restricted to HR managers, others are public to easily find colleagues.
+			</p><p>
+Record employee contracts and get alerts when they have to be renewed.
+            </p>
+        </div>
+        <div class="oe_span6">
+            <img class="oe_picture oe_screenshot" src="hr_employee.png">
+        </div>
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row">
+         <h2 class="oe_slogan">Streamline Your Recruitment Process</h2>
+         <h3 class="oe_slogan">Index resumes, track applicants, search profiles</h3>
+        <div class="oe_span6">
+            <img class="oe_picture oe_screenshot" src="hr_recruitment.png">
+        </div>
+         <div class="oe_span6">
+            <p class='oe_mt32'>
+Post job offers and keep track of each application received. Follow applicants in your recruitment process with the smart kanban view.
+            </p><p>
+Save time by automating some communications with email templates. Resumes are indexed automatically, allowing you to easily find for specific profiles.
+            </p>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container oe_dark">
+    <div class="oe_row">
+        <h2 class="oe_slogan">Enterprise Social Network</h2>
+        <h3 class="oe_slogan">Collaborate across departments, geographies and business applications</h3>
+        <div class="oe_span6">
+            <p class='oe_mt32'>
+			Break down information silos. Share knowledge and best practices
+			amongst all employees. Follow specific people or documents and join
+			groups of interests to share expertise and documents. 
+			</p><p>
+            Interact with your collegues in real time with live chat.
+            </p>
+        </div>
+        <div class="oe_span6">
+            <img class="oe_picture oe_screenshot" src="hr_social.png">
+        </div>
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row">
+        <h2 class="oe_slogan">Track time and attendances</h2>
+        <h3 class="oe_slogan">Weekly or monthly timesheets with optional attendance tracking</h3>
+        <div class="oe_span6">
+            <img src="hr_timesheet.png" class="oe_picture oe_screenshot">
+        </div>
+        <div class="oe_span6">
+            <p class='oe_mt32'>
+Keep track of the time spent by project, client or task. It's easy to record timesheets or check attendances for each employee. Get your analytic accounting posted automatically based on time spent on your projects.
+            </p>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container oe_dark">
+    <div class="oe_row">
+        <h2 class="oe_slogan">Leaves Management</h2>
+        <h3 class="oe_slogan">Manage holidays, legal leaves and sick days</h3>
+        <div class="oe_span6">
+            <p class='oe_mt32'>
+Keep track of the vacation days accrued by each employee. Employees enter their requests (paid holidays, sick leave, etc), for managers to approve and validate. It's all done in just a few clicks. The agenda of each employee is updated accordingly.
+            </p>
+        </div>
+        <div class="oe_span6">
+            <div class="oe_bg_img oe_centered">
+                <img class="oe_picture" src="hr_illu_01.png">
+            </div>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row">
+         <h2 class="oe_slogan">Keep Track of Employee Expenses</h2>
+         <div class="oe_span6">
+             <img class="oe_picture oe_screenshot" src="hr_expense.png">
+         </div>
+         <div class="oe_span6">
+            <p class='oe_mt32'>
+Get rid of the paper work and follow employee's expenses directly in OpenERP. Don't loose time or money by controlling the full flow: expense validation, reimbursement of employees, posting in the accounting and re-invoicing to customers.
+            </p>
+        </div>
+   </div>
+</section>
+
+<section class="oe_container oe_dark">
+    <div class="oe_row">
+        <h2 class="oe_slogan">Follow Periodic Appraisals</h2>
+        <div class="oe_span6">
+            <p class='oe_mt32'>
+Set-up appraisals plans and/or surveys for your employees and watch their evolution. Define steps for interviews and OpenERP will notify managers or subordinates automatically to prepare appraisals. Keep track of the progress of your staff periodically.
+            </p>
+        </div>
+        <div class="oe_span6">
+            <img class="oe_picture oe_screenshot" src="hr_appraisal.png">
+        </div>
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row">
+         <h2 class="oe_slogan">Boost Engagement With Gamification</h2>
+         <h3 class="oe_slogan">Define clear objective and provide real time feedback</h3>
+         <div class="oe_span12">
+            <p>
+Inspire achievement with challenges, goals and rewards. Define clear objectives and provide real time feedback and tangible results. Showcase the top performers to the entire team and publicly recognize a job well done.
+            </p>
+        </div>
+        <div class="oe_span4 oe_centered">
+            <h3>Leaderboards</h3>
+            <div class="oe_row_img oe_centered">
+                <img class="oe_picture" src="crm_game_01.png">
+            </div>
+            <p>
+               Promote leaders and competition amongst sales team with performance ratios.
+            </p>
+        </div>
+        <div class="oe_span4 oe_centered">
+            <h3>Personnal Objectives</h3>
+            <div class="oe_row_img">
+                <img class="oe_picture" src="crm_game_02.png">
+            </div>
+            <p>
+                Assign clear goals to users to align them with the company objectives.
+            </p>
+        </div>
+        <div class="oe_span4 oe_centered">
+            <h3>Team Targets</h3>
+            <div class="oe_row_img oe_centered">
+                <img class="oe_picture" src="crm_game_03.png">
+            </div>
+            <p>
+                Compare revenues with forecasts and budgets in real time.
+            </p>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container oe_dark">
+    <div class="oe_row">
+        <div class="oe_span12">
+            <h2 class="oe_slogan">Many companies already enjoy it</h2>
+            <h3 class="oe_slogan">Hear what they have to say !</h3>
+        </div>
+        <div class="oe_span6">
+            <div class="oe_quote">
+                <q>
+                    OpenERP helped us to effectively record our working time and invoice
+                    our customers while keeping track of our costs.
+                </q>
+                <cite class="oe_cite oe_clearfix oe_ml64">
+                    <div class="oe_author">Wolfgang Taferner</div>
+                    <div class="oe_job"><a href="http://tapo-it.at/en/" target="_blank">Tapo</a>, Austria.</div>
+                </cite>
+            </div>
+        </div>
+        <div class="oe_span6">
+            <div class="oe_quote">
+                <q>
+                    Thanks to OpenERP, we have unified all our front-office and back-office
+                    HR applications for 300.000 users in a cost effective way.
+                </q>
+                <cite class="oe_cite oe_clearfix oe_ml64">
+                    <div class="oe_author">The Ministry of Education</div>
+                    <div class="oe_job"><a href="http://www.dgrhe.min-edu.pt/_main/" target="_blank">Government of Portugal</a></div>
+                </cite>
+            </div>
+        </div>
+    </div>
+</section>
+
diff --git a/addons/hr/process/hr_process.xml b/addons/hr/process/hr_process.xml
index edefb3be0a2..548df39905c 100644
--- a/addons/hr/process/hr_process.xml
+++ b/addons/hr/process/hr_process.xml
@@ -54,17 +54,17 @@
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Link a user to an employee&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;The Related user field on the Employee form allows to link the OpenERP user (and her rights) to the employee.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_openerpuser0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_employee0"/>
+            <field name="target_node_id" ref="process_node_openerpuser0"/>
+            <field name="source_node_id" ref="process_node_employee0"/>
         </record>
 
         <record id="process_transition_contactofemployee0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Link the employee to information&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;In the Employee form, there are different kind of information like Contact information.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_employeecontact0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_employee0"/>
+            <field name="target_node_id" ref="process_node_employeecontact0"/>
+            <field name="source_node_id" ref="process_node_employee0"/>
         </record>
 
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/hr/security/hr_security.xml b/addons/hr/security/hr_security.xml
index 8f3697f234a..4383f2d6c74 100644
--- a/addons/hr/security/hr_security.xml
+++ b/addons/hr/security/hr_security.xml
@@ -25,13 +25,13 @@
 
     <record id="hr_dept_comp_rule" model="ir.rule">
         <field name="name">Department multi company rule</field>
-        <field model="ir.model" name="model_id" ref="model_hr_department"/>
+        <field name="model_id" ref="model_hr_department"/>
         <field eval="True" name="global"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
     <record id="hr_job_comp_rule" model="ir.rule">
         <field name="name">Job multi company rule</field>
-        <field model="ir.model" name="model_id" ref="model_hr_job"/>
+        <field name="model_id" ref="model_hr_job"/>
         <field eval="True" name="global"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
diff --git a/addons/hr_attendance/security/ir_rule.xml b/addons/hr_attendance/security/ir_rule.xml
index 857fc2f54ae..0bf3b73d76e 100644
--- a/addons/hr_attendance/security/ir_rule.xml
+++ b/addons/hr_attendance/security/ir_rule.xml
@@ -9,13 +9,13 @@
 
         <record id="property_rule_attendace_manager" model="ir.rule">
             <field name="name">Manager Attendance</field>
-            <field model="ir.model" name="model_id" ref="model_hr_attendance"/>
+            <field name="model_id" ref="model_hr_attendance"/>
             <field name="domain_force">[(1,'=',1)]</field>
             <field name="groups" eval="[(4,ref('base.group_hr_manager')), (4,ref('base.group_hr_user'))]"/>
         </record>
         <record id="property_rule_attendace_employee" model="ir.rule">
             <field name="name">Employee Attendance</field>
-            <field model="ir.model" name="model_id" ref="model_hr_attendance"/>
+            <field name="model_id" ref="model_hr_attendance"/>
             <field name="domain_force">[('employee_id.user_id','=',user.id)]</field>
             <field name="groups" eval="[(4,ref('base.group_user'))]"/>
         </record>
diff --git a/addons/hr_evaluation/security/hr_evaluation_security.xml b/addons/hr_evaluation/security/hr_evaluation_security.xml
index 7c7d6f43ee3..209ca281396 100644
--- a/addons/hr_evaluation/security/hr_evaluation_security.xml
+++ b/addons/hr_evaluation/security/hr_evaluation_security.xml
@@ -31,14 +31,14 @@
 
     <record id="hr_evaluation_plan_comp_rule" model="ir.rule">
         <field name="name">Evaluation Plan multi company rule</field>
-        <field model="ir.model" name="model_id" ref="model_hr_evaluation_plan"/>
+        <field name="model_id" ref="model_hr_evaluation_plan"/>
         <field eval="True" name="global"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
     
     <record id="hr_evaluation_plan_phase_comp_rule" model="ir.rule">
         <field name="name">Evaluation Plan Phase multi company rule</field>
-        <field model="ir.model" name="model_id" ref="model_hr_evaluation_plan_phase"/>
+        <field name="model_id" ref="model_hr_evaluation_plan_phase"/>
         <field eval="True" name="global"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
diff --git a/addons/hr_expense/process/hr_expense_process.xml b/addons/hr_expense/process/hr_expense_process.xml
index 242fe6393c2..3ade1f1daca 100644
--- a/addons/hr_expense/process/hr_expense_process.xml
+++ b/addons/hr_expense/process/hr_expense_process.xml
@@ -101,48 +101,48 @@
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Confirm expense&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Expense is confirmed.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_confirmedexpenses0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_draftexpenses0"/>
+            <field name="target_node_id" ref="process_node_confirmedexpenses0"/>
+            <field name="source_node_id" ref="process_node_draftexpenses0"/>
         </record>
 
         <record id="process_transition_refuseexpense0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Refuse expense&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Expense is refused.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_refused0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_confirmedexpenses0"/>
+            <field name="target_node_id" ref="process_node_refused0"/>
+            <field name="source_node_id" ref="process_node_confirmedexpenses0"/>
         </record>
 
         <record id="process_transition_approveexpense0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Approve expense&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Expense is approved.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_approved0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_confirmedexpenses0"/>
+            <field name="target_node_id" ref="process_node_approved0"/>
+            <field name="source_node_id" ref="process_node_confirmedexpenses0"/>
         </record>
 
         <record id="process_transition_approveinvoice0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Supplier Invoice&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Creates supplier invoice.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_supplierinvoice0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_approved0"/>
+            <field name="target_node_id" ref="process_node_supplierinvoice0"/>
+            <field name="source_node_id" ref="process_node_approved0"/>
         </record>
 
         <record id="process_transition_reimburseexpense0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Reimburse expense&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;After creating invoice, reimburse expenses&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_reimbursement0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_supplierinvoice0"/>
+            <field name="target_node_id" ref="process_node_reimbursement0"/>
+            <field name="source_node_id" ref="process_node_supplierinvoice0"/>
         </record>
 
         <record id="process_transition_reimbursereinvoice0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Reinvoice&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Create Customer invoice&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_reinvoicing0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_reimbursement0"/>
+            <field name="target_node_id" ref="process_node_reinvoicing0"/>
+            <field name="source_node_id" ref="process_node_reimbursement0"/>
         </record>
 
         <!--
@@ -178,4 +178,4 @@
         </record>
 
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/hr_expense/security/ir_rule.xml b/addons/hr_expense/security/ir_rule.xml
index b9ad5778d1e..3c3cb018489 100644
--- a/addons/hr_expense/security/ir_rule.xml
+++ b/addons/hr_expense/security/ir_rule.xml
@@ -4,19 +4,19 @@
 
         <record id="property_rule_expense_manager" model="ir.rule">
             <field name="name">Manager Expense</field>
-            <field model="ir.model" name="model_id" ref="model_hr_expense_expense"/>
+            <field name="model_id" ref="model_hr_expense_expense"/>
             <field name="domain_force">[(1,'=',1)]</field>
             <field name="groups" eval="[(4,ref('base.group_hr_manager')), (4,ref('base.group_hr_user'))]"/>
         </record>
         <record id="property_rule_expense_employee" model="ir.rule">
             <field name="name">Employee Expense</field>
-            <field model="ir.model" name="model_id" ref="model_hr_expense_expense"/>
+            <field name="model_id" ref="model_hr_expense_expense"/>
             <field name="domain_force">[('employee_id.user_id','=',user.id)]</field>
             <field name="groups" eval="[(4,ref('base.group_user'))]"/>
         </record>
         <record id="hr_expense_comp_rule" model="ir.rule">
             <field name="name">Expense multi company rule</field>
-            <field model="ir.model" name="model_id" ref="model_hr_expense_expense"/>
+            <field name="model_id" ref="model_hr_expense_expense"/>
             <field eval="True" name="global"/>
             <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
         </record>
diff --git a/addons/hr_holidays/process/hr_holidays_process.xml b/addons/hr_holidays/process/hr_holidays_process.xml
index 5c10fdff749..79029e45e09 100644
--- a/addons/hr_holidays/process/hr_holidays_process.xml
+++ b/addons/hr_holidays/process/hr_holidays_process.xml
@@ -100,48 +100,48 @@
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Employee Declaration&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Document for employee&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_legaldeclaration0"/>
-            <field model="process.node" name="source_node_id" ref="hr.process_node_employee0"/>
+            <field name="target_node_id" ref="process_node_legaldeclaration0"/>
+            <field name="source_node_id" ref="hr.process_node_employee0"/>
         </record>
 
         <record id="process_transition_holidaysdefrequest0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Holidays def Request&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;If holidays available, employee can take it and fill it.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_holidaysrequest0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_holidaysdefinition0"/>
+            <field name="target_node_id" ref="process_node_holidaysrequest0"/>
+            <field name="source_node_id" ref="process_node_holidaysdefinition0"/>
         </record>
 
         <record id="process_transition_refusedrequest0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Refused Request&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Request is refused.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_refused0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_holidaysrequest0" />
+            <field name="target_node_id" ref="process_node_refused0"/>
+            <field name="source_node_id" ref="process_node_holidaysrequest0" />
         </record>
 
         <record id="process_transition_approvedrequest0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Approved Request&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Request is approved.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_approved0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_holidaysrequest0"/>
+            <field name="target_node_id" ref="process_node_approved0"/>
+            <field name="source_node_id" ref="process_node_holidaysrequest0"/>
         </record>
 
         <record id="process_transition_setholiday0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Set Holiday&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Holiday is set in the calendar.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_calendar0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_approved0"/>
+            <field name="target_node_id" ref="process_node_calendar0"/>
+            <field name="source_node_id" ref="process_node_approved0"/>
         </record>
 
         <record id="process_transition_employeeholidays0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Employee Holidays&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Employee get holidays&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_holidays0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_legaldeclaration0"/>
+            <field name="target_node_id" ref="process_node_holidays0"/>
+            <field name="source_node_id" ref="process_node_legaldeclaration0"/>
         </record>
 
         <!--
@@ -170,4 +170,4 @@
         </record>
 
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/hr_holidays/security/ir_rule.xml b/addons/hr_holidays/security/ir_rule.xml
index ff0270026a4..e2c0ffb1a6f 100644
--- a/addons/hr_holidays/security/ir_rule.xml
+++ b/addons/hr_holidays/security/ir_rule.xml
@@ -3,14 +3,14 @@
   <data>
     <record id="property_rule_holidays_employee" model="ir.rule">
         <field name="name">Employee Holidays</field>
-        <field model="ir.model" name="model_id" ref="model_hr_holidays"/>
+        <field name="model_id" ref="model_hr_holidays"/>
         <field name="domain_force">[('employee_id.user_id','=',user.id)]</field>
         <field name="groups" eval="[(4,ref('base.group_user'))]"/>
     </record>
     
     <record id="property_rule_holidays_officer" model="ir.rule">
         <field name="name">Holidays Officer</field>
-        <field model="ir.model" name="model_id" ref="model_hr_holidays"/>
+        <field name="model_id" ref="model_hr_holidays"/>
         <field name="domain_force">[(1,'=',1)]</field>
         <field name="groups" eval="[(4,ref('base.group_hr_user'))]"/>
     </record>
diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py
index e08e8db5623..e7d4cef594a 100644
--- a/addons/hr_payroll/hr_payroll.py
+++ b/addons/hr_payroll/hr_payroll.py
@@ -50,6 +50,7 @@ class hr_payroll_structure(osv.osv):
         'note': fields.text('Description'),
         'parent_id':fields.many2one('hr.payroll.structure', 'Parent'),
         'children_ids':fields.one2many('hr.payroll.structure', 'parent_id', 'Children'),
+        'rule_ids':fields.many2many('hr.salary.rule', 'hr_structure_salary_rule_rel', 'struct_id', 'rule_id', 'Salary Rules'),
     }
 
     def _get_parent(self, cr, uid, context=None):
@@ -67,6 +68,10 @@ class hr_payroll_structure(osv.osv):
         'parent_id': _get_parent,
     }
 
+    _constraints = [
+        (osv.osv._check_recursion, 'Error ! You cannot create a recursive Salary Structure.', ['parent_id']) 
+    ]
+        
     def copy(self, cr, uid, id, default=None, context=None):
         """
         Create a new record in hr_payroll_structure model from existing one
@@ -938,13 +943,6 @@ class hr_payslip_line(osv.osv):
     }
 
 
-class hr_payroll_structure(osv.osv):
-
-    _inherit = 'hr.payroll.structure'
-    _columns = {
-        'rule_ids':fields.many2many('hr.salary.rule', 'hr_structure_salary_rule_rel', 'struct_id', 'rule_id', 'Salary Rules'),
-    }
-
 
 class hr_employee(osv.osv):
     '''
diff --git a/addons/hr_payroll/report/__init__.py b/addons/hr_payroll/report/__init__.py
index 8de2f51d18f..e5b8dea8e48 100644
--- a/addons/hr_payroll/report/__init__.py
+++ b/addons/hr_payroll/report/__init__.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 #-*- coding:utf-8 -*-
 
 ##############################################################################
diff --git a/addons/hr_payroll/report/report_contribution_register.py b/addons/hr_payroll/report/report_contribution_register.py
index 39c913adada..72500a9c6c9 100644
--- a/addons/hr_payroll/report/report_contribution_register.py
+++ b/addons/hr_payroll/report/report_contribution_register.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 #-*- coding:utf-8 -*-
 
 ##############################################################################
diff --git a/addons/hr_payroll/report/report_payslip.py b/addons/hr_payroll/report/report_payslip.py
index 8ed91bd9a82..3e1dc2b1966 100644
--- a/addons/hr_payroll/report/report_payslip.py
+++ b/addons/hr_payroll/report/report_payslip.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 #-*- coding:utf-8 -*-
 
 ##############################################################################
diff --git a/addons/hr_payroll/report/report_payslip_details.py b/addons/hr_payroll/report/report_payslip_details.py
index 1251fedd826..6b561b8d688 100644
--- a/addons/hr_payroll/report/report_payslip_details.py
+++ b/addons/hr_payroll/report/report_payslip_details.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 #-*- coding:utf-8 -*-
 
 ##############################################################################
diff --git a/addons/hr_payroll/security/hr_security.xml b/addons/hr_payroll/security/hr_security.xml
index d55f1c81cce..e410eae7250 100644
--- a/addons/hr_payroll/security/hr_security.xml
+++ b/addons/hr_payroll/security/hr_security.xml
@@ -8,10 +8,10 @@
 
     <record id="property_rule_employee_payslip" model="ir.rule">
         <field name="name">Employee Payslip</field>
-        <field model="ir.model" name="model_id" ref="model_hr_payslip"/>
+        <field name="model_id" ref="model_hr_payslip"/>
         <field name="domain_force">['|', ('employee_id.user_id', '=', user.id), ('employee_id.department_id.manager_id.user_id', '=', user.id)]</field>
         <field name="groups" eval="[(4,ref('base.group_hr_user'))]"/>
     </record>
 
 </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/hr_recruitment/__openerp__.py b/addons/hr_recruitment/__openerp__.py
index 749af25e765..e83c546af04 100644
--- a/addons/hr_recruitment/__openerp__.py
+++ b/addons/hr_recruitment/__openerp__.py
@@ -57,9 +57,9 @@ You can define the different phases of interviews and easily rate the applicant
         'board_hr_recruitment_statistical_view.xml',
         'hr_recruitment_installer_view.xml',
         'res_config_view.xml',
-        'hr_recruitment_data.xml'
+        'hr_recruitment_data.xml',
     ],
-    'demo': ['hr_recruitment_demo.yml'],
+    'demo': ['hr_recruitment_demo.xml'],
     'test': ['test/recruitment_process.yml'],
     'installable': True,
     'auto_install': False,
diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index e41d80fb348..e26c96d41d9 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -196,7 +196,7 @@ class hr_applicant(base_stage, osv.Model):
         'create_date': fields.datetime('Creation Date', readonly=True, select=True),
         'write_date': fields.datetime('Update Date', readonly=True),
         'stage_id': fields.many2one ('hr.recruitment.stage', 'Stage', track_visibility='onchange',
-                        domain="['&', ('fold', '=', False), '|', ('department_id', '=', department_id), ('department_id', '=', False)]"),
+                        domain="['|', ('department_id', '=', department_id), ('department_id', '=', False)]"),
         'state': fields.related('stage_id', 'state', type="selection", store=True,
                 selection=AVAILABLE_STATES, string="Status", readonly=True,
                 help='The status is set to \'Draft\', when a case is created.\
@@ -355,10 +355,12 @@ class hr_applicant(base_stage, osv.Model):
             This override updates the document according to the email.
         """
         if custom_values is None: custom_values = {}
+        val = msg.get('from').split('<')[0]
         desc = html2plaintext(msg.get('body')) if msg.get('body') else ''
         defaults = {
             'name':  msg.get('subject') or _("No Subject"),
             'description': desc,
+            'partner_name':val,
             'email_from': msg.get('from'),
             'email_cc': msg.get('cc'),
             'user_id': False,
@@ -510,8 +512,11 @@ class hr_job(osv.osv):
 
     def _auto_init(self, cr, context=None):
         """Installation hook to create aliases for all jobs and avoid constraint errors."""
-        res = self.pool.get('mail.alias').migrate_to_alias(cr, self._name, self._table, super(hr_job,self)._auto_init,
-            self._columns['alias_id'], 'name', alias_prefix='job+', alias_defaults={'job_id': 'id'}, context=context)
+        if context is None:
+            context = {}
+        alias_context = dict(context, alias_model_name='hr.applicant')
+        res = self.pool.get('mail.alias').migrate_to_alias(cr, self._name, self._table, super(hr_job, self)._auto_init,
+            self._columns['alias_id'], 'name', alias_prefix='job+', alias_defaults={'job_id': 'id'}, context=alias_context)
         return res
 
     def create(self, cr, uid, vals, context=None):
diff --git a/addons/hr_recruitment/hr_recruitment_data.xml b/addons/hr_recruitment/hr_recruitment_data.xml
index a0b16f042bc..f3f1b3e712d 100644
--- a/addons/hr_recruitment/hr_recruitment_data.xml
+++ b/addons/hr_recruitment/hr_recruitment_data.xml
@@ -485,6 +485,18 @@
         <field name="default" eval="False"/>
         <field name="description">Applicant refused</field>
     </record>
-
+    <!-- Applicant Categories(Tag) -->
+    <record id="tag_applicant_reserve" model="hr.applicant_category">
+        <field name="name">Reserve</field>
+    </record>
+    <record id="tag_applicant_manager" model="hr.applicant_category">
+        <field name="name">Manager</field>
+    </record>
+    <record id="tag_applicant_it" model="hr.applicant_category">
+        <field name="name">IT</field>
+    </record>
+    <record id="tag_applicant_sales" model="hr.applicant_category">
+        <field name="name">Sales</field>
+    </record>
 </data>
 </openerp>
diff --git a/addons/hr_recruitment/hr_recruitment_demo.xml b/addons/hr_recruitment/hr_recruitment_demo.xml
new file mode 100644
index 00000000000..c15e0deb188
--- /dev/null
+++ b/addons/hr_recruitment/hr_recruitment_demo.xml
@@ -0,0 +1,129 @@
+<?xml version="1.0"?>
+<openerp>
+  <data noupdate="1">
+    <record id="hr_case_salesman0" model="hr.applicant">
+        <field name="name">Salesperson</field>
+        <field name="job_id" ref="hr.job_developer"/>
+        <field name="type_id" ref="degree_graduate"/>
+        <field name="categ_ids" eval="[(6,0,[ref('tag_applicant_sales')])]"/>
+        <field eval= "time.strftime('%Y-%m-01 10:35:50')" name="date"/>
+        <field name="priority">2</field>
+        <field name="partner_name">Enrique Jones</field>
+        <field name="partner_mobile">9963214587</field>
+        <field name="stage_id" ref="stage_job1"/>
+        <field eval="time.strftime('%Y-%m-15 18:15:00')" name="date_action"/>
+        <field name="title_action">Send mail regarding our interview</field>
+    </record>
+    <record id="hr_case_traineemca0" model="hr.applicant">
+        <field name="name">Trainee - MCA</field>
+        <field name="job_id" ref="hr.job_developer"/>
+        <field name="type_id" ref="degree_bac5"/>
+        <field name="categ_ids" eval="[(6,0,[ref('tag_applicant_manager')])]"/>
+        <field eval="time.strftime('%Y-%m-10 18:15:00')" name="date"/>
+        <field name="user_id" ref="base.user_demo"/>
+        <field name="priority">3</field>
+        <field name="partner_name">Marie Justine</field>
+        <field name="partner_mobile">9988774455</field>
+        <field name="stage_id" ref="stage_job4"/>
+        <field name="partner_phone">6633225</field>
+        <field eval="time.strftime('%Y-%m-10 18:15:00')" name="date_action"/>
+        <field name="title_action">Call to define real needs about training</field>
+    </record>
+    <record id="hr_case_fresher0" model="hr.applicant">
+        <field name="name">Fresher</field>
+        <field name="job_id" ref="hr.job_developer"/>
+        <field name="type_id" ref="degree_licenced"/>
+        <field name="categ_ids" eval="[(6,0,[ref('tag_applicant_it')])]"/>
+        <field eval="time.strftime('%Y-%m-10 18:15:00')" name="date"/>
+        <field name="user_id" ref="base.user_root"/>
+        <field name="priority">1</field>
+        <field name="partner_name">Jose</field>
+        <field name="stage_id" ref="stage_job3"/>
+        <field name="partner_phone">999666735</field>
+        <field eval="time.strftime('%Y-%m-5 18:15:00')" name="date_action"/>
+        <field name="title_action">Send mail regarding our interview</field>
+    </record>
+    <record id="hr_case_yrsexperienceinphp0" model="hr.applicant">
+        <field name="name">Marketing Job</field>
+        <field name="job_id" ref="hr.job_developer"/>
+        <field name="type_id" ref="degree_bac5"/>
+        <field name="categ_ids" eval="[(6,0,[ref('tag_applicant_manager')])]"/>
+        <field eval="time.strftime('%Y-%m-25 16:25:52')" name="date"/>
+        <field name="user_id" ref="base.user_root"/>
+        <field name="partner_name">John Bruno</field>
+        <field name="stage_id" ref="stage_job5"/>
+        <field eval="time.strftime('%Y-%m-24 18:15:00')" name="date_action"/>
+        <field name="title_action">Call to define real needs about training</field>
+    </record>
+    <record id="hr_case_marketingjob0" model="hr.applicant">
+        <field name="name">More than 5 yrs Experience in PHP</field>
+        <field name="job_id" ref="hr.job_developer"/>
+        <field name="type_id" ref="degree_licenced"/>
+        <field name="categ_ids" eval="[(6,0,[ref('tag_applicant_reserve')])]"/>
+        <field eval="time.strftime('%Y-%m-26 17:15:32')" name="date"/>
+        <field name="user_id" ref="base.user_demo"/>
+        <field name="partner_name">Sandra Elvis</field>
+        <field name="stage_id" ref="stage_job6"/>
+        <field eval="time.strftime('%Y-%m-20 18:15:00')" name="date_action"/>
+        <field name="title_action">Send mail regarding our interview</field>
+    </record>
+    <record id="hr_case_financejob0" model="hr.applicant">
+        <field name="name">Finance Job</field>
+        <field name="job_id" ref="hr.job_developer"/>
+        <field name="type_id" ref="degree_licenced"/>
+        <field name="categ_ids" eval="[(6,0,[ref('tag_applicant_reserve')])]"/>
+        <field eval="time.strftime('%Y-%m-26 17:39:42')" name="date"/>
+        <field name="user_id" ref="base.user_root"/>
+        <field name="priority">4</field>
+        <field name="partner_name">David Armstrong</field>
+        <field name="stage_id" ref="stage_job2"/>
+        <field name="partner_phone">33968745</field>
+        <field eval="time.strftime('%Y-%m-18 18:15:00')" name="date_action"/>
+        <field name="title_action">Send mail regarding our interview</field>
+    </record>
+    <record id="hr_case_traineemca1" model="hr.applicant">
+        <field name="name">Trainee - MCA</field>
+        <field name="job_id" ref="hr.job_developer"/>
+        <field name="type_id" ref="degree_bac5"/>
+        <field name="categ_ids" eval="[(6,0,[ref('tag_applicant_sales')])]"/>
+        <field eval="time.strftime('%Y-%m-12 17:49:19')" name="date"/>
+        <field name="partner_name">Tina Augustie</field>
+        <field name="partner_mobile">9898745745</field>
+        <field name="stage_id" ref="stage_job4"/>
+        <field name="partner_phone">6630125</field>
+        <field eval="time.strftime('%Y-%m-15 18:15:00')" name="date_action"/>
+        <field name="title_action">Send mail regarding our interview</field>
+    </record>
+    <record id="hr_case_programmer" model="hr.applicant">
+        <field name="name">Programmer</field>
+        <field name="job_id" ref="hr.job_developer"/>
+        <field name="type_id" ref="degree_bac5"/>
+        <field name="categ_ids" eval="[(6,0,[ref('tag_applicant_it')])]"/>
+        <field eval="time.strftime('%Y-%m-12 17:49:19')" name="date"/>
+        <field name="partner_name">Shane Williams</field>
+        <field name="partner_mobile">9812398524</field>
+        <field name="stage_id" ref="stage_job4"/>
+        <field name="partner_phone">6630125</field>
+        <field name="salary_expected">11000.0</field>
+        <field eval="time.strftime('%Y-%m-24 18:15:00')" name="date_action"/>
+        <field name="title_action">Send mail regarding our interview</field>
+    </record>
+    <record id="hr_case_advertisement" model="hr.applicant">
+        <field name="name">Advertisement</field>
+        <field name="job_id" ref="hr.job_developer"/>
+        <field name="type_id" ref="degree_licenced"/>
+        <field name="categ_ids" eval="[(6,0,[ref('tag_applicant_it')])]"/>
+        <field eval="time.strftime('%Y-%m-26 17:39:42')" name="date"/>
+        <field name="partner_name">David Armstrong</field>
+        <field name="partner_mobile">9988774455</field>
+        <field name="stage_id" ref="stage_job2"/>
+        <field name="salary_expected">11000.0</field>
+        <field eval="time.strftime('%Y-%m-15 18:15:00')" name="date_action"/>
+        <field name="title_action">Send mail regarding our interview</field>
+    </record>
+
+    <record id="hr.job_developer" model="hr.job">
+        <field name="survey_id" ref="survey_job_0"/>
+    </record>
+  </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/hr_recruitment/hr_recruitment_demo.yml b/addons/hr_recruitment/hr_recruitment_demo.yml
deleted file mode 100644
index 2554c690c15..00000000000
--- a/addons/hr_recruitment/hr_recruitment_demo.yml
+++ /dev/null
@@ -1,102 +0,0 @@
--
-  !record {model: hr.applicant, id: hr_case_salesman0}:
-    date: !eval time.strftime('%Y-%m-01 10:35:50')
-    type_id: degree_graduate
-    priority: '2'
-    partner_name: 'Enrique Jones'
-    partner_mobile: '9963214587'
-    job_id: hr.job_developer
-    stage_id: stage_job1
-    name: 'Salesperson'
-    partner_phone: '1236547890'
-
--
-  !record {model: hr.applicant, id: hr_case_traineemca0}:
-    date: !eval time.strftime('%Y-%m-10 18:15:00')
-    type_id: degree_bac5
-    priority: '3'
-    user_id: base.user_demo
-    partner_name: 'Marie Justine'
-    partner_mobile: '9988774455'
-    job_id: hr.job_developer
-    stage_id: stage_job4
-    name: 'Trainee - MCA'
-    partner_phone: '6633225'
--
-  !record {model: hr.applicant, id: hr_case_fresher0}:
-    date: !eval time.strftime('%Y-%m-15 16:10:00')
-    type_id: degree_licenced
-    priority: '1'
-    user_id: base.user_root
-    partner_name: 'Jose'
-    job_id: hr.job_developer
-    stage_id: stage_job3
-    name: 'Fresher'
-    partner_phone: '999666735'
--
-  !record {model: hr.applicant, id: hr_case_yrsexperienceinphp0}:
-    date: !eval time.strftime('%Y-%m-25 16:25:52')
-    job_id: hr.job_developer
-    type_id: degree_bac5
-    user_id: base.user_root
-    partner_name: 'Sandra Elvis'
-    stage_id: stage_job6
-    name: 'More than 5 yrs Experience in PHP'
--
-  !record {model: hr.applicant, id: hr_case_marketingjob0}:
-    date: !eval time.strftime('%Y-%m-26 17:15:32')
-    type_id: degree_licenced
-    user_id: base.user_demo
-    partner_name: 'John Bruno'
-    job_id: hr.job_developer
-    color: 5
-    stage_id: stage_job5
-    name: 'Marketing Job'
--
-  !record {model: hr.applicant, id: hr_case_financejob0}:
-    date: !eval time.strftime('%Y-%m-26 17:39:42')
-    type_id: degree_licenced
-    priority: '4'
-    partner_name: 'David Armstrong'
-    partner_mobile: '9966332214'
-    job_id: hr.job_developer
-    stage_id: stage_job2
-    name: 'Finance Job'
-    partner_phone: '33968745'
--
-  !record {model: hr.applicant, id: hr_case_traineemca1}:
-    date: !eval time.strftime('%Y-%m-12 17:49:19')
-    type_id: degree_bac5
-    partner_name: 'Tina Augustie'
-    partner_mobile: '9898745745'
-    job_id: hr.job_developer
-    stage_id: stage_job4
-    name: 'Trainee - MCA'
-    partner_phone: '6630125'
-
--
-  !record {model: hr.applicant, id: hr_case_programmer}:
-    date: !eval time.strftime('%Y-%m-12 17:49:19')
-    type_id: degree_bac5
-    partner_name: 'Shane Williams'
-    partner_mobile: '9812398524'
-    stage_id: stage_job4
-    name: 'Programmer'
-    partner_phone: '6630125'
-    job_id: hr.job_developer
-    department_id: hr.dep_rd
-    salary_expected: 11000.0
-
--
-  !record {model: hr.applicant, id: hr_case_advertisement}:
-    date: !eval time.strftime('%Y-%m-26 17:39:42')
-    type_id: degree_licenced
-    partner_name: 'David Armstrong'
-    job_id: hr.job_developer
-    stage_id: stage_job2
-    color: 4
-    name: 'Advertisement'
-    salary_expected: 11000.0
--
-  !record {model: hr.job, id: hr.job_developer}:
-    survey_id: hr_recruitment.survey_job_0
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 716c1cba8d5..f6fb202252c 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -263,9 +263,14 @@
                                     <i><field name="name"/></i><br/>
                                     <field name="job_id"/><br/>
                                     <t t-if="record.partner_mobile.raw_value">Mobile: <field name="partner_mobile"/><br/></t>
-                                    <t t-if="record.title_action.raw_value"><field name="title_action"/><br/></t>
-                                    <field name="date_action"/>
                                 </div>
+                                <div style="padding-left: 0.5em">
+                                    <t t-if="record.date_action.raw_value and record.date_action.raw_value lt (new Date())" t-set="red">oe_kanban_text_red</t>
+                                    <span t-attf-class="#{red || ''}"><field name="date_action"/></span>
+                                        <t t-if="record.date_action.raw_value"> : </t>
+                                        <field name="title_action"/>
+                                </div>
+                                <div style="width:240px"><field name="categ_ids"/></div>
                                 <div class="oe_kanban_right">
                                     <t t-set="priority" t-value="record.priority.raw_value || 5"/>
                                     <a type="object" name="set_priority" args="['3']" t-if="priority gt 3">
@@ -285,7 +290,6 @@
                                 </div>
                                 <div class="oe_kanban_footer_left" style="margin-top:5px;">
                                     <t t-raw="record.message_summary.raw_value"/>
-                                    <field name="categ_ids"/>
                                 </div>
                             </div>
                             <div class="oe_clear"></div>
diff --git a/addons/hr_recruitment/security/hr_recruitment_security.xml b/addons/hr_recruitment/security/hr_recruitment_security.xml
index a85643b62ec..42dd53cda35 100644
--- a/addons/hr_recruitment/security/hr_recruitment_security.xml
+++ b/addons/hr_recruitment/security/hr_recruitment_security.xml
@@ -4,7 +4,7 @@
 
     <record id="hr_applicant_comp_rule" model="ir.rule">
         <field name="name">Applicant multi company rule</field>
-        <field model="ir.model" name="model_id" ref="model_hr_applicant"/>
+        <field name="model_id" ref="model_hr_applicant"/>
         <field eval="True" name="global"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
diff --git a/addons/hr_timesheet/__openerp__.py b/addons/hr_timesheet/__openerp__.py
index 3c026ac2d07..f2e589d969e 100644
--- a/addons/hr_timesheet/__openerp__.py
+++ b/addons/hr_timesheet/__openerp__.py
@@ -21,7 +21,7 @@
 
 
 {
-    'name': 'Timesheets',
+    'name': 'Time Tracking',
     'version': '1.0',
     'category': 'Human Resources',
     'sequence': 23,
diff --git a/addons/hr_timesheet/hr_timesheet.py b/addons/hr_timesheet/hr_timesheet.py
index 22dfb7b9552..f49ad05f7a9 100644
--- a/addons/hr_timesheet/hr_timesheet.py
+++ b/addons/hr_timesheet/hr_timesheet.py
@@ -37,8 +37,11 @@ class hr_employee(osv.osv):
     def _getAnalyticJournal(self, cr, uid, context=None):
         md = self.pool.get('ir.model.data')
         try:
-            result = md.get_object_reference(cr, uid, 'hr_timesheet', 'analytic_journal')
-            return result[1]
+            dummy, res_id = md.get_object_reference(cr, uid, 'hr_timesheet', 'analytic_journal')
+            #search on id found in result to check if current user has read access right
+            check_right = self.pool.get('account.analytic.journal').search(cr, uid, [('id', '=', res_id)], context=context)
+            if check_right:
+                return res_id
         except ValueError:
             pass
         return False
@@ -46,8 +49,11 @@ class hr_employee(osv.osv):
     def _getEmployeeProduct(self, cr, uid, context=None):
         md = self.pool.get('ir.model.data')
         try:
-            result = md.get_object_reference(cr, uid, 'product', 'product_product_consultant')
-            return result[1]
+            dummy, res_id = md.get_object_reference(cr, uid, 'product', 'product_product_consultant')
+            #search on id found in result to check if current user has read access right
+            check_right = self.pool.get('product.template').search(cr, uid, [('id', '=', res_id)], context=context)
+            if check_right:
+                return res_id
         except ValueError:
             pass
         return False
diff --git a/addons/hr_timesheet/hr_timesheet_demo.xml b/addons/hr_timesheet/hr_timesheet_demo.xml
index b6773dbbdd6..2abea3ada67 100644
--- a/addons/hr_timesheet/hr_timesheet_demo.xml
+++ b/addons/hr_timesheet/hr_timesheet_demo.xml
@@ -34,7 +34,7 @@
             <field name="product_uom_id" ref="product.product_uom_hour"/>
             <field name="account_id" ref="account.analytic_administratif"></field>
             <field eval="-60.00" name="amount"/>
-            <field name="general_account_id" model="account.account" ref="account.a_expense"/>
+            <field name="general_account_id" ref="account.a_expense"/>
             <field name="journal_id" ref="analytic_journal"/>
         </record>
 
@@ -47,7 +47,7 @@
             <field name="product_uom_id" ref="product.product_uom_hour"/>
             <field name="account_id" ref="account.analytic_administratif"></field>
             <field eval="-30.00" name="amount"/>
-            <field name="general_account_id" model="account.account" ref="account.a_expense"/>
+            <field name="general_account_id" ref="account.a_expense"/>
             <field name="journal_id" ref="analytic_journal"/>
         </record>
 
@@ -60,7 +60,7 @@
             <field name="product_uom_id" ref="product.product_uom_hour"/>
             <field name="account_id" ref="account.analytic_administratif"></field>
             <field eval="-90.00" name="amount"/>
-            <field name="general_account_id" model="account.account" ref="account.a_expense"/>
+            <field name="general_account_id" ref="account.a_expense"/>
             <field name="journal_id" ref="analytic_journal"/>
         </record>
 
@@ -73,7 +73,7 @@
             <field name="product_uom_id" ref="product.product_uom_hour"/>
             <field name="account_id" ref="account.analytic_administratif"></field>
             <field eval="-30.00" name="amount"/>
-            <field name="general_account_id" model="account.account" ref="account.a_expense"/>
+            <field name="general_account_id" ref="account.a_expense"/>
             <field name="journal_id" ref="analytic_journal"/>
         </record>
 
@@ -86,7 +86,7 @@
             <field name="product_uom_id" ref="product.product_uom_hour"/>
             <field name="account_id" ref="account.analytic_administratif"></field>
             <field eval="-30.00" name="amount"/>
-            <field name="general_account_id" model="account.account" ref="account.a_expense"/>
+            <field name="general_account_id" ref="account.a_expense"/>
             <field name="journal_id" ref="analytic_journal"/>
         </record>
 
diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml
index a80a0b2f151..5435ba45182 100644
--- a/addons/hr_timesheet/hr_timesheet_view.xml
+++ b/addons/hr_timesheet/hr_timesheet_view.xml
@@ -9,7 +9,7 @@
                 <tree editable="top" string="Timesheet Activities">                  
                     <field name="date" on_change="on_change_date(date)"/>
                     <field name="user_id" on_change="on_change_user_id(user_id)" required="1" options='{"no_open": True}'
-                        context="{'default_groups_ref': [base.group_user']}"/>
+                        context="{'default_groups_ref': ['base.group_user']}"/>
                     <field name="name"/>
                     <field domain="[('type','=','normal'),('use_timesheets','=',1)]" name="account_id" context="{'default_use_timesheets': 1, 'default_type': 'contract'}"/>
                     <field name="unit_amount" string="Duration" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)" sum="Total time" widget="float_time"/>
@@ -31,7 +31,7 @@
                         <group>
                             <field name="name"/>
                             <field name="user_id" on_change="on_change_user_id(user_id)" required="1"
-                                context="{'default_groups_ref': [base.group_user']}"/>
+                                context="{'default_groups_ref': ['base.group_user']}"/>
                         </group>
                         <group>
                             <field name="date" on_change="on_change_date(date)"/>
diff --git a/addons/hr_timesheet/security/hr_timesheet_security.xml b/addons/hr_timesheet/security/hr_timesheet_security.xml
index d7cf34fa1fd..c5549d1ed27 100644
--- a/addons/hr_timesheet/security/hr_timesheet_security.xml
+++ b/addons/hr_timesheet/security/hr_timesheet_security.xml
@@ -4,14 +4,14 @@
 
         <record id="property_rule_timesheet_manager" model="ir.rule">
             <field name="name">Manager HR Analytic Timesheet</field>
-            <field model="ir.model" name="model_id" ref="model_hr_analytic_timesheet"/>
+            <field name="model_id" ref="model_hr_analytic_timesheet"/>
             <field name="domain_force">[(1,'=',1)]</field>
             <field name="groups" eval="[(4,ref('base.group_hr_manager')), (4,ref('base.group_hr_user'))]"/>
         </record>
 
         <record id="property_rule_timesheet_employee" model="ir.rule">
             <field name="name">Employee HR Analytic Timesheet</field>
-            <field model="ir.model" name="model_id" ref="model_hr_analytic_timesheet"/>
+            <field name="model_id" ref="model_hr_analytic_timesheet"/>
             <field name="domain_force">[('user_id', '=', user.id)]</field>
             <field name="groups" eval="[(4,ref('base.group_user'))]"/>
         </record>
diff --git a/addons/hr_timesheet_invoice/test/test_hr_timesheet_invoice.yml b/addons/hr_timesheet_invoice/test/test_hr_timesheet_invoice.yml
index 0896cf7d517..05326bb19c1 100644
--- a/addons/hr_timesheet_invoice/test/test_hr_timesheet_invoice.yml
+++ b/addons/hr_timesheet_invoice/test/test_hr_timesheet_invoice.yml
@@ -102,17 +102,4 @@
     assert aline.invoice_id, "Invoice created, but analytic line wasn't updated."
     assert aline.invoice_id == invoice_id, "Invoice doesn't match the one at analytic line"
     assert invoice_id.amount_untaxed == 187.5, "Invoice amount mismatch: %s" % invoice_id.amount_untaxed
-    assert invoice_id.amount_tax == 50, "Invoice tax mismatch: %s" %  invoice_id.amount_tax
--
-  I create final invoice for this analytic account.
--
-  !record {model: hr.timesheet.invoice.create.final, id: hr_timesheet_invoice_create_final_0}:
-    date: 1
-    name: 1
-    price: 1
-    time: 1
--
-  I click on "Create Invoice" button to create Invoice and validate the invoice.
--
-  !python {model: hr.timesheet.invoice.create.final}: |
-    res = self.do_create(cr, uid, [ref("hr_timesheet_invoice_create_final_0")], {"active_ids": [ref("account.analytic_agrolait")]})
+    assert invoice_id.amount_tax == 50, "Invoice tax mismatch: %s" %  invoice_id.amount_tax
\ No newline at end of file
diff --git a/addons/hr_timesheet_invoice/test/test_hr_timesheet_invoice_no_prod_tax.yml b/addons/hr_timesheet_invoice/test/test_hr_timesheet_invoice_no_prod_tax.yml
index d00963073f0..88675f3042f 100644
--- a/addons/hr_timesheet_invoice/test/test_hr_timesheet_invoice_no_prod_tax.yml
+++ b/addons/hr_timesheet_invoice/test/test_hr_timesheet_invoice_no_prod_tax.yml
@@ -101,17 +101,4 @@
     assert aline.invoice_id, "Invoice created, but analytic line wasn't updated."
     assert aline.invoice_id == invoice_id, "Invoice doesn't match the one at analytic line"
     assert invoice_id.amount_untaxed == 187.5, "Invoice amount mismatch: %s" % invoice_id.amount_untaxed
-    assert invoice_id.amount_tax == 40, "Invoice tax mismatch: %s" %  invoice_id.amount_tax
--
-  I create final invoice for this analytic account.
--
-  !record {model: hr.timesheet.invoice.create.final, id: hr_timesheet_invoice_create_final_0}:
-    date: 1
-    name: 1
-    price: 1
-    time: 1
--
-  I click on "Create Invoice" button to create Invoice and validate the invoice.
--
-  !python {model: hr.timesheet.invoice.create.final}: |
-    res = self.do_create(cr, uid, [ref("hr_timesheet_invoice_create_final_0")], {"active_ids": [ref("account.analytic_agrolait")]})
+    assert invoice_id.amount_tax == 40, "Invoice tax mismatch: %s" %  invoice_id.amount_tax
\ No newline at end of file
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
index 156732ba33d..70f94a4f57e 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
@@ -289,7 +289,7 @@ class hr_timesheet_line(osv.osv):
         return ts_line_ids
 
     _columns = {
-        'sheet_id': fields.function(_sheet, string='Sheet',
+        'sheet_id': fields.function(_sheet, string='Sheet', select="1",
             type='many2one', relation='hr_timesheet_sheet.sheet', ondelete="cascade",
             store={
                     'hr_timesheet_sheet.sheet': (_get_hr_timesheet_sheet, ['employee_id', 'date_from', 'date_to'], 10),
@@ -473,12 +473,8 @@ class hr_timesheet_sheet_sheet_day(osv.osv):
                                 0.0 as total_attendance
                             from
                                 hr_analytic_timesheet hrt
-                                left join (account_analytic_line l
-                                    LEFT JOIN hr_timesheet_sheet_sheet s
-                                    ON (s.date_to >= l.date
-                                        AND s.date_from <= l.date
-                                        AND s.user_id = l.user_id))
-                                    on (l.id = hrt.line_id)
+                                JOIN account_analytic_line l ON l.id = hrt.line_id
+                                LEFT JOIN hr_timesheet_sheet_sheet s ON s.id = hrt.sheet_id
                             group by l.date::date, s.id
                         ) union (
                             select
@@ -489,14 +485,8 @@ class hr_timesheet_sheet_sheet_day(osv.osv):
                                 SUM(((EXTRACT(hour FROM a.name) * 60) + EXTRACT(minute FROM a.name)) * (CASE WHEN a.action = 'sign_in' THEN -1 ELSE 1 END)) as total_attendance
                             from
                                 hr_attendance a
-                                LEFT JOIN (hr_timesheet_sheet_sheet s
-                                    LEFT JOIN resource_resource r
-                                        LEFT JOIN hr_employee e
-                                        ON (e.resource_id = r.id)
-                                    ON (s.user_id = r.user_id))
-                                ON (a.employee_id = e.id
-                                    AND s.date_to >= date_trunc('day',a.name)
-                                    AND s.date_from <= a.name)
+                                LEFT JOIN hr_timesheet_sheet_sheet s
+                                ON s.id = a.sheet_id
                             WHERE action in ('sign_in', 'sign_out')
                             group by a.name::date, s.id
                         )) AS foo
diff --git a/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml b/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml
index 628cc2097ae..7ebec9ab228 100644
--- a/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml
+++ b/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml
@@ -100,24 +100,24 @@
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Sign in/out&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;The employee signs in and signs out.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_drafttimesheetsheet0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_attendance0"/>
+            <field name="target_node_id" ref="process_node_drafttimesheetsheet0"/>
+            <field name="source_node_id" ref="process_node_attendance0"/>
         </record>
 
         <record id="process_transition_timesheetdraft0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Service&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;The timesheet line represents the time spent by the employee on a specific service provided.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_drafttimesheetsheet0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_timesheet0"/>
+            <field name="target_node_id" ref="process_node_drafttimesheetsheet0"/>
+            <field name="source_node_id" ref="process_node_timesheet0"/>
         </record>
 
         <record id="process_transition_confirmtimesheet0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Confirmation&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;The employee periodically confirms his own timesheets.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_confirmedtimesheet0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_drafttimesheetsheet0"/>
+            <field name="target_node_id" ref="process_node_confirmedtimesheet0"/>
+            <field name="source_node_id" ref="process_node_drafttimesheetsheet0"/>
             <field eval="[(6,0,[ref('hr_timesheet_sheet.t1')])]" name="transition_ids"/>
         </record>
 
@@ -125,24 +125,24 @@
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Validation&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;The project manager validates the timesheets.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_validatedtimesheet0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_confirmedtimesheet0"/>
+            <field name="target_node_id" ref="process_node_validatedtimesheet0"/>
+            <field name="source_node_id" ref="process_node_confirmedtimesheet0"/>
         </record>
 
         <record id="process_transition_invoiceontimesheet0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Billing&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;The invoice is created based on the timesheet.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_invoiceonwork0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_confirmedtimesheet0"/>
+            <field name="target_node_id" ref="process_node_invoiceonwork0"/>
+            <field name="source_node_id" ref="process_node_confirmedtimesheet0"/>
         </record>
 
         <record id="process_transition_tasktimesheet0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Task timesheet&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Moves task entry into the timesheet line&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_timesheet0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_workontask0"/>
+            <field name="target_node_id" ref="process_node_timesheet0"/>
+            <field name="source_node_id" ref="process_node_workontask0"/>
          </record>
 
         <!--
diff --git a/addons/hr_timesheet_sheet/test/test_hr_timesheet_sheet.yml b/addons/hr_timesheet_sheet/test/test_hr_timesheet_sheet.yml
index 0cffabd0721..77f722ecdc2 100644
--- a/addons/hr_timesheet_sheet/test/test_hr_timesheet_sheet.yml
+++ b/addons/hr_timesheet_sheet/test/test_hr_timesheet_sheet.yml
@@ -13,11 +13,11 @@
     product_id: product.product_product_consultant
     journal_id: hr_timesheet.analytic_journal
 -
-  I create a timesheet for employee "Quentin Paolinon".
+  I create a timesheet for employee "Quentin Paolino".
 -
   !record {model: hr_timesheet_sheet.sheet, id: hr_timesheet_sheet_sheet_deddk0}:
     date_from: !eval time.strftime('%Y-%m-01')
-    name: Quentin Paolinon
+    name: Quentin Paolino
     state: new
     user_id: base.user_demo
     employee_id: 'hr.employee_qdp'
@@ -60,10 +60,12 @@
 -
   !python {model: hr_timesheet_sheet.sheet}: |
     uid = ref('base.user_root')
+    from openerp import netsvc
     try:
         self.button_confirm(cr, uid, [ref('hr_timesheet_sheet_sheet_deddk0')], {"active_ids":
           [ref("hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form")],"active_id": ref("hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form"),
           })
+        assert True, "The validation of the timesheet was unexpectedly accepted despite the 2:30 hours of difference"
     except:
         pass
 -
@@ -86,7 +88,7 @@
   !record {model: res.company, id: base.main_company}:
     timesheet_max_difference: 1.00
 -
-  I tried again to confirm the timesheet after modification.
+  I try again to confirm the timesheet after modification.
 -
   !python {model: hr_timesheet_sheet.sheet}: |
         uid = ref('base.user_root')
diff --git a/addons/im/static/src/css/im.css b/addons/im/static/src/css/im.css
index 2f3e7dd58bb..269d411d416 100644
--- a/addons/im/static/src/css/im.css
+++ b/addons/im/static/src/css/im.css
@@ -6,6 +6,12 @@
     border-left: 1px solid #AEB9BD;
 }
 
+@media print {
+    .openerp .oe_im, .openerp .oe_im_chatview {
+        visibility: hidden;
+    }
+}
+
 /* button */
 
 .openerp .oe_topbar_imbutton {
diff --git a/addons/l10n_ar/__init__.py b/addons/l10n_ar/__init__.py
index 92da5dbf966..25e7e337165 100644
--- a/addons/l10n_ar/__init__.py
+++ b/addons/l10n_ar/__init__.py
@@ -23,7 +23,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
 ##############################################################################
 
diff --git a/addons/l10n_bo/__init__.py b/addons/l10n_bo/__init__.py
index 92da5dbf966..25e7e337165 100644
--- a/addons/l10n_bo/__init__.py
+++ b/addons/l10n_bo/__init__.py
@@ -23,7 +23,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
 ##############################################################################
 
diff --git a/addons/l10n_ch/__init__.py b/addons/l10n_ch/__init__.py
index f0b006c2b32..12d42707679 100644
--- a/addons/l10n_ch/__init__.py
+++ b/addons/l10n_ch/__init__.py
@@ -1,8 +1,11 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
 ##############################################################################
 #
 #    Author: Nicolas Bessi. Copyright Camptocamp SA
-#    Donors: Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA
+#    Financial contributors: Hasa SA, Open Net SA,
+#                            Prisme Solutions Informatique SA, Quod SA
+#
+#    Translation contributors: brain-tec AG, Agile Business Group
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
diff --git a/addons/l10n_ch/__openerp__.py b/addons/l10n_ch/__openerp__.py
index e068c7365a1..8960224891d 100644
--- a/addons/l10n_ch/__openerp__.py
+++ b/addons/l10n_ch/__openerp__.py
@@ -1,8 +1,11 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
 ##############################################################################
 #
 #    Author: Nicolas Bessi. Copyright Camptocamp SA
-#    Donors: Hasa SA, Open Net SA and Prisme Solutions Informatique SA
+#    Financial contributors: Hasa SA, Open Net SA,
+#                            Prisme Solutions Informatique SA, Quod SA
+#
+#    Translation contributors: brain-tec AG, Agile Business Group
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -21,29 +24,29 @@
 
 {'name': 'Switzerland - Accounting',
  'description':  """
-Swiss localization :
-====================
-**Multilang swiss STERCHI account chart and taxes**
- **Author:** Camptocamp SA
+ Swiss localization :
+ ====================
+ **Multilang swiss STERCHI account chart and taxes**
+  **Author:** Camptocamp SA
 
- **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA
+  **Financial contributors:** Prisme Solutions Informatique SA, Quod SA
 
- **Translators:** brain-tec AG, Agile Business Group
+  **Translation contributors:** brain-tec AG, Agile Business Group
 
-**This release will introduce major changes to l10n_ch.**
+ **This release will introduce major changes to l10n_ch.**
 
-Due to important refactoring needs and the Switzerland adoption of new international payment standard during 2013-2014. We have reorganised the swiss localization addons this way:
+ Due to important refactoring needs and the Switzerland adoption of new international payment standard during 2013-2014. We have reorganised the swiss localization addons this way:
 
-- **l10n_ch**: Multilang swiss STERCHI account chart and taxes (official addon)
-- **l10n_ch_base_bank**: Technical module that introduces a new and simplified version of bank type management
-- **l10n_ch_bank**: List of swiss banks
-- **l10n_ch_zip**: List of swiss postal zip
-- **l10n_ch_dta**: Support of dta payment protocol (will be deprecated end 2014)
-- **l10n_ch_payment_slip**: Support of ESR/BVR payment slip report and reconciliation. Report refactored with easy element positioning.
-- **l10n_ch_sepa**: Alpha implementation of PostFinance SEPA/PAIN support will be completed during 2013/2014
+ - **l10n_ch**: Multilang swiss STERCHI account chart and taxes (official addon)
+ - **l10n_ch_base_bank**: Technical module that introduces a new and simplified version of bank type management
+ - **l10n_ch_bank**: List of swiss banks
+ - **l10n_ch_zip**: List of swiss postal zip
+ - **l10n_ch_dta**: Support of dta payment protocol (will be deprecated end 2014)
+ - **l10n_ch_payment_slip**: Support of ESR/BVR payment slip report and reconciliation. Report refactored with easy element positioning.
+ - **l10n_ch_sepa**: Alpha implementation of PostFinance SEPA/PAIN support will be completed during 2013/2014
 
-The modules will be soon available on OpenERP swiss localization on launchpad:
-https://launchpad.net/openerp-swiss-localization
+ The modules will be soon available on OpenERP swiss localization on launchpad:
+ https://launchpad.net/openerp-swiss-localization
 """,
  'version': '7.0',
  'author': 'Camptocamp',
diff --git a/addons/l10n_ch/account_wizard.py b/addons/l10n_ch/account_wizard.py
index e0a9e84b90a..4b985c09b76 100644
--- a/addons/l10n_ch/account_wizard.py
+++ b/addons/l10n_ch/account_wizard.py
@@ -1,8 +1,11 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
 ##############################################################################
 #
 #    Author: Nicolas Bessi. Copyright Camptocamp SA
-#    Donors: Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA
+#    Financial contributors: Hasa SA, Open Net SA,
+#                            Prisme Solutions Informatique SA, Quod SA
+#
+#    Translation contributors: brain-tec AG, Agile Business Group
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
diff --git a/addons/l10n_cl/__init__.py b/addons/l10n_cl/__init__.py
index 92da5dbf966..25e7e337165 100644
--- a/addons/l10n_cl/__init__.py
+++ b/addons/l10n_cl/__init__.py
@@ -23,7 +23,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
 ##############################################################################
 
diff --git a/addons/l10n_cr/l10n_cr_base_data.xml b/addons/l10n_cr/l10n_cr_base_data.xml
index 2268ecb37ed..28674185a85 100644
--- a/addons/l10n_cr/l10n_cr_base_data.xml
+++ b/addons/l10n_cr/l10n_cr_base_data.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
 
@@ -8,38 +7,38 @@
         -->
         <record id="state_SJ" model="res.country.state">
             <field name="code">SJ</field>
-            <field name="name">San José</field>
-            <field model="res.country" name="country_id" ref="base.cr"/>
+            <field name="name">San Jos&#233;</field>
+            <field name="country_id" ref="base.cr"/>
         </record>
         <record id="state_A" model="res.country.state">
             <field name="code">A</field>
             <field name="name">Alajuela</field>
-            <field model="res.country" name="country_id" ref="base.cr"/>
+            <field name="country_id" ref="base.cr"/>
         </record>
         <record id="state_H" model="res.country.state">
             <field name="code">H</field>
             <field name="name">Heredia</field>
-            <field model="res.country" name="country_id" ref="base.cr"/>
+            <field name="country_id" ref="base.cr"/>
         </record>
         <record id="state_C" model="res.country.state">
             <field name="code">C</field>
             <field name="name">Cartago</field>
-            <field model="res.country" name="country_id" ref="base.cr"/>
+            <field name="country_id" ref="base.cr"/>
         </record>
         <record id="state_P" model="res.country.state">
             <field name="code">P</field>
             <field name="name">Puntarenas</field>
-            <field model="res.country" name="country_id" ref="base.cr"/>
+            <field name="country_id" ref="base.cr"/>
         </record>
         <record id="state_G" model="res.country.state">
             <field name="code">G</field>
             <field name="name">Guanacaste</field>
-            <field model="res.country" name="country_id" ref="base.cr"/>
+            <field name="country_id" ref="base.cr"/>
         </record>
         <record id="state_L" model="res.country.state">
             <field name="code">L</field>
-            <field name="name">Limón</field>
-            <field model="res.country" name="country_id" ref="base.cr"/>
+            <field name="name">Lim&#243;n</field>
+            <field name="country_id" ref="base.cr"/>
         </record>
         <!--
         Resource: res.partner.title
@@ -71,7 +70,7 @@
             <field name="domain">contact</field>
         </record>
         <record id="res_partner_title_sal" model="res.partner.title">
-            <field name="name">Sociedad Anónima Laboral</field>
+            <field name="name">Sociedad An&#243;nima Laboral</field>
             <field name="shortcut">S.A.L.</field>
             <field name="domain">partner</field>
         </record>
@@ -136,4 +135,4 @@
             <field name="domain">contact</field>
         </record>
     </data>
-</openerp>
+</openerp>
\ No newline at end of file
diff --git a/addons/l10n_es/__openerp__.py b/addons/l10n_es/__openerp__.py
index 2264988fd99..9dd201c20cc 100644
--- a/addons/l10n_es/__openerp__.py
+++ b/addons/l10n_es/__openerp__.py
@@ -4,57 +4,60 @@
 #    OpenERP, Open Source Management Solution
 #    Copyright (c) 2008-2010 Zikzakmedia S.L. (http://zikzakmedia.com) All Rights Reserved.
 #                            Jordi Esteve <jesteve@zikzakmedia.com>
+#    Copyright (c) 2012-2013, Grupo OPENTIA (<http://opentia.com>) Registered EU Trademark.
+#                            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 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/>.
 #
 ##############################################################################
 
 {
-    'name': 'Spanish - Accounting (PGCE 2008)',
-    'version': '3.0',
-    'author': 'Spanish Localization Team',
-    'website': 'https://launchpad.net/openerp-spain',
-    'category': 'Localization/Account Charts',
-    'description': """
+    "name" : "Spanish Charts of Accounts (PGCE 2008)",
+    "version" : "3.0",
+    "author" : "Spanish Localization Team",
+    'website' : 'https://launchpad.net/openerp-spain',
+    "category" : "Localization/Account Charts",
+    "description": """
 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
     * Defines templates for sale and purchase VAT
     * Defines tax code templates
-
-**Note:** You should install the l10n_ES_account_balance_report module for yearly
-      account reporting (balance, profit & losses).
 """,
-    'license': 'GPL-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',
-        'l10n_es_wizard.xml'
+    "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",
+        "l10n_es_wizard.xml",
     ],
-    'demo': [],
+    "demo" : [],
     'auto_install': False,
-    'installable': True,
+    "installable": True,
     'images': ['images/config_chart_l10n_es.jpeg','images/l10n_es_chart.jpeg'],
 }
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_es/account_chart.xml b/addons/l10n_es/account_chart.xml
index 8ffabd17fe7..1bc63f6419f 100644
--- a/addons/l10n_es/account_chart.xml
+++ b/addons/l10n_es/account_chart.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data noupdate="1">
+    <data noupdate="0">
 
     <!-- Tipos de cuenta para PGCE y PGCE PYMES -->
 
@@ -2722,7 +2722,7 @@
             <field name="reconcile" eval="False"/>
             <field name="parent_id" ref="pgc_281"/>
             <field name="type">view</field>
-            <field name="name">Amortización acumulada de otras instaciones</field>
+            <field name="name">Amortización acumulada de otras instalaciones</field>
             <field name="user_type" ref="inmo"/>
         </record>
         <record id="pgc_2815_child" model="account.account.template">
@@ -2730,7 +2730,7 @@
             <field name="reconcile" eval="False"/>
             <field name="parent_id" ref="pgc_2815"/>
             <field name="type">other</field>
-            <field name="name">Amortización acumulada de otras instaciones</field>
+            <field name="name">Amortización acumulada de otras instalaciones</field>
             <field name="user_type" ref="inmo"/>
         </record>
         <record id="pgc_2816" model="account.account.template">
@@ -4743,7 +4743,7 @@
         </record>
         <record id="pgc_460_child" model="account.account.template">
             <field name="code">460</field>
-            <field name="reconcile" eval="False"/>
+            <field name="reconcile" eval="True"/>
             <field name="parent_id" ref="pgc_460"/>
             <field name="type">other</field>
             <field name="name">Anticipos de remuneraciones</field>
@@ -4759,7 +4759,7 @@
         </record>
         <record id="pgc_465_child" model="account.account.template">
             <field name="code">465</field>
-            <field name="reconcile" eval="False"/>
+            <field name="reconcile" eval="True"/>
             <field name="parent_id" ref="pgc_465"/>
             <field name="type">other</field>
             <field name="name">Remuneraciones pendientes de pago</field>
@@ -4775,7 +4775,7 @@
         </record>
         <record id="pgc_466_child" model="account.account.template">
             <field name="code">466</field>
-            <field name="reconcile" eval="False"/>
+            <field name="reconcile" eval="True"/>
             <field name="parent_id" ref="pgc_466"/>
             <field name="type">other</field>
             <field name="name">Remuneraciones mediante sistemas de aportación definida pendientes de pago</field>
@@ -4805,8 +4805,8 @@
             <field name="name">Hacienda Pública, deudora por IVA</field>
             <field name="user_type" ref="tax"/>
         </record>
-        <record id="pgc_4700_child" model="account.account.template">
-            <field name="code">4700</field>
+        <record id="pgc_470000" model="account.account.template">
+            <field name="code">470000</field>
             <field name="reconcile" eval="True"/>
             <field name="parent_id" ref="pgc_4700"/>
             <field name="type">receivable</field>
@@ -4869,6 +4869,14 @@
             <field name="name">Hacienda Pública, IVA soportado</field>
             <field name="user_type" ref="tax"/>
         </record>
+        <record id="pgc_472000" model="account.account.template">
+            <field name="code">472000</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_472"/>
+            <field name="type">other</field>
+            <field name="name">Hacienda Pública. IVA soportado</field>
+            <field name="user_type" ref="tax"/>
+        </record>
         <record id="pgc_473" model="account.account.template">
             <field name="code">473</field>
             <field name="reconcile" eval="False"/>
@@ -4877,6 +4885,14 @@
             <field name="name">Hacienda Pública, retenciones y pagos a cuenta</field>
             <field name="user_type" ref="tax"/>
         </record>
+        <record id="pgc_473000" model="account.account.template">
+            <field name="code">473000</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_473"/>
+            <field name="type">other</field>
+            <field name="name">Hacienda Pública, retenciones y pagos a cuenta</field>
+            <field name="user_type" ref="tax"/>
+        </record>
         <record id="pgc_474" model="account.account.template">
             <field name="code">474</field>
             <field name="reconcile" eval="False"/>
@@ -4949,8 +4965,8 @@
             <field name="name">Hacienda Pública, acreedora por IVA</field>
             <field name="user_type" ref="tax"/>
         </record>
-        <record id="pgc_4750_child" model="account.account.template">
-            <field name="code">4750</field>
+        <record id="pgc_475000" model="account.account.template">
+            <field name="code">475000</field>
             <field name="reconcile" eval="True"/>
             <field name="parent_id" ref="pgc_4750"/>
             <field name="type">payable</field>
@@ -4965,8 +4981,8 @@
             <field name="name">Hacienda Pública, acreedora por retenciones practicadas</field>
             <field name="user_type" ref="tax"/>
         </record>
-        <record id="pgc_4751_child" model="account.account.template">
-            <field name="code">4751</field>
+        <record id="pgc_475100" model="account.account.template">
+            <field name="code">475100</field>
             <field name="reconcile" eval="True"/>
             <field name="parent_id" ref="pgc_4751"/>
             <field name="type">payable</field>
@@ -5029,6 +5045,14 @@
             <field name="name">Hacienda Pública, IVA repercutido</field>
             <field name="user_type" ref="tax"/>
         </record>
+        <record id="pgc_477000" model="account.account.template">
+            <field name="code">477000</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_477"/>
+            <field name="type">other</field>
+            <field name="name">Hacienda Pública. IVA repercutido</field>
+            <field name="user_type" ref="tax"/>
+        </record>
         <record id="pgc_479" model="account.account.template">
             <field name="code">479</field>
             <field name="reconcile" eval="False"/>
@@ -8722,7 +8746,7 @@
             <field name="reconcile" eval="False"/>
             <field name="parent_id" ref="pgc_66"/>
             <field name="type">view</field>
-            <field name="name">Ingresos de créditos a largo plazo</field>
+            <field name="name">Intereses de deudas</field>
             <field name="user_type" ref="gastos"/>
         </record>
         <record id="pgc_6620" model="account.account.template">
@@ -8730,7 +8754,7 @@
             <field name="reconcile" eval="False"/>
             <field name="parent_id" ref="pgc_662"/>
             <field name="type">view</field>
-            <field name="name">Ingresos de créditos a largo plazo, empresas del grupo</field>
+            <field name="name">Intereses de deudas, empresas del grupo</field>
             <field name="user_type" ref="gastos"/>
         </record>
         <record id="pgc_6620_child" model="account.account.template">
@@ -8738,7 +8762,7 @@
             <field name="reconcile" eval="False"/>
             <field name="parent_id" ref="pgc_6620"/>
             <field name="type">other</field>
-            <field name="name">Ingresos de créditos a largo plazo, empresas del grupo</field>
+            <field name="name">Intereses de deudas, empresas del grupo</field>
             <field name="user_type" ref="gastos"/>
         </record>
         <record id="pgc_6621" model="account.account.template">
@@ -8746,7 +8770,7 @@
             <field name="reconcile" eval="False"/>
             <field name="parent_id" ref="pgc_662"/>
             <field name="type">view</field>
-            <field name="name">Ingresos de créditos a largo plazo, empresas asociadas</field>
+            <field name="name">Intereses de deudas, empresas asociadas</field>
             <field name="user_type" ref="gastos"/>
         </record>
         <record id="pgc_6621_child" model="account.account.template">
@@ -8754,7 +8778,7 @@
             <field name="reconcile" eval="False"/>
             <field name="parent_id" ref="pgc_6621"/>
             <field name="type">other</field>
-            <field name="name">Ingresos de créditos a largo plazo, empresas asociadas</field>
+            <field name="name">Intereses de deudas, empresas asociadas</field>
             <field name="user_type" ref="gastos"/>
         </record>
         <record id="pgc_6622" model="account.account.template">
@@ -8762,7 +8786,7 @@
             <field name="reconcile" eval="False"/>
             <field name="parent_id" ref="pgc_662"/>
             <field name="type">view</field>
-            <field name="name">Ingresos de créditos a largo plazo, otras partes vinculadas</field>
+            <field name="name">Intereses de deudas, otras partes vinculadas</field>
             <field name="user_type" ref="gastos"/>
         </record>
         <record id="pgc_6622_child" model="account.account.template">
@@ -8770,7 +8794,7 @@
             <field name="reconcile" eval="False"/>
             <field name="parent_id" ref="pgc_6622"/>
             <field name="type">other</field>
-            <field name="name">Ingresos de créditos a largo plazo, otras partes vinculadas</field>
+            <field name="name">Intereses de deudas, otras partes vinculadas</field>
             <field name="user_type" ref="gastos"/>
         </record>
         <record id="pgc_6623" model="account.account.template">
@@ -8778,7 +8802,7 @@
             <field name="reconcile" eval="False"/>
             <field name="parent_id" ref="pgc_662"/>
             <field name="type">view</field>
-            <field name="name">Ingresos de créditos a largo plazo con entidades de crédito</field>
+            <field name="name">Intereses de deudas con entidades de crédito</field>
             <field name="user_type" ref="gastos"/>
         </record>
         <record id="pgc_6623_child" model="account.account.template">
@@ -8786,7 +8810,7 @@
             <field name="reconcile" eval="False"/>
             <field name="parent_id" ref="pgc_6623"/>
             <field name="type">other</field>
-            <field name="name">Ingresos de créditos a largo plazo con entidades de crédito</field>
+            <field name="name">Intereses de deudas con entidades de crédito</field>
             <field name="user_type" ref="gastos"/>
         </record>
         <record id="pgc_6624" model="account.account.template">
@@ -8794,7 +8818,7 @@
             <field name="reconcile" eval="False"/>
             <field name="parent_id" ref="pgc_662"/>
             <field name="type">view</field>
-            <field name="name">Ingresos de créditos a largo plazo, otras empresas</field>
+            <field name="name">Intereses de deudas, otras empresas</field>
             <field name="user_type" ref="gastos"/>
         </record>
         <record id="pgc_6624_child" model="account.account.template">
@@ -8802,7 +8826,7 @@
             <field name="reconcile" eval="False"/>
             <field name="parent_id" ref="pgc_6624"/>
             <field name="type">other</field>
-            <field name="name">Ingresos de créditos a largo plazo, otras empresas</field>
+            <field name="name">Intereses de deudas, otras empresas</field>
             <field name="user_type" ref="gastos"/>
         </record>
         <record id="pgc_663" model="account.account.template">
diff --git a/addons/l10n_es/account_chart_assoc.xml b/addons/l10n_es/account_chart_assoc.xml
new file mode 100644
index 00000000000..670eed53c9b
--- /dev/null
+++ b/addons/l10n_es/account_chart_assoc.xml
@@ -0,0 +1,12426 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="0">
+
+      <!-- 
+      Plantilla del árbol de cuentas del Plan General Contable ASOCIACIONES 2008.
+
+      Basada en la plantilla del Plan General Contable 2008, Plan General Contable PYMES 2008
+      -->
+
+
+         <record id="pgc_assoc_0" model="account.account.template">
+            <field name="code">0</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref=""/>
+            <field name="type">view</field>
+            <field name="name">Plan General Contable ASOCIACIONES 2008</field>
+            <field name="user_type" ref="view"/>
+        </record>
+
+        <record id="pgc_assoc_1" model="account.account.template">
+            <field name="code">1</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_0"/>
+            <field name="type">view</field>
+            <field name="name">Financiación Básica</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_10" model="account.account.template">
+            <field name="code">10</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_1"/>
+            <field name="type">view</field>
+            <field name="name">Capital</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+
+        <record id="pgc_assoc_100" model="account.account.template">
+            <field name="code">100</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_10"/>
+            <field name="type">view</field>
+            <field name="name">Dotación fundacional</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_100_child" model="account.account.template">
+            <field name="code">100</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_100"/>
+            <field name="type">other</field>
+            <field name="name">Dotación fundacional</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_101" model="account.account.template">
+            <field name="code">101</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_10"/>
+            <field name="type">view</field>
+            <field name="name">Fondo social</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_101_child" model="account.account.template">
+            <field name="code">101</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_101"/>
+            <field name="type">other</field>
+            <field name="name">Fondo social</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_102" model="account.account.template">
+            <field name="code">102</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_10"/>
+            <field name="type">view</field>
+            <field name="name">Capital</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_102_child" model="account.account.template">
+            <field name="code">102</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_102"/>
+            <field name="type">other</field>
+            <field name="name">Capital</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_103" model="account.account.template">
+            <field name="code">103</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_10"/>
+            <field name="type">view</field>
+            <field name="name">Fundadores/asociados por desembolsos no exigidos</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1030" model="account.account.template">
+            <field name="code">1030</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_103"/>
+            <field name="type">view</field>
+            <field name="name">Fundadores, parte no desembolsada en fundaciones</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1030_child" model="account.account.template">
+            <field name="code">1030</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_1030"/>
+            <field name="type">other</field>
+            <field name="name"> Fundadores, parte no desembolsada en fundaciones</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1034" model="account.account.template">
+            <field name="code">1034</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_103"/>
+            <field name="type">view</field>
+            <field name="name">Asociados, parte no desembolsada en asociaciones</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1034_child" model="account.account.template">
+            <field name="code">1034</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_1034"/>
+            <field name="type">other</field>
+            <field name="name">Asociados, parte no desembolsada en asociaciones</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_104" model="account.account.template">
+            <field name="code">104</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_10"/>
+            <field name="type">view</field>
+            <field name="name">Fundadores/asociados por aportaciones no dinerarias pendientes</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1040" model="account.account.template">
+            <field name="code">1040</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_104"/>
+            <field name="type">view</field>
+            <field name="name">Fundadores, por aportaciones no dinerarias pendientes, en fundaciones</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1040_child" model="account.account.template">
+            <field name="code">1040</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_1040"/>
+            <field name="type">other</field>
+            <field name="name">Fundadores, por aportaciones no dinerarias pendientes, en fundaciones</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1044" model="account.account.template">
+            <field name="code">1044</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_104"/>
+            <field name="type">view</field>
+            <field name="name">Asociados, por aportaciones no dinerarias pendientes, en asociaciones</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1044_child" model="account.account.template">
+            <field name="code">1044</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_1044"/>
+            <field name="type">other</field>
+            <field name="name">Asociados, por aportaciones no dinerarias pendientes, en asociaciones</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_108" model="account.account.template">
+            <field name="code">108</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_10"/>
+            <field name="type">view</field>
+            <field name="name">Acciones o participaciones propias en situaciones especiales</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_108_child" model="account.account.template">
+            <field name="code">108</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_108"/>
+            <field name="type">other</field>
+            <field name="name">Acciones o participaciones propias en situaciones especiales</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_109" model="account.account.template">
+            <field name="code">109</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_10"/>
+            <field name="type">view</field>
+            <field name="name">Acciones o participaciones propias para reducción de capital</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_109_child" model="account.account.template">
+            <field name="code">109</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_109"/>
+            <field name="type">other</field>
+            <field name="name">Acciones o participaciones propias para reducción de capital</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_11" model="account.account.template">
+            <field name="code">11</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_1"/>
+            <field name="type">view</field>
+            <field name="name">Reservas y otros instrumentos de patrimonio</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_110" model="account.account.template">
+            <field name="code">110</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_11"/>
+            <field name="type">view</field>
+            <field name="name">Prima de Emisión o asunción</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_110_child" model="account.account.template">
+            <field name="code">110</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_110"/>
+            <field name="type">other</field>
+            <field name="name">Prima de Emisión o asunción</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_112" model="account.account.template">
+            <field name="code">112</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_11"/>
+            <field name="type">view</field>
+            <field name="name">Reserva Legal</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_112_child" model="account.account.template">
+            <field name="code">112</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_112"/>
+            <field name="type">other</field>
+            <field name="name">Reserva Legal</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_113" model="account.account.template">
+            <field name="code">113</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_11"/>
+            <field name="type">view</field>
+            <field name="name">Reservas voluntarias</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_113_child" model="account.account.template">
+            <field name="code">113</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_113"/>
+            <field name="type">other</field>
+            <field name="name">Reservas voluntarias</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_114" model="account.account.template">
+            <field name="code">114</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_11"/>
+            <field name="type">view</field>
+            <field name="name">Reservas especiales</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1140" model="account.account.template">
+            <field name="code">1140</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_114"/>
+            <field name="type">view</field>
+            <field name="name">Reservas para acciones o participaciones de la sociedad dominante</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1140_child" model="account.account.template">
+            <field name="code">1140</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_1140"/>
+            <field name="type">other</field>
+            <field name="name">Reservas para acciones o participaciones de la sociedad dominante</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1141" model="account.account.template">
+            <field name="code">1141</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_114"/>
+            <field name="type">view</field>
+            <field name="name">Reservas estatutarias</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1141_child" model="account.account.template">
+            <field name="code">1141</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_1141"/>
+            <field name="type">other</field>
+            <field name="name">Reservas estatutarias</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1142" model="account.account.template">
+            <field name="code">1142</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_114"/>
+            <field name="type">view</field>
+            <field name="name">Reserva por capital amortizado</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1142_child" model="account.account.template">
+            <field name="code">1142</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_1142"/>
+            <field name="type">other</field>
+            <field name="name">Reserva por capital amortizado</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1144" model="account.account.template">
+            <field name="code">1144</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_114"/>
+            <field name="type">view</field>
+            <field name="name">Reservas por acciones propias aceptadas en garantía</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1144_child" model="account.account.template">
+            <field name="code">1144</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_1144"/>
+            <field name="type">other</field>
+            <field name="name">Reservas por acciones propias aceptadas en garantía</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_118" model="account.account.template">
+            <field name="code">118</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_11"/>
+            <field name="type">view</field>
+            <field name="name">Aportaciones de socios o propietarios</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_118_child" model="account.account.template">
+            <field name="code">118</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_118"/>
+            <field name="type">other</field>
+            <field name="name">Aportaciones de socios o propietarios</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_119" model="account.account.template">
+            <field name="code">119</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_11"/>
+            <field name="type">view</field>
+            <field name="name">Diferencias por ajuste del capital a euros</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_119_child" model="account.account.template">
+            <field name="code">119</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_119"/>
+            <field name="type">other</field>
+            <field name="name">Diferencias por ajuste del capital a euros</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_12" model="account.account.template">
+            <field name="code">12</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_1"/>
+            <field name="type">view</field>
+            <field name="name">Excedentes pendientes de aplicación</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_120" model="account.account.template">
+            <field name="code">120</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_12"/>
+            <field name="type">view</field>
+            <field name="name">Remanente</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_120_child" model="account.account.template">
+            <field name="code">120</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_120"/>
+            <field name="type">other</field>
+            <field name="name">Remanente</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_121" model="account.account.template">
+            <field name="code">121</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_12"/>
+            <field name="type">view</field>
+            <field name="name">Excedentes negativos de ejercicios anteriores</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_121_child" model="account.account.template">
+            <field name="code">121</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_121"/>
+            <field name="type">other</field>
+            <field name="name">Excedentes negativos de ejercicios anteriores</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_129" model="account.account.template">
+            <field name="code">129</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_12"/>
+            <field name="type">view</field>
+            <field name="name">Excedente del ejercicio</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_129_child" model="account.account.template">
+            <field name="code">129</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_129"/>
+            <field name="type">other</field>
+            <field name="name">Excedente del ejercicio</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_13" model="account.account.template">
+            <field name="code">13</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_1"/>
+            <field name="type">view</field>
+            <field name="name">Subvenciones, donaciones y ajustes por cambio de valor</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_130" model="account.account.template">
+            <field name="code">130</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_13"/>
+            <field name="type">view</field>
+            <field name="name">Subvenciones oficiales de capital</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1300" model="account.account.template">
+            <field name="code">1300</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_130"/>
+            <field name="type">view</field>
+            <field name="name">Subvenciones del Estado</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1300_child" model="account.account.template">
+            <field name="code">1300</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_1300"/>
+            <field name="type">other</field>
+            <field name="name">Subvenciones del Estado</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1301" model="account.account.template">
+            <field name="code">1301</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_130"/>
+            <field name="type">view</field>
+            <field name="name">Subvenciones de otras Administraciones Públicas</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1301_child" model="account.account.template">
+            <field name="code">1301</field>
+            <field name="reconcile" eval="False"/>    
+            <field name="parent_id" ref="pgc_assoc_1301"/>
+            <field name="type">other</field>
+            <field name="name">Subvenciones de otras Administraciones Públicas</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_131" model="account.account.template">
+            <field name="code">131</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_13"/>
+            <field name="type">view</field>
+            <field name="name">Donaciones y legados de capital</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_131_child" model="account.account.template">
+            <field name="code">131</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_131"/>
+            <field name="type">other</field>
+            <field name="name">Donaciones y legados de capital</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_132" model="account.account.template">
+            <field name="code">132</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_13"/>
+            <field name="type">view</field>
+            <field name="name">Otras subvenciones, donaciones y legados</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1320" model="account.account.template">
+            <field name="code">1320</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_132"/>
+            <field name="type">view</field>
+            <field name="name">Otras subvenciones</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1320_child" model="account.account.template">
+            <field name="code">1320</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_1320"/>
+            <field name="type">other</field>
+            <field name="name">Otras subvenciones</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1321" model="account.account.template">
+            <field name="code">1321</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_132"/>
+            <field name="type">view</field>
+            <field name="name">Otras donaciones y legados</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1321_child" model="account.account.template">
+            <field name="code">1321</field>
+            <field name="reconcile" eval="False"/>    
+            <field name="parent_id" ref="pgc_assoc_1321"/>
+            <field name="type">other</field>
+            <field name="name">Otras donaciones y legados</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+
+        <record id="pgc_assoc_137" model="account.account.template">
+            <field name="code">137</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_13"/>
+            <field name="type">view</field>
+            <field name="name">Ingresos fiscales a distribuir en varios ejercicios</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1370" model="account.account.template">
+            <field name="code">1370</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_137"/>
+            <field name="type">view</field>
+            <field name="name">Ingresos fiscales por diferencias permanentes a distribuir en varios ejercicios</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1370_child" model="account.account.template">
+            <field name="code">1370</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_1370"/>
+            <field name="type">other</field>
+            <field name="name">Ingresos fiscales por diferencias permanentes a distribuir en varios ejercicios</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1371" model="account.account.template">
+            <field name="code">1371</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_137"/>
+            <field name="type">view</field>
+            <field name="name">Ingresos fiscales por deducciones y bonificaciones a distribuir en varios ejercicios</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1371_child" model="account.account.template">
+            <field name="code">1371</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_1371"/>
+            <field name="type">other</field>
+            <field name="name">Ingresos fiscales por deducciones y bonificaciones a distribuir en varios ejercicios</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_14" model="account.account.template">
+            <field name="code">14</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_1"/>
+            <field name="type">view</field>
+            <field name="name">Provisiones</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_141" model="account.account.template">
+            <field name="code">141</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_14"/>
+            <field name="type">view</field>
+            <field name="name">Provisión para impuestos</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_141_child" model="account.account.template">
+            <field name="code">141</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_141"/>
+            <field name="type">other</field>
+            <field name="name">Provisión para impuestos</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_142" model="account.account.template">
+            <field name="code">142</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_14"/>
+            <field name="type">view</field>
+            <field name="name">Provisión para otras responsabilidades</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_142_child" model="account.account.template">
+            <field name="code">142</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_142"/>
+            <field name="type">other</field>
+            <field name="name">Provisión para otras responsabilidades</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_143" model="account.account.template">
+            <field name="code">143</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_14"/>
+            <field name="type">view</field>
+            <field name="name">Provisión por desmantelamiento, retiro o rehabilitación del inmovilizado</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_143_child" model="account.account.template">
+            <field name="code">143</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_143"/>
+            <field name="type">other</field>
+            <field name="name">Provisión por desmantelamiento, retiro o rehabilitación del inmovilizado</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_145" model="account.account.template">
+            <field name="code">145</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_14"/>
+            <field name="type">view</field>
+            <field name="name">Provisión para actuaciones medioambientales</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_145_child" model="account.account.template">
+            <field name="code">145</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_145"/>
+            <field name="type">other</field>
+            <field name="name">Provisión para actuaciones medioambientales</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_15" model="account.account.template">
+            <field name="code">15</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_1"/>
+            <field name="type">view</field>
+            <field name="name">Deudas con características especiales</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_150" model="account.account.template">
+            <field name="code">150</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_15"/>
+            <field name="type">view</field>
+            <field name="name">Acciones o participaciones consideradas como pasivos financieros</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_150_child" model="account.account.template">
+            <field name="code">150</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_150"/>
+            <field name="type">other</field>
+            <field name="name">Acciones o participaciones consideradas como pasivos financieros</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_153" model="account.account.template">
+            <field name="code">153</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_15"/>
+            <field name="type">view</field>
+            <field name="name">Desembolsos no exigidos por acciones o participaciones consideradas como pasivos financieros</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1533" model="account.account.template">
+            <field name="code">1533</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_153"/>
+            <field name="type">view</field>
+            <field name="name">Desembolsos no exigidos, empresas del grupo</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1533_child" model="account.account.template">
+            <field name="code">1533</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_1533"/>
+            <field name="type">other</field>
+            <field name="name">Desembolsos no exigidos, empresas del grupo</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1534" model="account.account.template">
+            <field name="code">1534</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_153"/>
+            <field name="type">view</field>
+            <field name="name">Desembolsos no exigidos, empresas asociadas</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1534_child" model="account.account.template">
+            <field name="code">1534</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_1534"/>
+            <field name="type">other</field>
+            <field name="name">Desembolsos no exigidos, empresas asociadas</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1535" model="account.account.template">
+            <field name="code">1535</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_153"/>
+            <field name="type">view</field>
+            <field name="name">Desembolsos no exigidos, otras partes vinculadas</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1535_child" model="account.account.template">
+            <field name="code">1535</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_1535"/>
+            <field name="type">other</field>
+            <field name="name">Desembolsos no exigidos, otras partes vinculadas</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1536" model="account.account.template">
+            <field name="code">1536</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_153"/>
+            <field name="type">view</field>
+            <field name="name">Otros desembolsos no exigidos</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1536_child" model="account.account.template">
+            <field name="code">1536</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_1536"/>
+            <field name="type">other</field>
+            <field name="name">Otros desembolsos no exigidos</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_154" model="account.account.template">
+            <field name="code">154</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_15"/>
+            <field name="type">view</field>
+            <field name="name">Aportaciones no dinerarias pendientes por acciones o participaciones consideradas como pasivos financieros</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1543" model="account.account.template">
+            <field name="code">1543</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_154"/>
+            <field name="type">view</field>
+            <field name="name">Aportaciones no dinerarias pendientes, empresas del grupo</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1543_child" model="account.account.template">
+            <field name="code">1543</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_1543"/>
+            <field name="type">other</field>
+            <field name="name">Aportaciones no dinerarias pendientes, empresas del grupo</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1544" model="account.account.template">
+            <field name="code">1544</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_154"/>
+            <field name="type">view</field>
+            <field name="name">Aportaciones no dinerarias pendientes, empresas asociadas</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1544_child" model="account.account.template">
+            <field name="code">1544</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_1544"/>
+            <field name="type">other</field>
+            <field name="name">Aportaciones no dinerarias pendientes, empresas asociadas</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1545" model="account.account.template">
+            <field name="code">1545</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_154"/>
+            <field name="type">view</field>
+            <field name="name">Aportaciones no dinerarias pendientes, otras partes vinculadas</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1545_child" model="account.account.template">
+            <field name="code">1545</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_1545"/>
+            <field name="type">other</field>
+            <field name="name">Aportaciones no dinerarias pendientes, otras partes vinculadas</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1546" model="account.account.template">
+            <field name="code">1546</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_154"/>
+            <field name="type">view</field>
+            <field name="name">Otras aportaciones no dinerarias pendientes</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1546_child" model="account.account.template">
+            <field name="code">1546</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_1546"/>
+            <field name="type">other</field>
+            <field name="name">Otras aportaciones no dinerarias pendientes</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_16" model="account.account.template">
+            <field name="code">16</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_1"/>
+            <field name="type">view</field>
+            <field name="name">Deudas con partes vinculadas</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_160" model="account.account.template">
+            <field name="code">160</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_16"/>
+            <field name="type">view</field>
+            <field name="name">Deudas con entidades de crédito vinculadas</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1603" model="account.account.template">
+            <field name="code">1603</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_160"/>
+            <field name="type">view</field>
+            <field name="name">Deudas con entidades de crédito vinculadas, empresas del grupo</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1603_child" model="account.account.template">
+            <field name="code">1603</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_1603"/>
+            <field name="type">other</field>
+            <field name="name">Deudas con entidades de crédito vinculadas, empresas del grupo</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1604" model="account.account.template">
+            <field name="code">1604</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_160"/>
+            <field name="type">view</field>
+            <field name="name">Deudas con entidades de crédito vinculadas, empresas asociadas</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1604_child" model="account.account.template">
+            <field name="code">1604</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_1604"/>
+            <field name="type">other</field>
+            <field name="name">Deudas con entidades de crédito vinculadas, empresas asociadas</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1605" model="account.account.template">
+            <field name="code">1605</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_160"/>
+            <field name="type">view</field>
+            <field name="name">Deudas con otras entidades de crédito vinculadas</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1605_child" model="account.account.template">
+            <field name="code">1605</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_1605"/>
+            <field name="type">other</field>
+            <field name="name">Deudas con otras entidades de crédito vinculadas</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_161" model="account.account.template">
+            <field name="code">161</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_16"/>
+            <field name="type">view</field>
+            <field name="name">Proveedores de inmovilizado, partes vinculadas</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1613" model="account.account.template">
+            <field name="code">1613</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_161"/>
+            <field name="type">view</field>
+            <field name="name">Proveedores de inmovilizado, empresas del grupo</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1613_child" model="account.account.template">
+            <field name="code">1613</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_1613"/>
+            <field name="type">other</field>
+            <field name="name">Proveedores de inmovilizado, empresas del grupo</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1614" model="account.account.template">
+            <field name="code">1614</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_161"/>
+            <field name="type">view</field>
+            <field name="name">Proveedores de inmovilizado, empresas asociadas</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1614_child" model="account.account.template">
+            <field name="code">1614</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_1614"/>
+            <field name="type">other</field>
+            <field name="name">Proveedores de inmovilizado, empresas asociadas</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1615" model="account.account.template">
+            <field name="code">1615</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_161"/>
+            <field name="type">view</field>
+            <field name="name">Proveedores de inmovilizado, otras partes vinculadas</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1615_child" model="account.account.template">
+            <field name="code">1615</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_1615"/>
+            <field name="type">other</field>
+            <field name="name">Proveedores de inmovilizado, otras partes vinculadas</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_162" model="account.account.template">
+            <field name="code">162</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_16"/>
+            <field name="type">view</field>
+            <field name="name">Acreedores por arrendamiento financiero, partes vinculadas</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1623" model="account.account.template">
+            <field name="code">1623</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_162"/>
+            <field name="type">view</field>
+            <field name="name">Acreedores por arrendamiento financiero, empresas de grupo</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1623_child" model="account.account.template">
+            <field name="code">1623</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_1623"/>
+            <field name="type">other</field>
+            <field name="name">Acreedores por arrendamiento financiero, empresas de grupo</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1624" model="account.account.template">
+            <field name="code">1624</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_162"/>
+            <field name="type">view</field>
+            <field name="name">Acreedores por arrendamiento financiero, empresas asociadas</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1624_child" model="account.account.template">
+            <field name="code">1624</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_1624"/>
+            <field name="type">other</field>
+            <field name="name">Acreedores por arrendamiento financiero, empresas asociadas</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1625" model="account.account.template">
+            <field name="code">1625</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_162"/>
+            <field name="type">view</field>
+            <field name="name">Acreedores por arrendamiento financiero, otras partes vinculadas</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1625_child" model="account.account.template">
+            <field name="code">1625</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_1625"/>
+            <field name="type">other</field>
+            <field name="name">Acreedores por arrendamiento financiero, otras partes vinculadas</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_163" model="account.account.template">
+            <field name="code">163</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_16"/>
+            <field name="type">view</field>
+            <field name="name">Otras deudas con partes vinculadas</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1633" model="account.account.template">
+            <field name="code">1633</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_163"/>
+            <field name="type">view</field>
+            <field name="name">Otras deudas, empresas del grupo</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1633_child" model="account.account.template">
+            <field name="code">1633</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_1633"/>
+            <field name="type">other</field>
+            <field name="name">Otras deudas, empresas del grupo</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1634" model="account.account.template">
+            <field name="code">1634</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_163"/>
+            <field name="type">view</field>
+            <field name="name">Otras deudas, empresas asociadas</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1634_child" model="account.account.template">
+            <field name="code">1634</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_1634"/>
+            <field name="type">other</field>
+            <field name="name">Otras deudas, empresas asociadas</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1635" model="account.account.template">
+            <field name="code">1635</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_163"/>
+            <field name="type">view</field>
+            <field name="name">Otras deudas, con otras partes vinculadas</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1635_child" model="account.account.template">
+            <field name="code">1635</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_1635"/>
+            <field name="type">other</field>
+            <field name="name">Otras deudas, con otras partes vinculadas</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_17" model="account.account.template">
+            <field name="code">17</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_1"/>
+            <field name="type">view</field>
+            <field name="name">Deudas por préstamos recibidos, empréstitos y otros conceptos</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_170" model="account.account.template">
+            <field name="code">170</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_17"/>
+            <field name="type">view</field>
+            <field name="name">Deudas con entidades de crédito</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_170_child" model="account.account.template">
+            <field name="code">170</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_170"/>
+            <field name="type">other</field>
+            <field name="name">Deudas con entidades de crédito</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_171" model="account.account.template">
+            <field name="code">171</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_17"/>
+            <field name="type">view</field>
+            <field name="name">Deudas</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_171_child" model="account.account.template">
+            <field name="code">171</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_171"/>
+            <field name="type">other</field>
+            <field name="name">Deudas</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_172" model="account.account.template">
+            <field name="code">172</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_17"/>
+            <field name="type">view</field>
+            <field name="name">Deudas transformables en subvenciones, donaciones y legados</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_172_child" model="account.account.template">
+            <field name="code">172</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_172"/>
+            <field name="type">other</field>
+            <field name="name">Deudas transformables en subvenciones, donaciones y legados</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_173" model="account.account.template">
+            <field name="code">173</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_17"/>
+            <field name="type">view</field>
+            <field name="name">Proveedores de inmovilizado</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_173_child" model="account.account.template">
+            <field name="code">173</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_173"/>
+            <field name="type">other</field>
+            <field name="name">Proveedores de inmovilizado</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_174" model="account.account.template">
+            <field name="code">174</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_17"/>
+            <field name="type">view</field>
+            <field name="name">Acreedores por arrendamiento financiero</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_174_child" model="account.account.template">
+            <field name="code">174</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_174"/>
+            <field name="type">other</field>
+            <field name="name">Acreedores por arrendamiento financiero</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_175" model="account.account.template">
+            <field name="code">175</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_17"/>
+            <field name="type">view</field>
+            <field name="name">Efectos a pagar</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_175_child" model="account.account.template">
+            <field name="code">175</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_175"/>
+            <field name="type">other</field>
+            <field name="name">Efectos a pagar</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_176" model="account.account.template">
+            <field name="code">176</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_17"/>
+            <field name="type">view</field>
+            <field name="name">Pasivos por derivados financieros</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_176_child" model="account.account.template">
+            <field name="code">176</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_176"/>
+            <field name="type">other</field>
+            <field name="name">Pasivos por derivados financieros</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_177" model="account.account.template">
+            <field name="code">177</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_17"/>
+            <field name="type">view</field>
+            <field name="name">Obligaciones y bonos</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_177_child" model="account.account.template">
+            <field name="code">177</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_177"/>
+            <field name="type">other</field>
+            <field name="name">Obligaciones y bonos</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_179" model="account.account.template">
+            <field name="code">179</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_17"/>
+            <field name="type">view</field>
+            <field name="name">Deudas representadas en otros valores negociables</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_179_child" model="account.account.template">
+            <field name="code">179</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_179"/>
+            <field name="type">other</field>
+            <field name="name">Deudas representadas en otros valores negociables</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_18" model="account.account.template">
+            <field name="code">18</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_1"/>
+            <field name="type">view</field>
+            <field name="name">Pasivos por fianzas, garantías y otros conceptos</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_180" model="account.account.template">
+            <field name="code">180</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_18"/>
+            <field name="type">view</field>
+            <field name="name">Fianzas recibidas</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_180_child" model="account.account.template">
+            <field name="code">180</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_180"/>
+            <field name="type">other</field>
+            <field name="name">Fianzas recibidas</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_181" model="account.account.template">
+            <field name="code">181</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_18"/>
+            <field name="type">view</field>
+            <field name="name">Anticipos recibidos por ventas o prestaciones de servicios</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_181_child" model="account.account.template">
+            <field name="code">181</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_181"/>
+            <field name="type">other</field>
+            <field name="name">Anticipos recibidos por ventas o prestaciones de servicios</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_185" model="account.account.template">
+            <field name="code">185</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_18"/>
+            <field name="type">view</field>
+            <field name="name">Depósitos recibidos</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_185_child" model="account.account.template">
+            <field name="code">185</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_185"/>
+            <field name="type">other</field>
+            <field name="name">Depósitos recibidos</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_19" model="account.account.template">
+            <field name="code">19</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_1"/>
+            <field name="type">view</field>
+            <field name="name">Situaciones transitorias de financiación</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_190" model="account.account.template">
+            <field name="code">190</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_19"/>
+            <field name="type">view</field>
+            <field name="name">Acciones o participaciones emitidas</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_190_child" model="account.account.template">
+            <field name="code">190</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_190"/>
+            <field name="type">other</field>
+            <field name="name">Acciones o participaciones emitidas</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_192" model="account.account.template">
+            <field name="code">192</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_19"/>
+            <field name="type">view</field>
+            <field name="name">Suscriptores de acciones</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_192_child" model="account.account.template">
+            <field name="code">192</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_192"/>
+            <field name="type">other</field>
+            <field name="name">Suscriptores de acciones</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_194" model="account.account.template">
+            <field name="code">194</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_19"/>
+            <field name="type">view</field>
+            <field name="name">Capital emitido pendiente de inscripción</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_194_child" model="account.account.template">
+            <field name="code">194</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_194"/>
+            <field name="type">other</field>
+            <field name="name">Capital emitido pendiente de inscripción</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_195" model="account.account.template">
+            <field name="code">195</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_19"/>
+            <field name="type">view</field>
+            <field name="name">Acciones o participaciones emitidas consideradas como pasivos financieros</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_195_child" model="account.account.template">
+            <field name="code">195</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_195"/>
+            <field name="type">other</field>
+            <field name="name">Acciones o participaciones emitidas consideradas como pasivos financieros</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_197" model="account.account.template">
+            <field name="code">197</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_19"/>
+            <field name="type">view</field>
+            <field name="name">Suscriptores de acciones consideradas como pasivos financieros</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_197_child" model="account.account.template">
+            <field name="code">197</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_197"/>
+            <field name="type">other</field>
+            <field name="name">Suscriptores de acciones consideradas como pasivos financieros</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_199" model="account.account.template">
+            <field name="code">199</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_19"/>
+            <field name="type">view</field>
+            <field name="name">Acciones o participaciones emitidas consideradas como pasivos financieros pendientes de inscripción</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_199_child" model="account.account.template">
+            <field name="code">199</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_199"/>
+            <field name="type">other</field>
+            <field name="name">Acciones o participaciones emitidas consideradas como pasivos financieros pendientes de inscripción</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_2" model="account.account.template">
+            <field name="code">2</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_0"/>
+            <field name="type">view</field>
+            <field name="name">Activo no corriente</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_20" model="account.account.template">
+            <field name="code">20</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2"/>
+            <field name="type">view</field>
+            <field name="name">Inmovilizaciones intangibles</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_200" model="account.account.template">
+            <field name="code">200</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_20"/>
+            <field name="type">view</field>
+            <field name="name">Investigación</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_200_child" model="account.account.template">
+            <field name="code">200</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_200"/>
+            <field name="type">other</field>
+            <field name="name">Investigación</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_201" model="account.account.template">
+            <field name="code">201</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_20"/>
+            <field name="type">view</field>
+            <field name="name">Desarrollo</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_201_child" model="account.account.template">
+            <field name="code">201</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_201"/>
+            <field name="type">other</field>
+            <field name="name">Desarrollo</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_202" model="account.account.template">
+            <field name="code">202</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_20"/>
+            <field name="type">view</field>
+            <field name="name">Concesiones administrativas</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_202_child" model="account.account.template">
+            <field name="code">202</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_202"/>
+            <field name="type">other</field>
+            <field name="name">Concesiones administrativas</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_203" model="account.account.template">
+            <field name="code">203</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_20"/>
+            <field name="type">view</field>
+            <field name="name">Propiedad industrial</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_203_child" model="account.account.template">
+            <field name="code">203</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_203"/>
+            <field name="type">other</field>
+            <field name="name">Propiedad industrial</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_205" model="account.account.template">
+            <field name="code">205</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_20"/>
+            <field name="type">view</field>
+            <field name="name">Derechos de traspaso</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_205_child" model="account.account.template">
+            <field name="code">205</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_205"/>
+            <field name="type">other</field>
+            <field name="name">Derechos de traspaso</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_206" model="account.account.template">
+            <field name="code">206</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_20"/>
+            <field name="type">view</field>
+            <field name="name">Aplicaciones informáticas</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_206_child" model="account.account.template">
+            <field name="code">206</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_206"/>
+            <field name="type">other</field>
+            <field name="name">Aplicaciones informáticas</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_207" model="account.account.template">
+            <field name="code">207</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_20"/>
+            <field name="type">view</field>
+            <field name="name">Derechos sobre activos cedidos en uso</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_207_child" model="account.account.template">
+            <field name="code">207</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_207"/>
+            <field name="type">other</field>
+            <field name="name">Derechos sobre activos cedidos en uso</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_209" model="account.account.template">
+            <field name="code">209</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_20"/>
+            <field name="type">view</field>
+            <field name="name">Anticipos para inmovilizaciones intangibles</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_209_child" model="account.account.template">
+            <field name="code">209</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_209"/>
+            <field name="type">other</field>
+            <field name="name">Anticipos para inmovilizaciones intangibles</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_21" model="account.account.template">
+            <field name="code">21</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2"/>
+            <field name="type">view</field>
+            <field name="name">Inmovilizaciones materiales</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_210" model="account.account.template">
+            <field name="code">210</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_21"/>
+            <field name="type">view</field>
+            <field name="name">Terrenos y bienes naturales</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_210_child" model="account.account.template">
+            <field name="code">210</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_210"/>
+            <field name="type">other</field>
+            <field name="name">Terrenos y bienes naturales</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_211" model="account.account.template">
+            <field name="code">211</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_21"/>
+            <field name="type">view</field>
+            <field name="name">Construcciones</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_211_child" model="account.account.template">
+            <field name="code">211</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_211"/>
+            <field name="type">other</field>
+            <field name="name">Construcciones</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_212" model="account.account.template">
+            <field name="code">212</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_21"/>
+            <field name="type">view</field>
+            <field name="name">Instalaciones técnicas</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_212_child" model="account.account.template">
+            <field name="code">212</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_212"/>
+            <field name="type">other</field>
+            <field name="name">Instalaciones técnicas</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_213" model="account.account.template">
+            <field name="code">213</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_21"/>
+            <field name="type">view</field>
+            <field name="name">Maquinaria</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_213_child" model="account.account.template">
+            <field name="code">213</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_213"/>
+            <field name="type">other</field>
+            <field name="name">Maquinaria</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_214" model="account.account.template">
+            <field name="code">214</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_21"/>
+            <field name="type">view</field>
+            <field name="name">Utillaje</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_214_child" model="account.account.template">
+            <field name="code">214</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_214"/>
+            <field name="type">other</field>
+            <field name="name">Utillaje</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_215" model="account.account.template">
+            <field name="code">215</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_21"/>
+            <field name="type">view</field>
+            <field name="name">Otras instalaciones</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_215_child" model="account.account.template">
+            <field name="code">215</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_215"/>
+            <field name="type">other</field>
+            <field name="name">Otras instalaciones</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_216" model="account.account.template">
+            <field name="code">216</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_21"/>
+            <field name="type">view</field>
+            <field name="name">Mobiliario</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_216_child" model="account.account.template">
+            <field name="code">216</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_216"/>
+            <field name="type">other</field>
+            <field name="name">Mobiliario</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_217" model="account.account.template">
+            <field name="code">217</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_21"/>
+            <field name="type">view</field>
+            <field name="name">Equipos para proceso de información</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_217_child" model="account.account.template">
+            <field name="code">217</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_217"/>
+            <field name="type">other</field>
+            <field name="name">Equipos para proceso de información</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_218" model="account.account.template">
+            <field name="code">218</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_21"/>
+            <field name="type">view</field>
+            <field name="name">Elementos de transporte</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_218_child" model="account.account.template">
+            <field name="code">218</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_218"/>
+            <field name="type">other</field>
+            <field name="name">Elementos de transporte</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_219" model="account.account.template">
+            <field name="code">219</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_21"/>
+            <field name="type">view</field>
+            <field name="name">Otro inmovilizado material</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_219_child" model="account.account.template">
+            <field name="code">219</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_219"/>
+            <field name="type">other</field>
+            <field name="name">Otro inmovilizado material</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_22" model="account.account.template">
+            <field name="code">22</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2"/>
+            <field name="type">view</field>
+            <field name="name">Inversiones inmobiliarias</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_220" model="account.account.template">
+            <field name="code">220</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_22"/>
+            <field name="type">view</field>
+            <field name="name">Inversiones en terrenos y bienes naturales</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_220_child" model="account.account.template">
+            <field name="code">220</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_220"/>
+            <field name="type">other</field>
+            <field name="name">Inversiones en terrenos y bienes naturales</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_221" model="account.account.template">
+            <field name="code">221</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_22"/>
+            <field name="type">view</field>
+            <field name="name">Inversiones en construcciones</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_221_child" model="account.account.template">
+            <field name="code">221</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_221"/>
+            <field name="type">other</field>
+            <field name="name">Inversiones en construcciones</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_23" model="account.account.template">
+            <field name="code">23</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2"/>
+            <field name="type">view</field>
+            <field name="name">Inmovilizaciones materiales en curso</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_230" model="account.account.template">
+            <field name="code">230</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_23"/>
+            <field name="type">view</field>
+            <field name="name">Adaptación de terrenos y bienes naturales</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_230_child" model="account.account.template">
+            <field name="code">230</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_230"/>
+            <field name="type">other</field>
+            <field name="name">Adaptación de terrenos y bienes naturales</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_231" model="account.account.template">
+            <field name="code">231</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_23"/>
+            <field name="type">view</field>
+            <field name="name">Construcciones en curso</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_231_child" model="account.account.template">
+            <field name="code">231</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_231"/>
+            <field name="type">other</field>
+            <field name="name">Construcciones en curso</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_232" model="account.account.template">
+            <field name="code">232</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_23"/>
+            <field name="type">view</field>
+            <field name="name">Instalaciones técnicas en montaje</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_232_child" model="account.account.template">
+            <field name="code">232</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_232"/>
+            <field name="type">other</field>
+            <field name="name">Instalaciones técnicas en montaje</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_233" model="account.account.template">
+            <field name="code">233</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_23"/>
+            <field name="type">view</field>
+            <field name="name">Maquinaria en montaje</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_233_child" model="account.account.template">
+            <field name="code">233</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_233"/>
+            <field name="type">other</field>
+            <field name="name">Maquinaria en montaje</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_237" model="account.account.template">
+            <field name="code">237</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_23"/>
+            <field name="type">view</field>
+            <field name="name">Equipos para procesos de información en montaje</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_237_child" model="account.account.template">
+            <field name="code">237</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_237"/>
+            <field name="type">other</field>
+            <field name="name">Equipos para procesos de información en montaje</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_239" model="account.account.template">
+            <field name="code">239</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_23"/>
+            <field name="type">view</field>
+            <field name="name">Anticipos para inmovilizaciones materiales</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_239_child" model="account.account.template">
+            <field name="code">239</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_239"/>
+            <field name="type">other</field>
+            <field name="name">Anticipos para inmovilizaciones materiales</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_24" model="account.account.template">
+            <field name="code">24</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2"/>
+            <field name="type">view</field>
+            <field name="name">Bienes del patrimonio histórico</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_240" model="account.account.template">
+            <field name="code">240</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_24"/>
+            <field name="type">view</field>
+            <field name="name">Bienes inmuebles</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2400" model="account.account.template">
+            <field name="code">2400</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_240"/>
+            <field name="type">view</field>
+            <field name="name">Monumentos</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2400_child" model="account.account.template">
+            <field name="code">2400</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2400"/>
+            <field name="type">other</field>
+            <field name="name">Monumentos</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+
+        <record id="pgc_assoc_2401" model="account.account.template">
+            <field name="code">2401</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_240"/>
+            <field name="type">view</field>
+            <field name="name">Jardines históricos</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2401_child" model="account.account.template">
+            <field name="code">2401</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2401"/>
+            <field name="type">other</field>
+            <field name="name">Jardines históricos</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+
+        <record id="pgc_assoc_2402" model="account.account.template">
+            <field name="code">2402</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_240"/>
+            <field name="type">view</field>
+            <field name="name">Conjuntos históricos</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2402_child" model="account.account.template">
+            <field name="code">2402</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2402"/>
+            <field name="type">other</field>
+            <field name="name">Conjuntos históricos</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+
+        <record id="pgc_assoc_2403" model="account.account.template">
+            <field name="code">2403</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_240"/>
+            <field name="type">view</field>
+            <field name="name">Sitios históricos</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2403_child" model="account.account.template">
+            <field name="code">2403</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2403"/>
+            <field name="type">other</field>
+            <field name="name">Sitios históricos</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2404" model="account.account.template">
+            <field name="code">2404</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_240"/>
+            <field name="type">view</field>
+            <field name="name">Zonas arqueológicas</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2404_child" model="account.account.template">
+            <field name="code">2404</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2404"/>
+            <field name="type">other</field>
+            <field name="name">Zonas arqueológicas</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2405" model="account.account.template">
+            <field name="code">2405</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_240"/>
+            <field name="type">view</field>
+            <field name="name">Participaciones en otras partes vinculadas</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2405_child" model="account.account.template">
+            <field name="code">2405</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2405"/>
+            <field name="type">other</field>
+            <field name="name">Participaciones en otras partes vinculadas</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_241" model="account.account.template">
+            <field name="code">241</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_24"/>
+            <field name="type">view</field>
+            <field name="name">Archivos</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2413" model="account.account.template">
+            <field name="code">2413</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_241"/>
+            <field name="type">view</field>
+            <field name="name">Valores representativos de deuda de empresas del grupo</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2413_child" model="account.account.template">
+            <field name="code">2413</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2413"/>
+            <field name="type">other</field>
+            <field name="name">Valores representativos de deuda de empresas del grupo</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2414" model="account.account.template">
+            <field name="code">2414</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_241"/>
+            <field name="type">view</field>
+            <field name="name">Valores representativos de deuda de empresas asociadas</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2414_child" model="account.account.template">
+            <field name="code">2414</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2414"/>
+            <field name="type">other</field>
+            <field name="name">Valores representativos de deuda de empresas asociadas</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2415" model="account.account.template">
+            <field name="code">2415</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_241"/>
+            <field name="type">view</field>
+            <field name="name">Valores representativos de deuda de otras partes vinculadas</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2415_child" model="account.account.template">
+            <field name="code">2415</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2415"/>
+            <field name="type">other</field>
+            <field name="name">Valores representativos de deuda de otras partes vinculadas</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_242" model="account.account.template">
+            <field name="code">242</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_24"/>
+            <field name="type">view</field>
+            <field name="name">Bibliotecas</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2423" model="account.account.template">
+            <field name="code">2423</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_242"/>
+            <field name="type">view</field>
+            <field name="name">Créditos a empresas del grupo</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2423_child" model="account.account.template">
+            <field name="code">2423</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2423"/>
+            <field name="type">other</field>
+            <field name="name">Créditos a empresas del grupo</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2424" model="account.account.template">
+            <field name="code">2424</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_242"/>
+            <field name="type">view</field>
+            <field name="name">Créditos a empresas asociadas</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2424_child" model="account.account.template">
+            <field name="code">2424</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2424"/>
+            <field name="type">other</field>
+            <field name="name">Créditos a empresas asociadas</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2425" model="account.account.template">
+            <field name="code">2425</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_242"/>
+            <field name="type">view</field>
+            <field name="name">Créditos a otras partes vinculadas</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2425_child" model="account.account.template">
+            <field name="code">2425</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2425"/>
+            <field name="type">other</field>
+            <field name="name">Créditos a otras partes vinculadas</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+
+        <record id="pgc_assoc_243" model="account.account.template">
+            <field name="code">243</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_24"/>
+            <field name="type">view</field>
+            <field name="name">Museos</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+
+        <record id="pgc_assoc_243_child" model="account.account.template">
+            <field name="code">243</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_243"/>
+            <field name="type">other</field>
+            <field name="name">Museos</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+
+        <record id="pgc_assoc_244" model="account.account.template">
+            <field name="code">244</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_24"/>
+            <field name="type">view</field>
+            <field name="name">Bienes muebles</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+
+        <record id="pgc_assoc_244_child" model="account.account.template">
+            <field name="code">244</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_244"/>
+            <field name="type">other</field>
+            <field name="name">Bienes muebles</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+
+
+        <record id="pgc_assoc_249" model="account.account.template">
+            <field name="code">249</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_24"/>
+            <field name="type">view</field>
+            <field name="name">Anticipos sobre bienes del Patrimonio Histórico</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+
+       <record id="pgc_assoc_2490" model="account.account.template">
+            <field name="code">2490</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_249"/>
+            <field name="type">view</field>
+            <field name="name">Anticipos sobre bienes inmuebles del Patrimonio Histórico</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2490_child" model="account.account.template">
+            <field name="code">2490</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2490"/>
+            <field name="type">other</field>
+            <field name="name">Anticipos sobre bienes inmuebles del Patrimonio Histórico</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+
+       <record id="pgc_assoc_2491" model="account.account.template">
+            <field name="code">2491</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_249"/>
+            <field name="type">view</field>
+            <field name="name">Anticipos sobre archivos del Patrimonio Histórico</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2491_child" model="account.account.template">
+            <field name="code">2491</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2491"/>
+            <field name="type">other</field>
+            <field name="name">Anticipos sobre archivos del Patrimonio Histórico</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+
+       <record id="pgc_assoc_2492" model="account.account.template">
+            <field name="code">2492</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_249"/>
+            <field name="type">view</field>
+            <field name="name">Anticipos sobre bibliotecas del Patrimonio Histórico</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2492_child" model="account.account.template">
+            <field name="code">2492</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2492"/>
+            <field name="type">other</field>
+            <field name="name">Anticipos sobre bibliotecas del Patrimonio Histórico</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+
+
+        <record id="pgc_assoc_2493" model="account.account.template">
+            <field name="code">2493</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_249"/>
+            <field name="type">view</field>
+            <field name="name">Anticipos sobre museos del Patrimonio Histórico</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2493_child" model="account.account.template">
+            <field name="code">2493</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2493"/>
+            <field name="type">other</field>
+            <field name="name">Anticipos sobre museos del Patrimonio Histórico</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+
+        <record id="pgc_assoc_2494" model="account.account.template">
+            <field name="code">2494</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_249"/>
+            <field name="type">view</field>
+            <field name="name">Anticipos sobre bienes muebles del Patrimonio Histórico</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2494_child" model="account.account.template">
+            <field name="code">2494</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2494"/>
+            <field name="type">other</field>
+            <field name="name">Anticipos sobre bienes muebles del Patrimonio Histórico</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2495" model="account.account.template">
+            <field name="code">2495</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_249"/>
+            <field name="type">view</field>
+            <field name="name">Desembolsos pendientes sobre participaciones en otras partes vinculadas</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2495_child" model="account.account.template">
+            <field name="code">2495</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2495"/>
+            <field name="type">other</field>
+            <field name="name">Desembolsos pendientes sobre participaciones en otras partes vinculadas</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_25" model="account.account.template">
+            <field name="code">25</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2"/>
+            <field name="type">view</field>
+            <field name="name">Otras inversiones financieras</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_250" model="account.account.template">
+            <field name="code">250</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_25"/>
+            <field name="type">view</field>
+            <field name="name">Inversiones financieras en instrumentos de patrimonio</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_250_child" model="account.account.template">
+            <field name="code">250</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_250"/>
+            <field name="type">other</field>
+            <field name="name">Inversiones financieras en instrumentos de patrimonio</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_251" model="account.account.template">
+            <field name="code">251</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_25"/>
+            <field name="type">view</field>
+            <field name="name">Valores representativos de deuda</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_251_child" model="account.account.template">
+            <field name="code">251</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_251"/>
+            <field name="type">other</field>
+            <field name="name">Valores representativos de deuda</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_252" model="account.account.template">
+            <field name="code">252</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_25"/>
+            <field name="type">view</field>
+            <field name="name">Créditos</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_252_child" model="account.account.template">
+            <field name="code">252</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_252"/>
+            <field name="type">other</field>
+            <field name="name">Créditos</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_253" model="account.account.template">
+            <field name="code">253</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_25"/>
+            <field name="type">view</field>
+            <field name="name">Créditos por enajenación de inmovilizado</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_253_child" model="account.account.template">
+            <field name="code">253</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_253"/>
+            <field name="type">other</field>
+            <field name="name">Créditos por enajenación de inmovilizado</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_254" model="account.account.template">
+            <field name="code">254</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_25"/>
+            <field name="type">view</field>
+            <field name="name">Créditos al personal</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_254_child" model="account.account.template">
+            <field name="code">254</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_254"/>
+            <field name="type">other</field>
+            <field name="name">Créditos al personal</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_255" model="account.account.template">
+            <field name="code">255</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_25"/>
+            <field name="type">view</field>
+            <field name="name">Activos por derivados financieros</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_255_child" model="account.account.template">
+            <field name="code">255</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_255"/>
+            <field name="type">other</field>
+            <field name="name">Activos por derivados financieros</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_258" model="account.account.template">
+            <field name="code">258</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_25"/>
+            <field name="type">view</field>
+            <field name="name">Imposiciones</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_258_child" model="account.account.template">
+            <field name="code">258</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_258"/>
+            <field name="type">other</field>
+            <field name="name">Imposiciones</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_259" model="account.account.template">
+            <field name="code">259</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_25"/>
+            <field name="type">view</field>
+            <field name="name">Desembolsos pendientes sobre participaciones en el patrimonio neto</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_259_child" model="account.account.template">
+            <field name="code">259</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_259"/>
+            <field name="type">other</field>
+            <field name="name">Desembolsos pendientes sobre participaciones en el patrimonio neto</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_26" model="account.account.template">
+            <field name="code">26</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2"/>
+            <field name="type">view</field>
+            <field name="name">Fianzas y depósitos constituidos</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_260" model="account.account.template">
+            <field name="code">260</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_26"/>
+            <field name="type">view</field>
+            <field name="name">Fianzas constituidas</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_260_child" model="account.account.template">
+            <field name="code">260</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_260"/>
+            <field name="type">other</field>
+            <field name="name">Fianzas constituidas</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_265" model="account.account.template">
+            <field name="code">265</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_26"/>
+            <field name="type">view</field>
+            <field name="name">Depósitos constituidos</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_265_child" model="account.account.template">
+            <field name="code">265</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_265"/>
+            <field name="type">other</field>
+            <field name="name">Depósitos constituidos</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_28" model="account.account.template">
+            <field name="code">28</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2"/>
+            <field name="type">view</field>
+            <field name="name">Amortización acumulada del inmovilizado y otras cuentas correctoras</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_280" model="account.account.template">
+            <field name="code">280</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_28"/>
+            <field name="type">view</field>
+            <field name="name">Amortización acumulada del inmovilizado intangible</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+
+        <record id="pgc_assoc_2800" model="account.account.template">
+            <field name="code">2800</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_280"/>
+            <field name="type">view</field>
+            <field name="name">Amortización acumulada de investigación</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2800_child" model="account.account.template">
+            <field name="code">2800</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2800"/>
+            <field name="type">other</field>
+            <field name="name">Amortización acumulada de investigación</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+
+
+        <record id="pgc_assoc_2801" model="account.account.template">
+            <field name="code">2801</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_280"/>
+            <field name="type">view</field>
+            <field name="name">Amortización acumulada de desarrollo</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2801_child" model="account.account.template">
+            <field name="code">2801</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2801"/>
+            <field name="type">other</field>
+            <field name="name">Amortización acumulada de desarrollo</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2802" model="account.account.template">
+            <field name="code">2802</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_280"/>
+            <field name="type">view</field>
+            <field name="name">Amortización acumulada de concesiones administrativas</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2802_child" model="account.account.template">
+            <field name="code">2802</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2802"/>
+            <field name="type">other</field>
+            <field name="name">Amortización acumulada de concesiones administrativas</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2803" model="account.account.template">
+            <field name="code">2803</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_280"/>
+            <field name="type">view</field>
+            <field name="name">Amortización acumulada de propiedad industrial</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2803_child" model="account.account.template">
+            <field name="code">2803</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2803"/>
+            <field name="type">other</field>
+            <field name="name">Amortización acumulada de propiedad industrial</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2805" model="account.account.template">
+            <field name="code">2805</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_280"/>
+            <field name="type">view</field>
+            <field name="name">Amortización acumulada de derechos de traspaso</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2805_child" model="account.account.template">
+            <field name="code">2805</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2805"/>
+            <field name="type">other</field>
+            <field name="name">Amortización acumulada de derechos de traspaso</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+
+        <record id="pgc_assoc_2806" model="account.account.template">
+            <field name="code">2806</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_280"/>
+            <field name="type">view</field>
+            <field name="name">Amortización acumulada de aplicaciones informáticas</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2806_child" model="account.account.template">
+            <field name="code">2806</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2806"/>
+            <field name="type">other</field>
+            <field name="name">Amortización acumulada de aplicaciones informáticas</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+
+        <record id="pgc_assoc_2807" model="account.account.template">
+            <field name="code">2807</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_280"/>
+            <field name="type">view</field>
+            <field name="name">Amortización acumulada de derechos sobre activos cedidos en uso</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2807_child" model="account.account.template">
+            <field name="code">2807</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2807"/>
+            <field name="type">other</field>
+            <field name="name">Amortización acumulada de derechos sobre activos cedidos en uso</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+
+
+
+        <record id="pgc_assoc_281" model="account.account.template">
+            <field name="code">281</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_28"/>
+            <field name="type">view</field>
+            <field name="name">Amortización acumulada del inmovilizado material</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2811" model="account.account.template">
+            <field name="code">2811</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_281"/>
+            <field name="type">view</field>
+            <field name="name">Amortización acumulada de construcciones</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2811_child" model="account.account.template">
+            <field name="code">2811</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2811"/>
+            <field name="type">other</field>
+            <field name="name">Amortización acumulada de construcciones</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2812" model="account.account.template">
+            <field name="code">2812</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_281"/>
+            <field name="type">view</field>
+            <field name="name">Amortización acumulada de instalaciones técnicas</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2812_child" model="account.account.template">
+            <field name="code">2812</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2812"/>
+            <field name="type">other</field>
+            <field name="name">Amortización acumulada de instalaciones técnicas</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2813" model="account.account.template">
+            <field name="code">2813</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_281"/>
+            <field name="type">view</field>
+            <field name="name">Amortización acumulada de maquinaria</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2813_child" model="account.account.template">
+            <field name="code">2813</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2813"/>
+            <field name="type">other</field>
+            <field name="name">Amortización acumulada de maquinaria</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2814" model="account.account.template">
+            <field name="code">2814</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_281"/>
+            <field name="type">view</field>
+            <field name="name">Amortización acumulada de utillaje</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2814_child" model="account.account.template">
+            <field name="code">2814</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2814"/>
+            <field name="type">other</field>
+            <field name="name">Amortización acumulada de utillaje</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2815" model="account.account.template">
+            <field name="code">2815</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_281"/>
+            <field name="type">view</field>
+            <field name="name">Amortización acumulada de otras instaciones</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2815_child" model="account.account.template">
+            <field name="code">2815</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2815"/>
+            <field name="type">other</field>
+            <field name="name">Amortización acumulada de otras instaciones</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2816" model="account.account.template">
+            <field name="code">2816</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_281"/>
+            <field name="type">view</field>
+            <field name="name">Amortización acumulada de mobiliario</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2816_child" model="account.account.template">
+            <field name="code">2816</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2816"/>
+            <field name="type">other</field>
+            <field name="name">Amortización acumulada de mobiliario</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2817" model="account.account.template">
+            <field name="code">2817</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_281"/>
+            <field name="type">view</field>
+            <field name="name">Amortización acumulada de equipos para proceso de información</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2817_child" model="account.account.template">
+            <field name="code">2817</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2817"/>
+            <field name="type">other</field>
+            <field name="name">Amortización acumulada de equipos para proceso de información</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2818" model="account.account.template">
+            <field name="code">2818</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_281"/>
+            <field name="type">view</field>
+            <field name="name">Amortización acumulada de elementos de transporte</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2818_child" model="account.account.template">
+            <field name="code">2818</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2818"/>
+            <field name="type">other</field>
+            <field name="name">Amortización acumulada de elementos de transporte</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2819" model="account.account.template">
+            <field name="code">2819</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_281"/>
+            <field name="type">view</field>
+            <field name="name">Amortización acumulada de otro inmovilizado material</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2819_child" model="account.account.template">
+            <field name="code">2819</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2819"/>
+            <field name="type">other</field>
+            <field name="name">Amortización acumulada de otro inmovilizado material</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_282" model="account.account.template">
+            <field name="code">282</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_28"/>
+            <field name="type">view</field>
+            <field name="name">Amortización acumulada de las inversiones inmobiliarias</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_282_child" model="account.account.template">
+            <field name="code">282</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_282"/>
+            <field name="type">other</field>
+            <field name="name">Amortización acumulada de las inversiones inmobiliarias</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+
+        <record id="pgc_assoc_283" model="account.account.template">
+            <field name="code">283</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_28"/>
+            <field name="type">view</field>
+            <field name="name">Cesiones de uso sin contraprestación</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2830" model="account.account.template">
+            <field name="code">2830</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_283"/>
+            <field name="type">view</field>
+            <field name="name">Cesiones de uso del inmovilizado intangible</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2830_child" model="account.account.template">
+            <field name="code">2830</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2830"/>
+            <field name="type">other</field>
+            <field name="name">Cesiones de uso del inmovilizado intangible</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+
+
+        <record id="pgc_assoc_2831" model="account.account.template">
+            <field name="code">2831</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_283"/>
+            <field name="type">view</field>
+            <field name="name">Cesiones de uso del inmovilizado material</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2831_child" model="account.account.template">
+            <field name="code">2831</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2831"/>
+            <field name="type">other</field>
+            <field name="name">Cesiones de uso del inmovilizado material</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+
+
+        <record id="pgc_assoc_2832" model="account.account.template">
+            <field name="code">2832</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_283"/>
+            <field name="type">view</field>
+            <field name="name">Cesiones de uso de las inversiones inmobiliarias</field>
+            <field name="user_type" ref="inmo"/>
+        </record>       
+
+
+        <record id="pgc_assoc_2832_child" model="account.account.template">
+            <field name="code">2832</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2832"/>
+            <field name="type">other</field>
+            <field name="name">Cesiones de uso de las inversiones inmobiliarias</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+
+
+        <record id="pgc_assoc_29" model="account.account.template">
+            <field name="code">29</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor de activos no corrientes</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_290" model="account.account.template">
+            <field name="code">290</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_29"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor del inmovilizado intangible</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2900" model="account.account.template">
+            <field name="code">2900</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_290"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro del valor de investigación</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2900_child" model="account.account.template">
+            <field name="code">2900</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2900"/>
+            <field name="type">other</field>
+            <field name="name">Deterioro del valor de investigación</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2901" model="account.account.template">
+            <field name="code">2901</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_290"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro del valor de desarrollo</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2901_child" model="account.account.template">
+            <field name="code">2901</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2901"/>
+            <field name="type">other</field>
+            <field name="name">Deterioro del valor de desarrollo</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2902" model="account.account.template">
+            <field name="code">2902</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_290"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro del valor de concesiones administrativas</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2902_child" model="account.account.template">
+            <field name="code">2902</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2902"/>
+            <field name="type">other</field>
+            <field name="name">Deterioro del valor de concesiones administrativas</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2903" model="account.account.template">
+            <field name="code">2903</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_290"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro del valor de propiedad industrial</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2903_child" model="account.account.template">
+            <field name="code">2903</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2903"/>
+            <field name="type">other</field>
+            <field name="name">Deterioro del valor de propiedad industrial</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2905" model="account.account.template">
+            <field name="code">2905</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_290"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro del valor de derechos de traspaso</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2905_child" model="account.account.template">
+            <field name="code">2905</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2905"/>
+            <field name="type">other</field>
+            <field name="name">Deterioro del valor de derechos de traspaso</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2906" model="account.account.template">
+            <field name="code">2906</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_290"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro del valor de aplicaciones informáticas</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2906_child" model="account.account.template">
+            <field name="code">2906</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2906"/>
+            <field name="type">other</field>
+            <field name="name">Deterioro del valor de aplicaciones informáticas</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+
+        <record id="pgc_assoc_2907" model="account.account.template">
+            <field name="code">2907</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_290"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro del valor sobre activos cedidos en uso</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2907_child" model="account.account.template">
+            <field name="code">2907</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2907"/>
+            <field name="type">other</field>
+            <field name="name">Deterioro del valor sobre activos cedidos en uso</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+
+
+
+
+        <record id="pgc_assoc_291" model="account.account.template">
+            <field name="code">291</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_29"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro del valor del inmovilizado material</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2910" model="account.account.template">
+            <field name="code">2910</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_291"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor de terrenos y bienes naturales</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2910_child" model="account.account.template">
+            <field name="code">2910</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2910"/>
+            <field name="type">other</field>
+            <field name="name">Deterioro de valor de terrenos y bienes naturales</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2911" model="account.account.template">
+            <field name="code">2911</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_291"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor de construcciones</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2911_child" model="account.account.template">
+            <field name="code">2911</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2911"/>
+            <field name="type">other</field>
+            <field name="name">Deterioro de valor de construcciones</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2912" model="account.account.template">
+            <field name="code">2912</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_291"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor de instalaciones técnicas</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2912_child" model="account.account.template">
+            <field name="code">2912</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2912"/>
+            <field name="type">other</field>
+            <field name="name">Deterioro de valor de instalaciones técnicas</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2913" model="account.account.template">
+            <field name="code">2913</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_291"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor de maquinaria</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2913_child" model="account.account.template">
+            <field name="code">2913</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2913"/>
+            <field name="type">other</field>
+            <field name="name">Deterioro de valor de maquinaria</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2914" model="account.account.template">
+            <field name="code">2914</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_291"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor de utillaje</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2914_child" model="account.account.template">
+            <field name="code">2914</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2914"/>
+            <field name="type">other</field>
+            <field name="name">Deterioro de valor de utillaje</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2915" model="account.account.template">
+            <field name="code">2915</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_291"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor de otras instaciones</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2915_child" model="account.account.template">
+            <field name="code">2915</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2915"/>
+            <field name="type">other</field>
+            <field name="name">Deterioro de valor de otras instaciones</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2916" model="account.account.template">
+            <field name="code">2916</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_291"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor de mobiliario</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2916_child" model="account.account.template">
+            <field name="code">2916</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2916"/>
+            <field name="type">other</field>
+            <field name="name">Deterioro de valor de mobiliario</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2917" model="account.account.template">
+            <field name="code">2917</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_291"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor de equipos para proceso de información</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2917_child" model="account.account.template">
+            <field name="code">2917</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2917"/>
+            <field name="type">other</field>
+            <field name="name">Deterioro de valor de equipos para proceso de información</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2918" model="account.account.template">
+            <field name="code">2918</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_291"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor de elementos de transporte</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2918_child" model="account.account.template">
+            <field name="code">2918</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2918"/>
+            <field name="type">other</field>
+            <field name="name">Deterioro de valor de elementos de transporte</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2919" model="account.account.template">
+            <field name="code">2919</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_291"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor de otro inmovilizado material</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2919_child" model="account.account.template">
+            <field name="code">2919</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2919"/>
+            <field name="type">other</field>
+            <field name="name">Deterioro de valor de otro inmovilizado material</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_292" model="account.account.template">
+            <field name="code">292</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_29"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor de las inversiones inmobiliarias</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2920" model="account.account.template">
+            <field name="code">2920</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_292"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor de los terrenos y bienes naturales</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2920_child" model="account.account.template">
+            <field name="code">2920</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2920"/>
+            <field name="type">other</field>
+            <field name="name">Deterioro de valor de los terrenos y bienes naturales</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2921" model="account.account.template">
+            <field name="code">2921</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_292"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor de construcciones</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2921_child" model="account.account.template">
+            <field name="code">2921</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2921"/>
+            <field name="type">other</field>
+            <field name="name">Deterioro de valor de construcciones</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_293" model="account.account.template">
+            <field name="code">293</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_29"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor de participaciones en partes vinculadas</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2933" model="account.account.template">
+            <field name="code">2933</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_293"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor de participaciones en empresas del grupo</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2933_child" model="account.account.template">
+            <field name="code">2933</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2933"/>
+            <field name="type">other</field>
+            <field name="name">Deterioro de valor de participaciones en empresas del grupo</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2934" model="account.account.template">
+            <field name="code">2934</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_293"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor de participaciones en empresas asociadas</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2934_child" model="account.account.template">
+            <field name="code">2934</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2934"/>
+            <field name="type">other</field>
+            <field name="name">Deterioro de valor de participaciones en empresas asociadas</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2935" model="account.account.template">
+            <field name="code">2935</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_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="inmo"/>
+        </record>
+        <record id="pgc_assoc_2935_child" model="account.account.template">
+            <field name="code">2935</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_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="inmo"/>
+        </record>
+        <record id="pgc_assoc_294" model="account.account.template">
+            <field name="code">294</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_29"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor de valores representativos de deuda de partes vinculadas</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2943" model="account.account.template">
+            <field name="code">2943</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_294"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor de valores representativos de deuda de empresas del grupo</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2943_child" model="account.account.template">
+            <field name="code">2943</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2943"/>
+            <field name="type">other</field>
+            <field name="name">Deterioro de valor de valores representativos de deuda de empresas del grupo</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2944" model="account.account.template">
+            <field name="code">2944</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_294"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor de valores representativos de deuda de empresas asociadas</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2944_child" model="account.account.template">
+            <field name="code">2944</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2944"/>
+            <field name="type">other</field>
+            <field name="name">Deterioro de valor de valores representativos de deuda de empresas asociadas</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2945" model="account.account.template">
+            <field name="code">2945</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_294"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor de valores representativos de deuda de otras partes vinculadas</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2945_child" model="account.account.template">
+            <field name="code">2945</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2945"/>
+            <field name="type">other</field>
+            <field name="name">Deterioro de valor de valores representativos de deuda de otras partes vinculadas</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_295" model="account.account.template">
+            <field name="code">295</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_29"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor de créditos a partes vinculadas</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2953" model="account.account.template">
+            <field name="code">2953</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_295"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor de créditos a empresas del grupo</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2953_child" model="account.account.template">
+            <field name="code">2953</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2953"/>
+            <field name="type">other</field>
+            <field name="name">Deterioro de valor de créditos a empresas del grupo</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2954" model="account.account.template">
+            <field name="code">2954</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_295"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor de créditos a empresas asociadas</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2954_child" model="account.account.template">
+            <field name="code">2954</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2954"/>
+            <field name="type">other</field>
+            <field name="name">Deterioro de valor de créditos a empresas asociadas</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2955" model="account.account.template">
+            <field name="code">2955</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_295"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor de créditos a otras partes vinculadas</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2955_child" model="account.account.template">
+            <field name="code">2955</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2955"/>
+            <field name="type">other</field>
+            <field name="name">Deterioro de valor de créditos a otras partes vinculadas</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_296" model="account.account.template">
+            <field name="code">296</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_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="inmo"/>
+        </record>
+        <record id="pgc_assoc_296_child" model="account.account.template">
+            <field name="code">296</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_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="inmo"/>
+        </record>
+        <record id="pgc_assoc_297" model="account.account.template">
+            <field name="code">297</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_29"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor de valores representativos de deuda</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_297_child" model="account.account.template">
+            <field name="code">297</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_297"/>
+            <field name="type">other</field>
+            <field name="name">Deterioro de valor de valores representativos de deuda</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+
+        <record id="pgc_assoc_298" model="account.account.template">
+            <field name="code">298</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_29"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor de créditos</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_298_child" model="account.account.template">
+            <field name="code">298</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_298"/>
+            <field name="type">other</field>
+            <field name="name">Deterioro de valor de créditos</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+
+        <record id="pgc_assoc_299" model="account.account.template">
+            <field name="code">299</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_29"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor de bienes del Patrimonio Histórico</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_299_child" model="account.account.template">
+            <field name="code">299</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_299"/>
+            <field name="type">other</field>
+            <field name="name">Deterioro de valor de bienes del Patrimonio Histórico</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+
+        <record id="pgc_assoc_2990" model="account.account.template">
+            <field name="code">2990</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_299"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor de bienes inmuebles</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+<!--
+        <record id="pgc_assoc_2990_child" model="account.account.template">
+            <field name="code">2990</field>
+            <field name="reconcile" eval="False"/>    
+            <field name="parent_id" ref="pgc_assoc_2990"/>
+            <field name="type">other</field>
+            <field name="name">Deterioro de valor de bienes inmuebles</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+-->
+        <record id="pgc_assoc_2991" model="account.account.template">
+            <field name="code">2991</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_299"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor de archivos</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2991_child" model="account.account.template">
+            <field name="code">2991</field>
+            <field name="reconcile" eval="False"/>     
+            <field name="parent_id" ref="pgc_assoc_2991"/>
+            <field name="type">other</field>
+            <field name="name">Deterioro de valor de archivos</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+
+
+        <record id="pgc_assoc_2992" model="account.account.template">
+            <field name="code">2992</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_299"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor de bibliotecas</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2992_child" model="account.account.template">
+            <field name="code">2992</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2992"/>
+            <field name="type">other</field>
+            <field name="name">Deterioro de valor de bibliotecas</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+
+        <record id="pgc_assoc_2993" model="account.account.template">
+            <field name="code">2993</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_299"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor de Museos</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2993_child" model="account.account.template">
+            <field name="code">2993</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2993"/>
+            <field name="type">other</field>
+            <field name="name">Deterioro de valor de Museos</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+
+
+        <record id="pgc_assoc_2994" model="account.account.template">
+            <field name="code">2994</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_299"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor de bienes muebles</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2994_child" model="account.account.template">
+            <field name="code">2994</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2994"/>
+            <field name="type">other</field>
+            <field name="name">Deterioro de valor de bienes muebles</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+
+
+        <record id="pgc_assoc_3" model="account.account.template">
+            <field name="code">3</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_0"/>
+            <field name="type">view</field>
+            <field name="name">Existencias</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_30" model="account.account.template">
+            <field name="code">30</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_3"/>
+            <field name="type">view</field>
+            <field name="name">Bienes destinados a la actividad</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_300" model="account.account.template">
+            <field name="code">300</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_30"/>
+            <field name="type">view</field>
+            <field name="name">Mercaderías A</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_300_child" model="account.account.template">
+            <field name="code">300</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_300"/>
+            <field name="type">other</field>
+            <field name="name">Mercaderías A</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_301" model="account.account.template">
+            <field name="code">301</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_30"/>
+            <field name="type">view</field>
+            <field name="name">Mercaderías B</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_301_child" model="account.account.template">
+            <field name="code">301</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_301"/>
+            <field name="type">other</field>
+            <field name="name">Mercaderías B</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_31" model="account.account.template">
+            <field name="code">31</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_3"/>
+            <field name="type">view</field>
+            <field name="name">Materias Primas</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_310" model="account.account.template">
+            <field name="code">310</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_31"/>
+            <field name="type">view</field>
+            <field name="name">Materias Primas A</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_310_child" model="account.account.template">
+            <field name="code">310</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_310"/>
+            <field name="type">other</field>
+            <field name="name">Materias Primas A</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_311" model="account.account.template">
+            <field name="code">311</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_31"/>
+            <field name="type">view</field>
+            <field name="name">Materias Primas B</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_311_child" model="account.account.template">
+            <field name="code">311</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_311"/>
+            <field name="type">other</field>
+            <field name="name">Materias Primas B</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_32" model="account.account.template">
+            <field name="code">32</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_3"/>
+            <field name="type">view</field>
+            <field name="name">Otros aprovisionamientos</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_320" model="account.account.template">
+            <field name="code">320</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_32"/>
+            <field name="type">view</field>
+            <field name="name">Elementos y conjuntos incorporables</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_320_child" model="account.account.template">
+            <field name="code">320</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_320"/>
+            <field name="type">other</field>
+            <field name="name">Elementos y conjuntos incorporables</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_321" model="account.account.template">
+            <field name="code">321</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_32"/>
+            <field name="type">view</field>
+            <field name="name">Combustibles</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_321_child" model="account.account.template">
+            <field name="code">321</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_321"/>
+            <field name="type">other</field>
+            <field name="name">Combustibles</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_322" model="account.account.template">
+            <field name="code">322</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_32"/>
+            <field name="type">view</field>
+            <field name="name">Repuestos</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_322_child" model="account.account.template">
+            <field name="code">322</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_322"/>
+            <field name="type">other</field>
+            <field name="name">Repuestos</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_325" model="account.account.template">
+            <field name="code">325</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_32"/>
+            <field name="type">view</field>
+            <field name="name">Materiales diversos</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_325_child" model="account.account.template">
+            <field name="code">325</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_325"/>
+            <field name="type">other</field>
+            <field name="name">Materiales diversos</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_326" model="account.account.template">
+            <field name="code">326</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_32"/>
+            <field name="type">view</field>
+            <field name="name">Embalajes</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_326_child" model="account.account.template">
+            <field name="code">326</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_326"/>
+            <field name="type">other</field>
+            <field name="name">Embalajes</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_327" model="account.account.template">
+            <field name="code">327</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_32"/>
+            <field name="type">view</field>
+            <field name="name">Envases</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_327_child" model="account.account.template">
+            <field name="code">327</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_327"/>
+            <field name="type">other</field>
+            <field name="name">Envases</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_328" model="account.account.template">
+            <field name="code">328</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_32"/>
+            <field name="type">view</field>
+            <field name="name">Material de oficina</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_328_child" model="account.account.template">
+            <field name="code">328</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_328"/>
+            <field name="type">other</field>
+            <field name="name">Material de oficina</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_33" model="account.account.template">
+            <field name="code">33</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_3"/>
+            <field name="type">view</field>
+            <field name="name">Productos en curso</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_330" model="account.account.template">
+            <field name="code">330</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_33"/>
+            <field name="type">view</field>
+            <field name="name">Productos en curso A</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_330_child" model="account.account.template">
+            <field name="code">330</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_330"/>
+            <field name="type">other</field>
+            <field name="name">Productos en curso A</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_331" model="account.account.template">
+            <field name="code">331</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_33"/>
+            <field name="type">view</field>
+            <field name="name">Productos en curso B</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_331_child" model="account.account.template">
+            <field name="code">331</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_331"/>
+            <field name="type">other</field>
+            <field name="name">Productos en curso B</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_34" model="account.account.template">
+            <field name="code">34</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_3"/>
+            <field name="type">view</field>
+            <field name="name">Productos semiterminados</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_340" model="account.account.template">
+            <field name="code">340</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_34"/>
+            <field name="type">view</field>
+            <field name="name">Productos semiterminados A</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_340_child" model="account.account.template">
+            <field name="code">340</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_340"/>
+            <field name="type">other</field>
+            <field name="name">Productos semiterminados A</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_341" model="account.account.template">
+            <field name="code">341</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_34"/>
+            <field name="type">view</field>
+            <field name="name">Productos semiterminados B</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_341_child" model="account.account.template">
+            <field name="code">341</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_341"/>
+            <field name="type">other</field>
+            <field name="name">Productos semiterminados B</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_35" model="account.account.template">
+            <field name="code">35</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_3"/>
+            <field name="type">view</field>
+            <field name="name">Productos terminados</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_350" model="account.account.template">
+            <field name="code">350</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_35"/>
+            <field name="type">view</field>
+            <field name="name">Productos terminados A</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_350_child" model="account.account.template">
+            <field name="code">350</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_350"/>
+            <field name="type">other</field>
+            <field name="name">Productos terminados A</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_351" model="account.account.template">
+            <field name="code">351</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_35"/>
+            <field name="type">view</field>
+            <field name="name">Productos terminados B</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_351_child" model="account.account.template">
+            <field name="code">351</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_351"/>
+            <field name="type">other</field>
+            <field name="name">Productos terminados B</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_36" model="account.account.template">
+            <field name="code">36</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_3"/>
+            <field name="type">view</field>
+            <field name="name">Subproductos, residuos y materiales recuperados</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_360" model="account.account.template">
+            <field name="code">360</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_36"/>
+            <field name="type">view</field>
+            <field name="name">Subproductos A</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_360_child" model="account.account.template">
+            <field name="code">360</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_360"/>
+            <field name="type">other</field>
+            <field name="name">Subproductos A</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_361" model="account.account.template">
+            <field name="code">361</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_36"/>
+            <field name="type">view</field>
+            <field name="name">Subproductos B</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_361_child" model="account.account.template">
+            <field name="code">361</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_361"/>
+            <field name="type">other</field>
+            <field name="name">Subproductos B</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_365" model="account.account.template">
+            <field name="code">365</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_36"/>
+            <field name="type">view</field>
+            <field name="name">Residuos A</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_365_child" model="account.account.template">
+            <field name="code">365</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_365"/>
+            <field name="type">other</field>
+            <field name="name">Residuos A</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_366" model="account.account.template">
+            <field name="code">366</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_36"/>
+            <field name="type">view</field>
+            <field name="name">Residuos B</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_366_child" model="account.account.template">
+            <field name="code">366</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_366"/>
+            <field name="type">other</field>
+            <field name="name">Residuos B</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_368" model="account.account.template">
+            <field name="code">368</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_36"/>
+            <field name="type">view</field>
+            <field name="name">Materiales recuperados A</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_368_child" model="account.account.template">
+            <field name="code">368</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_368"/>
+            <field name="type">other</field>
+            <field name="name">Materiales recuperados A</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_369" model="account.account.template">
+            <field name="code">369</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_36"/>
+            <field name="type">view</field>
+            <field name="name">Materiales recuperados B</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_369_child" model="account.account.template">
+            <field name="code">369</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_369"/>
+            <field name="type">other</field>
+            <field name="name">Materiales recuperados B</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_39" model="account.account.template">
+            <field name="code">39</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_3"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor de las existencias</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_390" model="account.account.template">
+            <field name="code">390</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_39"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor de bienes destinados a la actividad</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_390_child" model="account.account.template">
+            <field name="code">390</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_390"/>
+            <field name="type">other</field>
+            <field name="name">Deterioro de valor de bienes destinados a la actividad</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_391" model="account.account.template">
+            <field name="code">391</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_39"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor de las materias primas</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_391_child" model="account.account.template">
+            <field name="code">391</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_391"/>
+            <field name="type">other</field>
+            <field name="name">Deterioro de valor de las materias primas</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_392" model="account.account.template">
+            <field name="code">392</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_39"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor de otros aprovisionamientos</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_392_child" model="account.account.template">
+            <field name="code">392</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_392"/>
+            <field name="type">other</field>
+            <field name="name">Deterioro de valor de otros aprovisionamientos</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_393" model="account.account.template">
+            <field name="code">393</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_39"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor de los productos en curso</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_393_child" model="account.account.template">
+            <field name="code">393</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_393"/>
+            <field name="type">other</field>
+            <field name="name">Deterioro de valor de los productos en curso</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_394" model="account.account.template">
+            <field name="code">394</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_39"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor de los productos semiterminados</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_394_child" model="account.account.template">
+            <field name="code">394</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_394"/>
+            <field name="type">other</field>
+            <field name="name">Deterioro de valor de los productos semiterminados</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_395" model="account.account.template">
+            <field name="code">395</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_39"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor de los productos terminados</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_395_child" model="account.account.template">
+            <field name="code">395</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_395"/>
+            <field name="type">other</field>
+            <field name="name">Deterioro de valor de los productos terminados</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_396" model="account.account.template">
+            <field name="code">396</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_39"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor de los subproductos, residuos y materiales recuperados</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_396_child" model="account.account.template">
+            <field name="code">396</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_396"/>
+            <field name="type">other</field>
+            <field name="name">Deterioro de valor de los subproductos, residuos y materiales recuperados</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_4" model="account.account.template">
+            <field name="code">4</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_0"/>
+            <field name="type">view</field>
+            <field name="name">Acreedores y deudores por operaciones de la actividad</field>
+            <field name="user_type" ref="terceros"/>
+        </record>
+        <record id="pgc_assoc_40" model="account.account.template">
+            <field name="code">40</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_4"/>
+            <field name="type">view</field>
+            <field name="name">Proveedores</field>
+            <field name="user_type" ref="terceros_-_pay"/>
+        </record>
+        <record id="pgc_assoc_400" model="account.account.template">
+            <field name="code">400</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_40"/>
+            <field name="type">view</field>
+            <field name="name">Proveedores</field>
+            <field name="user_type" ref="terceros_-_pay"/>
+        </record>
+        <record id="pgc_assoc_4000" model="account.account.template">
+            <field name="code">4000</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_400"/>
+            <field name="type">view</field>
+            <field name="name">Proveedores (euros)</field>
+            <field name="user_type" ref="terceros_-_pay"/>
+        </record>
+        <record id="pgc_assoc_4000_child" model="account.account.template">
+            <field name="code">4000</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_4000"/>
+            <field name="type">payable</field>
+            <field name="name">Proveedores (euros)</field>
+            <field name="user_type" ref="terceros_-_pay"/>
+        </record>
+        <record id="pgc_assoc_4004" model="account.account.template">
+            <field name="code">4004</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_400"/>
+            <field name="type">view</field>
+            <field name="name">Proveedores (moneda extranjera)</field>
+            <field name="user_type" ref="terceros_-_pay"/>
+        </record>
+        <record id="pgc_assoc_4004_child" model="account.account.template">
+            <field name="code">4004</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_4004"/>
+            <field name="type">payable</field>
+            <field name="name">Proveedores (moneda extranjera)</field>
+            <field name="user_type" ref="terceros_-_pay"/>
+        </record>
+        <record id="pgc_assoc_4009" model="account.account.template">
+            <field name="code">4009</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_400"/>
+            <field name="type">view</field>
+            <field name="name">Proveedores, facturas pendientes de recibir o de formalizar</field>
+            <field name="user_type" ref="terceros_-_pay"/>
+        </record>
+        <record id="pgc_assoc_4009_child" model="account.account.template">
+            <field name="code">4009</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_4009"/>
+            <field name="type">payable</field>
+            <field name="name">Proveedores, facturas pendientes de recibir o de formalizar</field>
+            <field name="user_type" ref="terceros_-_pay"/>
+        </record>
+        <record id="pgc_assoc_401" model="account.account.template">
+            <field name="code">401</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_40"/>
+            <field name="type">view</field>
+            <field name="name">Proveedores, efectos comerciales a pagar</field>
+            <field name="user_type" ref="terceros_-_pay"/>
+        </record>
+        <record id="pgc_assoc_401_child" model="account.account.template">
+            <field name="code">401</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_401"/>
+            <field name="type">other</field>
+            <field name="name">Proveedores, efectos comerciales a pagar</field>
+            <field name="user_type" ref="terceros_-_pay"/>
+        </record>
+        <record id="pgc_assoc_403" model="account.account.template">
+            <field name="code">403</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_40"/>
+            <field name="type">view</field>
+            <field name="name">Proveedores, empresas del grupo</field>
+            <field name="user_type" ref="terceros_-_pay"/>
+        </record>
+        <record id="pgc_assoc_4030" model="account.account.template">
+            <field name="code">4030</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_403"/>
+            <field name="type">view</field>
+            <field name="name">Proveedores, empresas del grupo (euros)</field>
+            <field name="user_type" ref="terceros_-_pay"/>
+        </record>
+        <record id="pgc_assoc_4030_child" model="account.account.template">
+            <field name="code">4030</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_4030"/>
+            <field name="type">payable</field>
+            <field name="name">Proveedores, empresas del grupo (euros)</field>
+            <field name="user_type" ref="terceros_-_pay"/>
+        </record>
+        <record id="pgc_assoc_4031" model="account.account.template">
+            <field name="code">4031</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_403"/>
+            <field name="type">view</field>
+            <field name="name">Efectos comerciales a pagar, empresas del grupo</field>
+            <field name="user_type" ref="terceros_-_pay"/>
+        </record>
+        <record id="pgc_assoc_4031_child" model="account.account.template">
+            <field name="code">4031</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_4031"/>
+            <field name="type">payable</field>
+            <field name="name">Efectos comerciales a pagar, empresas del grupo</field>
+            <field name="user_type" ref="terceros_-_pay"/>
+        </record>
+        <record id="pgc_assoc_4034" model="account.account.template">
+            <field name="code">4034</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_403"/>
+            <field name="type">view</field>
+            <field name="name">Proveedores, empresas del grupo (moneda extranjera)</field>
+            <field name="user_type" ref="terceros_-_pay"/>
+        </record>
+        <record id="pgc_assoc_4034_child" model="account.account.template">
+            <field name="code">4034</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_4034"/>
+            <field name="type">payable</field>
+            <field name="name">Proveedores, empresas del grupo (moneda extranjera)</field>
+            <field name="user_type" ref="terceros_-_pay"/>
+        </record>
+        <record id="pgc_assoc_4036" model="account.account.template">
+            <field name="code">4036</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_403"/>
+            <field name="type">view</field>
+            <field name="name">Envases y embalajes a devolver a proveedores, empresas del grupo</field>
+            <field name="user_type" ref="terceros_-_pay"/>
+        </record>
+        <record id="pgc_assoc_4036_child" model="account.account.template">
+            <field name="code">4036</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_4036"/>
+            <field name="type">payable</field>
+            <field name="name">Envases y embalajes a devolver a proveedores, empresas del grupo</field>
+            <field name="user_type" ref="terceros_-_pay"/>
+        </record>
+        <record id="pgc_assoc_4039" model="account.account.template">
+            <field name="code">4039</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_403"/>
+            <field name="type">view</field>
+            <field name="name">Proveedores, empresas del grupo, facturas pendientes de recibir o de formalizar</field>
+            <field name="user_type" ref="terceros_-_pay"/>
+        </record>
+        <record id="pgc_assoc_4039_child" model="account.account.template">
+            <field name="code">4039</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_4039"/>
+            <field name="type">payable</field>
+            <field name="name">Proveedores, empresas del grupo, facturas pendientes de recibir o de formalizar</field>
+            <field name="user_type" ref="terceros_-_pay"/>
+        </record>
+        <record id="pgc_assoc_404" model="account.account.template">
+            <field name="code">404</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_40"/>
+            <field name="type">view</field>
+            <field name="name">Proveedores, empresas asociadas</field>
+            <field name="user_type" ref="terceros_-_pay"/>
+        </record>
+        <record id="pgc_assoc_404_child" model="account.account.template">
+            <field name="code">404</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_404"/>
+            <field name="type">other</field>
+            <field name="name">Proveedores, empresas asociadas</field>
+            <field name="user_type" ref="terceros_-_pay"/>
+        </record>
+        <record id="pgc_assoc_405" model="account.account.template">
+            <field name="code">405</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_40"/>
+            <field name="type">view</field>
+            <field name="name">Proveedores, otras partes vinculadas</field>
+            <field name="user_type" ref="terceros_-_pay"/>
+        </record>
+        <record id="pgc_assoc_405_child" model="account.account.template">
+            <field name="code">405</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_405"/>
+            <field name="type">other</field>
+            <field name="name">Proveedores, otras partes vinculadas</field>
+            <field name="user_type" ref="terceros_-_pay"/>
+        </record>
+        <record id="pgc_assoc_406" model="account.account.template">
+            <field name="code">406</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_40"/>
+            <field name="type">view</field>
+            <field name="name">Envases y embalajes a devolver a proveedores</field>
+            <field name="user_type" ref="terceros_-_pay"/>
+        </record>
+        <record id="pgc_assoc_406_child" model="account.account.template">
+            <field name="code">406</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_406"/>
+            <field name="type">other</field>
+            <field name="name">Envases y embalajes a devolver a proveedores</field>
+            <field name="user_type" ref="terceros_-_pay"/>
+        </record>
+        <record id="pgc_assoc_407" model="account.account.template">
+            <field name="code">407</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_40"/>
+            <field name="type">view</field>
+            <field name="name">Anticipos a proveedores</field>
+            <field name="user_type" ref="terceros_-_pay"/>
+        </record>
+        <record id="pgc_assoc_407_child" model="account.account.template">
+            <field name="code">407</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_407"/>
+            <field name="type">other</field>
+            <field name="name">Anticipos a proveedores</field>
+            <field name="user_type" ref="terceros_-_pay"/>
+        </record>
+        <record id="pgc_assoc_41" model="account.account.template">
+            <field name="code">41</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_4"/>
+            <field name="type">view</field>
+            <field name="name">Benerificiarios y acreedores varios</field>
+            <field name="user_type" ref="terceros_-_pay"/>
+        </record>
+        <record id="pgc_assoc_410" model="account.account.template">
+            <field name="code">410</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_41"/>
+            <field name="type">view</field>
+            <field name="name">Acreedores por prestaciones de servicios</field>
+            <field name="user_type" ref="terceros_-_pay"/>
+        </record>
+        <record id="pgc_assoc_4100" model="account.account.template">
+            <field name="code">4100</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_410"/>
+            <field name="type">view</field>
+            <field name="name">Acreedores por prestaciones de servicios (euros)</field>
+            <field name="user_type" ref="terceros_-_pay"/>
+        </record>
+        <record id="pgc_assoc_4100_child" model="account.account.template">
+            <field name="code">4100</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_4100"/>
+            <field name="type">payable</field>
+            <field name="name">Acreedores por prestaciones de servicios (euros)</field>
+            <field name="user_type" ref="terceros_-_pay"/>
+        </record>
+        <record id="pgc_assoc_4104" model="account.account.template">
+            <field name="code">4104</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_410"/>
+            <field name="type">view</field>
+            <field name="name">Acreedores por prestaciones de servicios (moneda extranjera)</field>
+            <field name="user_type" ref="terceros_-_pay"/>
+        </record>
+        <record id="pgc_assoc_4104_child" model="account.account.template">
+            <field name="code">4104</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_4104"/>
+            <field name="type">payable</field>
+            <field name="name">Acreedores por prestaciones de servicios (moneda extranjera)</field>
+            <field name="user_type" ref="terceros_-_pay"/>
+        </record>
+        <record id="pgc_assoc_4109" model="account.account.template">
+            <field name="code">4109</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_410"/>
+            <field name="type">view</field>
+            <field name="name">Acreedores por prestaciones de servicios, facturas pendientes de recibir o de formalizar</field>
+            <field name="user_type" ref="terceros_-_pay"/>
+        </record>
+        <record id="pgc_assoc_4109_child" model="account.account.template">
+            <field name="code">4109</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_4109"/>
+            <field name="type">payable</field>
+            <field name="name">Acreedores por prestaciones de servicios, facturas pendientes de recibir o de formalizar</field>
+            <field name="user_type" ref="terceros_-_pay"/>
+        </record>
+        <record id="pgc_assoc_411" model="account.account.template">
+            <field name="code">411</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_41"/>
+            <field name="type">view</field>
+            <field name="name">Acreedores, efectos comerciales a pagar</field>
+            <field name="user_type" ref="terceros_-_pay"/>
+        </record>
+        <record id="pgc_assoc_411_child" model="account.account.template">
+            <field name="code">411</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_411"/>
+            <field name="type">other</field>
+            <field name="name">Acreedores, efectos comerciales a pagar</field>
+            <field name="user_type" ref="terceros_-_pay"/>
+        </record>
+        <record id="pgc_assoc_412" model="account.account.template">
+            <field name="code">412</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_41"/>
+            <field name="type">view</field>
+            <field name="name">Beneficiarios, acreedores</field>
+            <field name="user_type" ref="terceros_-_pay"/>
+        </record>
+        <record id="pgc_assoc_412_child" model="account.account.template">
+            <field name="code">412</field>
+            <field name="reconcile" eval="True"/> 
+            <field name="parent_id" ref="pgc_assoc_412"/>
+            <field name="type">other</field>
+            <field name="name">Beneficiarios, acreedores</field>
+            <field name="user_type" ref="terceros_-_pay"/>
+        </record>
+
+
+
+
+
+        <record id="pgc_assoc_419" model="account.account.template">
+            <field name="code">419</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_41"/>
+            <field name="type">view</field>
+            <field name="name">Acreedores por operaciones en común</field>
+            <field name="user_type" ref="terceros_-_pay"/>
+        </record>
+        <record id="pgc_assoc_419_child" model="account.account.template">
+            <field name="code">419</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_419"/>
+            <field name="type">other</field>
+            <field name="name">Acreedores por operaciones en común</field>
+            <field name="user_type" ref="terceros_-_pay"/>
+        </record>
+        <record id="pgc_assoc_43" model="account.account.template">
+            <field name="code">43</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_4"/>
+            <field name="type">view</field>
+            <field name="name">Clientes</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_430" model="account.account.template">
+            <field name="code">430</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_43"/>
+            <field name="type">view</field>
+            <field name="name">Clientes</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_4300" model="account.account.template">
+            <field name="code">4300</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_430"/>
+            <field name="type">view</field>
+            <field name="name">Clientes (euros)</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_4300_child" model="account.account.template">
+            <field name="code">4300</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_4300"/>
+            <field name="type">receivable</field>
+            <field name="name">Clientes (euros)</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_4304" model="account.account.template">
+            <field name="code">4304</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_430"/>
+            <field name="type">view</field>
+            <field name="name">Clientes (moneda extranjera)</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_4304_child" model="account.account.template">
+            <field name="code">4304</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_4304"/>
+            <field name="type">receivable</field>
+            <field name="name">Clientes (moneda extranjera)</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_4309" model="account.account.template">
+            <field name="code">4309</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_430"/>
+            <field name="type">view</field>
+            <field name="name">Clientes, facturas pendientes de recibir o de formalizar</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_4309_child" model="account.account.template">
+            <field name="code">4309</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_4309"/>
+            <field name="type">receivable</field>
+            <field name="name">Clientes, facturas pendientes de recibir o de formalizar</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_431" model="account.account.template">
+            <field name="code">431</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_43"/>
+            <field name="type">view</field>
+            <field name="name">Clientes, efectos comerciales a cobrar</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_4310" model="account.account.template">
+            <field name="code">4310</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_431"/>
+            <field name="type">view</field>
+            <field name="name">Efectos comerciales en cartera</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_4310_child" model="account.account.template">
+            <field name="code">4310</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_4310"/>
+            <field name="type">receivable</field>
+            <field name="name">Efectos comerciales en cartera</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_4311" model="account.account.template">
+            <field name="code">4311</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_431"/>
+            <field name="type">view</field>
+            <field name="name">Efectos comerciales descontados</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_4311_child" model="account.account.template">
+            <field name="code">4311</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_4311"/>
+            <field name="type">receivable</field>
+            <field name="name">Efectos comerciales descontados</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_4312" model="account.account.template">
+            <field name="code">4312</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_431"/>
+            <field name="type">view</field>
+            <field name="name">Efectos comerciales en gestión de cobro</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_4312_child" model="account.account.template">
+            <field name="code">4312</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_4312"/>
+            <field name="type">receivable</field>
+            <field name="name">Efectos comerciales en gestión de cobro</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_4315" model="account.account.template">
+            <field name="code">4315</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_431"/>
+            <field name="type">view</field>
+            <field name="name">Efectos comerciales impagados</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_4315_child" model="account.account.template">
+            <field name="code">4315</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_4315"/>
+            <field name="type">receivable</field>
+            <field name="name">Efectos comerciales impagados</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_432" model="account.account.template">
+            <field name="code">432</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_43"/>
+            <field name="type">view</field>
+            <field name="name">Clientes, operaciones de factoring</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_432_child" model="account.account.template">
+            <field name="code">432</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_432"/>
+            <field name="type">other</field>
+            <field name="name">Clientes, operaciones de factoring</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_433" model="account.account.template">
+            <field name="code">433</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_43"/>
+            <field name="type">view</field>
+            <field name="name">Clientes, empresas del grupo</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_4330" model="account.account.template">
+            <field name="code">4330</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_433"/>
+            <field name="type">view</field>
+            <field name="name">Clientes empresas del grupo (euros)</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_4330_child" model="account.account.template">
+            <field name="code">4330</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_4330"/>
+            <field name="type">receivable</field>
+            <field name="name">Clientes empresas del grupo (euros)</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_4331" model="account.account.template">
+            <field name="code">4331</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_433"/>
+            <field name="type">view</field>
+            <field name="name">Efectos comerciales a cobrar, empresas del grupo</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_4331_child" model="account.account.template">
+            <field name="code">4331</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_4331"/>
+            <field name="type">receivable</field>
+            <field name="name">Efectos comerciales a cobrar, empresas del grupo</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_4332" model="account.account.template">
+            <field name="code">4332</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_433"/>
+            <field name="type">view</field>
+            <field name="name">Clientes empresas del grupo, operaciones de factoring</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_4332_child" model="account.account.template">
+            <field name="code">4332</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_4332"/>
+            <field name="type">receivable</field>
+            <field name="name">Clientes empresas del grupo, operaciones de factoring</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_4334" model="account.account.template">
+            <field name="code">4334</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_433"/>
+            <field name="type">view</field>
+            <field name="name">Clientes empresas del grupo (moneda extranjera)</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_4334_child" model="account.account.template">
+            <field name="code">4334</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_4334"/>
+            <field name="type">receivable</field>
+            <field name="name">Clientes empresas del grupo (moneda extranjera)</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_4336" model="account.account.template">
+            <field name="code">4336</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_433"/>
+            <field name="type">view</field>
+            <field name="name">Clientes empresas del grupo de dudoso cobro</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_4336_child" model="account.account.template">
+            <field name="code">4336</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_4336"/>
+            <field name="type">receivable</field>
+            <field name="name">Clientes empresas del grupo de dudoso cobro</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_4337" model="account.account.template">
+            <field name="code">4337</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_433"/>
+            <field name="type">view</field>
+            <field name="name">Envases y embalajes a devolver a clientes, empresas del grupo</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_4337_child" model="account.account.template">
+            <field name="code">4337</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_4337"/>
+            <field name="type">receivable</field>
+            <field name="name">Envases y embalajes a devolver a clientes, empresas del grupo</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_4339" model="account.account.template">
+            <field name="code">4339</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_433"/>
+            <field name="type">view</field>
+            <field name="name">Clientes empresas del grupo, facturas pendientes de formalizar</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_4339_child" model="account.account.template">
+            <field name="code">4339</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_4339"/>
+            <field name="type">receivable</field>
+            <field name="name">Clientes empresas del grupo, facturas pendientes de formalizar</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_434" model="account.account.template">
+            <field name="code">434</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_43"/>
+            <field name="type">view</field>
+            <field name="name">Clientes, empresas asociadas</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_434_child" model="account.account.template">
+            <field name="code">434</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_434"/>
+            <field name="type">other</field>
+            <field name="name">Clientes, empresas asociadas</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_435" model="account.account.template">
+            <field name="code">435</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_43"/>
+            <field name="type">view</field>
+            <field name="name">Clientes, otras partes vinculadas</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_435_child" model="account.account.template">
+            <field name="code">435</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_435"/>
+            <field name="type">other</field>
+            <field name="name">Clientes, otras partes vinculadas</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_436" model="account.account.template">
+            <field name="code">436</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_43"/>
+            <field name="type">view</field>
+            <field name="name">Clientes de dudoso cobro</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_436_child" model="account.account.template">
+            <field name="code">436</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_436"/>
+            <field name="type">other</field>
+            <field name="name">Clientes de dudoso cobro</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_437" model="account.account.template">
+            <field name="code">437</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_43"/>
+            <field name="type">view</field>
+            <field name="name">Envases y embalajes a devolver por clientes</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_437_child" model="account.account.template">
+            <field name="code">437</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_437"/>
+            <field name="type">other</field>
+            <field name="name">Envases y embalajes a devolver por clientes</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_438" model="account.account.template">
+            <field name="code">438</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_43"/>
+            <field name="type">view</field>
+            <field name="name">Anticipos de clientes</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_438_child" model="account.account.template">
+            <field name="code">438</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_438"/>
+            <field name="type">other</field>
+            <field name="name">Anticipos de clientes</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_44" model="account.account.template">
+            <field name="code">44</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_4"/>
+            <field name="type">view</field>
+            <field name="name">Usuarios y deudores varios</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_440" model="account.account.template">
+            <field name="code">440</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_44"/>
+            <field name="type">view</field>
+            <field name="name">Deudores</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_4400" model="account.account.template">
+            <field name="code">4400</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_440"/>
+            <field name="type">view</field>
+            <field name="name">Deudores (euros)</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_4400_child" model="account.account.template">
+            <field name="code">4400</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_4400"/>
+            <field name="type">receivable</field>
+            <field name="name">Deudores (euros)</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_4404" model="account.account.template">
+            <field name="code">4404</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_440"/>
+            <field name="type">view</field>
+            <field name="name">Deudores (moneda extranjera)</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_4404_child" model="account.account.template">
+            <field name="code">4404</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_4404"/>
+            <field name="type">receivable</field>
+            <field name="name">Deudores (moneda extranjera)</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_4409" model="account.account.template">
+            <field name="code">4409</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_440"/>
+            <field name="type">view</field>
+            <field name="name">Deudores, facturas pendientes de formalizar</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_4409_child" model="account.account.template">
+            <field name="code">4409</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_4409"/>
+            <field name="type">receivable</field>
+            <field name="name">Deudores, facturas pendientes de formalizar</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_441" model="account.account.template">
+            <field name="code">441</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_44"/>
+            <field name="type">view</field>
+            <field name="name">Deudores, efectos comerciales a cobrar</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_4410" model="account.account.template">
+            <field name="code">4410</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_441"/>
+            <field name="type">view</field>
+            <field name="name">Deudores, efectos comerciales en cartera</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_4410_child" model="account.account.template">
+            <field name="code">4410</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_4410"/>
+            <field name="type">receivable</field>
+            <field name="name">Deudores, efectos comerciales en cartera</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_4411" model="account.account.template">
+            <field name="code">4411</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_441"/>
+            <field name="type">view</field>
+            <field name="name">Deudores, efectos comerciales descontados</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_4411_child" model="account.account.template">
+            <field name="code">4411</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_4411"/>
+            <field name="type">receivable</field>
+            <field name="name">Deudores, efectos comerciales descontados</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_4412" model="account.account.template">
+            <field name="code">4412</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_441"/>
+            <field name="type">view</field>
+            <field name="name">Deudores, efectos comerciales en gestión de cobro</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_4412_child" model="account.account.template">
+            <field name="code">4412</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_4412"/>
+            <field name="type">receivable</field>
+            <field name="name">Deudores, efectos comerciales en gestión de cobro</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_4415" model="account.account.template">
+            <field name="code">4415</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_441"/>
+            <field name="type">view</field>
+            <field name="name">Deudores, efectos comerciales impagados</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_4415_child" model="account.account.template">
+            <field name="code">4415</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_4415"/>
+            <field name="type">receivable</field>
+            <field name="name">Deudores, efectos comerciales impagados</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_446" model="account.account.template">
+            <field name="code">446</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_44"/>
+            <field name="type">view</field>
+            <field name="name">Deudores de dudoso cobro</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_446_child" model="account.account.template">
+            <field name="code">446</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_446"/>
+            <field name="type">other</field>
+            <field name="name">Deudores de dudoso cobro</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+
+        <record id="pgc_assoc_447" model="account.account.template">
+            <field name="code">447</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_44"/>
+            <field name="type">view</field>
+            <field name="name">Usuarios, deudores</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_447_child" model="account.account.template">
+            <field name="code">447</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_447"/>
+            <field name="type">other</field>
+            <field name="name">Usuarios, deudores</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_448" model="account.account.template">
+            <field name="code">448</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_44"/>
+            <field name="type">view</field>
+            <field name="name">Patrocinadores, afiliados y otros deudores</field>
+            <field name="user_type" ref="terceros"/>
+        </record>
+        <record id="pgc_assoc_4480" model="account.account.template">
+            <field name="code">4480</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_448"/>
+            <field name="type">view</field>
+            <field name="name">Patrocinadores</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_4480_child" model="account.account.template">
+            <field name="code">4480</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_4480"/>
+            <field name="type">other</field>
+            <field name="name">Patrocinadores</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+       <record id="pgc_assoc_4482" model="account.account.template">
+            <field name="code">4482</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_448"/>
+            <field name="type">view</field>
+            <field name="name">Afiliados</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_4482_child" model="account.account.template">
+            <field name="code">4482</field> 
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_4482"/>
+            <field name="type">other</field> 
+            <field name="name">Afiliados</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+
+       <record id="pgc_assoc_4489" model="account.account.template">
+            <field name="code">4489</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_448"/>
+            <field name="type">view</field>
+            <field name="name">Otros deudores</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_4489_child" model="account.account.template">
+            <field name="code">4489</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_4489"/>
+            <field name="type">other</field>
+            <field name="name">Otros deudores</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+
+
+        <record id="pgc_assoc_449" model="account.account.template">
+            <field name="code">449</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_44"/>
+            <field name="type">view</field>
+            <field name="name">Deudores por operaciones en común</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_449_child" model="account.account.template">
+            <field name="code">449</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_449"/>
+            <field name="type">other</field>
+            <field name="name">Deudores por operaciones en común</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_46" model="account.account.template">
+            <field name="code">46</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_4"/>
+            <field name="type">view</field>
+            <field name="name">Personal</field>
+            <field name="user_type" ref="terceros"/>
+        </record>
+        <record id="pgc_assoc_460" model="account.account.template">
+            <field name="code">460</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_46"/>
+            <field name="type">view</field>
+            <field name="name">Anticipos de remuneraciones</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_460_child" model="account.account.template">
+            <field name="code">460</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_460"/>
+            <field name="type">other</field>
+            <field name="name">Anticipos de remuneraciones</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+
+        <record id="pgc_assoc_464" model="account.account.template">
+            <field name="code">464</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_46"/>
+            <field name="type">view</field>
+            <field name="name">Entregas para gastos a justificar</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_464_child" model="account.account.template">
+            <field name="code">464</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_464"/>
+            <field name="type">other</field>
+            <field name="name">Entregas para gastos a justificar</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+
+
+        <record id="pgc_assoc_465" model="account.account.template">
+            <field name="code">465</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_46"/>
+            <field name="type">view</field>
+            <field name="name">Remuneraciones pendientes de pago</field>
+            <field name="user_type" ref="terceros_-_pay"/>
+        </record>
+        <record id="pgc_assoc_465_child" model="account.account.template">
+            <field name="code">465</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_465"/>
+            <field name="type">other</field>
+            <field name="name">Remuneraciones pendientes de pago</field>
+            <field name="user_type" ref="terceros_-_pay"/>
+        </record>
+        <record id="pgc_assoc_47" model="account.account.template">
+            <field name="code">47</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_4"/>
+            <field name="type">view</field>
+            <field name="name">Administraciones públicas</field>
+            <field name="user_type" ref="tax"/>
+        </record>
+        <record id="pgc_assoc_470" model="account.account.template">
+            <field name="code">470</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_47"/>
+            <field name="type">view</field>
+            <field name="name">Hacienda Pública, deudora por diversos conceptos</field>
+            <field name="user_type" ref="tax"/>
+        </record>
+        <record id="pgc_assoc_4700" model="account.account.template">
+            <field name="code">4700</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_470"/>
+            <field name="type">view</field>
+            <field name="name">Hacienda Pública, deudora por IVA</field>
+            <field name="user_type" ref="tax"/>
+        </record>
+        <record id="pgc_assoc_4700_child" model="account.account.template">
+            <field name="code">4700</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_4700"/>
+            <field name="type">receivable</field>
+            <field name="name">Hacienda Pública, deudora por IVA</field>
+            <field name="user_type" ref="tax"/>
+        </record>
+        <record id="pgc_assoc_4707" model="account.account.template">
+            <field name="code">4707</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_470"/>
+            <field name="type">view</field>
+            <field name="name">Hacienda Pública, deudora por colaboración en la entrega y distribución de subvenciones (art.12 Ley de Subvenciones)</field>
+            <field name="user_type" ref="tax"/>
+        </record>
+        <record id="pgc_assoc_4707_child" model="account.account.template">
+            <field name="code">4707</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_4707"/>
+            <field name="type">receivable</field>
+            <field name="name">Hacienda Pública, deudora por colaboración en la entrega y distribución de subvenciones (art.12 Ley de Subvenciones)</field>
+            <field name="user_type" ref="tax"/>
+        </record>
+
+
+        <record id="pgc_assoc_4708" model="account.account.template">
+            <field name="code">4708</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_470"/>
+            <field name="type">view</field>
+            <field name="name">Hacienda Pública, deudora por subvenciones concedidas</field>
+            <field name="user_type" ref="tax"/>
+        </record>
+        <record id="pgc_assoc_4708_child" model="account.account.template">
+            <field name="code">4708</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_4708"/>
+            <field name="type">receivable</field>
+            <field name="name">Hacienda Pública, deudora por subvenciones concedidas</field>
+            <field name="user_type" ref="tax"/>
+        </record>
+        <record id="pgc_assoc_4709" model="account.account.template">
+            <field name="code">4709</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_470"/>
+            <field name="type">view</field>
+            <field name="name">Hacienda Pública, deudora por devolución de impuestos</field>
+            <field name="user_type" ref="tax"/>
+        </record>
+        <record id="pgc_assoc_4709_child" model="account.account.template">
+            <field name="code">4709</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_4709"/>
+            <field name="type">receivable</field>
+            <field name="name">Hacienda Pública, deudora por devolución de impuestos</field>
+            <field name="user_type" ref="tax"/>
+        </record>
+        <record id="pgc_assoc_471" model="account.account.template">
+            <field name="code">471</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_47"/>
+            <field name="type">view</field>
+            <field name="name">Organismos de la Seguridad Social, deudores</field>
+            <field name="user_type" ref="tax"/>
+        </record>
+        <record id="pgc_assoc_471_child" model="account.account.template">
+            <field name="code">471</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_471"/>
+            <field name="type">other</field>
+            <field name="name">Organismos de la Seguridad Social, deudores</field>
+            <field name="user_type" ref="tax"/>
+        </record>
+        <record id="pgc_assoc_472" model="account.account.template">
+            <field name="code">472</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_47"/>
+            <field name="type">view</field>
+            <field name="name">Hacienda Pública, IVA soportado</field>
+            <field name="user_type" ref="tax"/>
+        </record>
+        <record id="pgc_assoc_472000" model="account.account.template">
+            <field name="code">472000</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_472"/>
+            <field name="type">other</field>
+            <field name="name">Hacienda Pública. IVA soportado</field>
+            <field name="user_type" ref="tax"/>
+        </record>
+        <record id="pgc_assoc_473" model="account.account.template">
+            <field name="code">473</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_47"/>
+            <field name="type">view</field>
+            <field name="name">Hacienda Pública, retenciones y pagos a cuenta</field>
+            <field name="user_type" ref="tax"/>
+        </record>
+        <record id="pgc_assoc_474" model="account.account.template">
+            <field name="code">474</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_47"/>
+            <field name="type">view</field>
+            <field name="name">Activos por impuesto diferido</field>
+            <field name="user_type" ref="tax"/>
+        </record>
+        <record id="pgc_assoc_4740" model="account.account.template">
+            <field name="code">4740</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_474"/>
+            <field name="type">view</field>
+            <field name="name">Activos por diferencias temporarias deducibles</field>
+            <field name="user_type" ref="tax"/>
+        </record>
+        <record id="pgc_assoc_4740_child" model="account.account.template">
+            <field name="code">4740</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_4740"/>
+            <field name="type">other</field>
+            <field name="name">Activos por diferencias temporarias deducibles</field>
+            <field name="user_type" ref="tax"/>
+        </record>
+        <record id="pgc_assoc_4742" model="account.account.template">
+            <field name="code">4742</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_474"/>
+            <field name="type">view</field>
+            <field name="name">Derechos por deducciones y bonificaciones pendientes de aplicar</field>
+            <field name="user_type" ref="tax"/>
+        </record>
+        <record id="pgc_assoc_4742_child" model="account.account.template">
+            <field name="code">4742</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_4742"/>
+            <field name="type">other</field>
+            <field name="name">Derechos por deducciones y bonificaciones pendientes de aplicar</field>
+            <field name="user_type" ref="tax"/>
+        </record>
+        <record id="pgc_assoc_4745" model="account.account.template">
+            <field name="code">4745</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_474"/>
+            <field name="type">view</field>
+            <field name="name">Crédito por pérdidas a compensar del ejercicio</field>
+            <field name="user_type" ref="tax"/>
+        </record>
+        <record id="pgc_assoc_4745_child" model="account.account.template">
+            <field name="code">4745</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_4745"/>
+            <field name="type">other</field>
+            <field name="name">Crédito por pérdidas a compensar del ejercicio</field>
+            <field name="user_type" ref="tax"/>
+        </record>
+        <record id="pgc_assoc_475" model="account.account.template">
+            <field name="code">475</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_47"/>
+            <field name="type">view</field>
+            <field name="name">Hacienda Pública, acreedora por conceptos fiscales</field>
+            <field name="user_type" ref="tax"/>
+        </record>
+        <record id="pgc_assoc_4750" model="account.account.template">
+            <field name="code">4750</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_475"/>
+            <field name="type">view</field>
+            <field name="name">Hacienda Pública, acreedora por IVA</field>
+            <field name="user_type" ref="tax"/>
+        </record>
+        <record id="pgc_assoc_475000" model="account.account.template">
+            <field name="code">475000</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_4750"/>
+            <field name="type">payable</field>
+            <field name="name">Hacienda Pública, acreedora por IVA</field>
+            <field name="user_type" ref="tax"/>
+        </record>
+        <record id="pgc_assoc_4751" model="account.account.template">
+            <field name="code">4751</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_475"/>
+            <field name="type">view</field>
+            <field name="name">Hacienda Pública, acreedora por retenciones practicadas</field>
+            <field name="user_type" ref="tax"/>
+        </record>
+        <record id="pgc_assoc_4751_child" model="account.account.template">
+            <field name="code">4751</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_4751"/>
+            <field name="type">payable</field>
+            <field name="name">Hacienda Pública, acreedora por retenciones practicadas</field>
+            <field name="user_type" ref="tax"/>
+        </record>
+        <record id="pgc_assoc_4752" model="account.account.template">
+            <field name="code">4752</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_475"/>
+            <field name="type">view</field>
+            <field name="name">Hacienda Pública, acreedora por impuesto sobre sociedades</field>
+            <field name="user_type" ref="tax"/>
+        </record>
+        <record id="pgc_assoc_4752_child" model="account.account.template">
+            <field name="code">4752</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_4752"/>
+            <field name="type">payable</field>
+            <field name="name">Hacienda Pública, acreedora por impuesto sobre sociedades</field>
+            <field name="user_type" ref="tax"/>
+        </record>
+
+        <record id="pgc_assoc_4757" model="account.account.template">
+            <field name="code">4757</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_475"/>
+            <field name="type">view</field>
+            <field name="name">Hacienda Pública, acreedora por subvenciones recibidas en concepto de entidad colaboradora (art.12 Ley de Subvenciones)</field>
+            <field name="user_type" ref="tax"/>
+        </record>
+        <record id="pgc_assoc_4757_child" model="account.account.template">
+            <field name="code">4757</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_4757"/>
+            <field name="type">payable</field>
+            <field name="name">Hacienda Pública, acreedora por subvenciones recibidas en concepto de entidad colaboradora (art.12 Ley de Subvencioens)</field>
+            <field name="user_type" ref="tax"/>
+        </record>
+
+        <record id="pgc_assoc_4758" model="account.account.template">
+            <field name="code">4758</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_475"/>
+            <field name="type">view</field>
+            <field name="name">Hacienda Pública, acreedora por subvenciones a reintegrar</field>
+            <field name="user_type" ref="tax"/>
+        </record>
+        <record id="pgc_assoc_4758_child" model="account.account.template">
+            <field name="code">4758</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_4758"/>
+            <field name="type">payable</field>
+            <field name="name">Hacienda Pública, acreedora por subvenciones a reintegrar</field>
+            <field name="user_type" ref="tax"/>
+        </record>
+        <record id="pgc_assoc_476" model="account.account.template">
+            <field name="code">476</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_47"/>
+            <field name="type">view</field>
+            <field name="name">Organismos de la Seguridad Social, acreedores</field>
+            <field name="user_type" ref="tax"/>
+        </record>
+        <record id="pgc_assoc_476_child" model="account.account.template">
+            <field name="code">476</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_476"/>
+            <field name="type">other</field>
+            <field name="name">Organismos de la Seguridad Social, acreedores</field>
+            <field name="user_type" ref="tax"/>
+        </record>
+        <record id="pgc_assoc_477" model="account.account.template">
+            <field name="code">477</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_47"/>
+            <field name="type">view</field>
+            <field name="name">Hacienda Pública, IVA repercutido</field>
+            <field name="user_type" ref="tax"/>
+        </record>
+        <record id="pgc_assoc_477000" model="account.account.template">
+            <field name="code">477000</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_477"/>
+            <field name="type">other</field>
+            <field name="name">Hacienda Pública. IVA repercutido</field>
+            <field name="user_type" ref="tax"/>
+        </record>
+        <record id="pgc_assoc_479" model="account.account.template">
+            <field name="code">479</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_47"/>
+            <field name="type">view</field>
+            <field name="name">Pasivos por diferencias temporarias imponibles</field>
+            <field name="user_type" ref="tax"/>
+        </record>
+        <record id="pgc_assoc_479_child" model="account.account.template">
+            <field name="code">479</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_479"/>
+            <field name="type">other</field>
+            <field name="name">Pasivos por diferencias temporarias imponibles</field>
+            <field name="user_type" ref="tax"/>
+        </record>
+        <record id="pgc_assoc_48" model="account.account.template">
+            <field name="code">48</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_4"/>
+            <field name="type">view</field>
+            <field name="name">Ajustes por periodificación</field>
+            <field name="user_type" ref="terceros"/>
+        </record>
+        <record id="pgc_assoc_480" model="account.account.template">
+            <field name="code">480</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_48"/>
+            <field name="type">view</field>
+            <field name="name">Gastos anticipados</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_480_child" model="account.account.template">
+            <field name="code">480</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_480"/>
+            <field name="type">other</field>
+            <field name="name">Gastos anticipados</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_485" model="account.account.template">
+            <field name="code">485</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_48"/>
+            <field name="type">view</field>
+            <field name="name">Ingresos anticipados</field>
+            <field name="user_type" ref="terceros_-_pay"/>
+        </record>
+        <record id="pgc_assoc_485_child" model="account.account.template">
+            <field name="code">485</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_485"/>
+            <field name="type">other</field>
+            <field name="name">Ingresos anticipados</field>
+            <field name="user_type" ref="terceros_-_pay"/>
+        </record>
+        <record id="pgc_assoc_49" model="account.account.template">
+            <field name="code">49</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_4"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor por operaciones de la actividad y provisiones a corto plazo</field>
+            <field name="user_type" ref="terceros"/>
+        </record>
+        <record id="pgc_assoc_490" model="account.account.template">
+            <field name="code">490</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_49"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor de créditos por operaciones de la actividad</field>
+            <field name="user_type" ref="terceros"/>
+        </record>
+        <record id="pgc_assoc_490_child" model="account.account.template">
+            <field name="code">490</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_490"/>
+            <field name="type">other</field>
+            <field name="name">Deterioro de valor de créditos por operaciones de la actividad</field>
+            <field name="user_type" ref="terceros"/>
+        </record>
+        <record id="pgc_assoc_493" model="account.account.template">
+            <field name="code">493</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_49"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor de créditos por operaciones comerciales con partes vinculadas</field>
+            <field name="user_type" ref="terceros"/>
+        </record>
+        <record id="pgc_assoc_4933" model="account.account.template">
+            <field name="code">4933</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_493"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor de créditos por operaciones comerciales con empresas del grupo</field>
+            <field name="user_type" ref="terceros"/>
+        </record>
+        <record id="pgc_assoc_4933_child" model="account.account.template">
+            <field name="code">4933</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_4933"/>
+            <field name="type">other</field>
+            <field name="name">Deterioro de valor de créditos por operaciones comerciales con empresas del grupo</field>
+            <field name="user_type" ref="terceros"/>
+        </record>
+        <record id="pgc_assoc_4934" model="account.account.template">
+            <field name="code">4934</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_493"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor de créditos por operaciones comerciales con empresas asociadas</field>
+            <field name="user_type" ref="terceros"/>
+        </record>
+        <record id="pgc_assoc_4934_child" model="account.account.template">
+            <field name="code">4934</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_4934"/>
+            <field name="type">other</field>
+            <field name="name">Deterioro de valor de créditos por operaciones comerciales con empresas asociadas</field>
+            <field name="user_type" ref="terceros"/>
+        </record>
+        <record id="pgc_assoc_4935" model="account.account.template">
+            <field name="code">4935</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_493"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor de créditos por operaciones comerciales con otras partes vinculadas</field>
+            <field name="user_type" ref="terceros"/>
+        </record>
+        <record id="pgc_assoc_4935_child" model="account.account.template">
+            <field name="code">4935</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_4935"/>
+            <field name="type">other</field>
+            <field name="name">Deterioro de valor de créditos por operaciones comerciales con otras partes vinculadas</field>
+            <field name="user_type" ref="terceros"/>
+        </record>
+        <record id="pgc_assoc_499" model="account.account.template">
+            <field name="code">499</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_49"/>
+            <field name="type">view</field>
+            <field name="name">Provisiones por operaciones comerciales</field>
+            <field name="user_type" ref="terceros"/>
+        </record>
+        <record id="pgc_assoc_4994" model="account.account.template">
+            <field name="code">4994</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_499"/>
+            <field name="type">view</field>
+            <field name="name">Provisión por contratos onerosos</field>
+            <field name="user_type" ref="terceros"/>
+        </record>
+        <record id="pgc_assoc_4994_child" model="account.account.template">
+            <field name="code">4994</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_4994"/>
+            <field name="type">other</field>
+            <field name="name">Provisión por contratos onerosos</field>
+            <field name="user_type" ref="terceros"/>
+        </record>
+        <record id="pgc_assoc_4999" model="account.account.template">
+            <field name="code">4999</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_499"/>
+            <field name="type">view</field>
+            <field name="name">Provisión para otras operaciones comerciales</field>
+            <field name="user_type" ref="terceros"/>
+        </record>
+        <record id="pgc_assoc_4999_child" model="account.account.template">
+            <field name="code">4999</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_4999"/>
+            <field name="type">other</field>
+            <field name="name">Provisión para otras operaciones comerciales</field>
+            <field name="user_type" ref="terceros"/>
+        </record>
+        <record id="pgc_assoc_5" model="account.account.template">
+            <field name="code">5</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_0"/>
+            <field name="type">view</field>
+            <field name="name">Cuentas financieras</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_50" model="account.account.template">
+            <field name="code">50</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5"/>
+            <field name="type">view</field>
+            <field name="name">Empréstitos, deudas con características especiales y otras emisiones análogas a corto plazo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_500" model="account.account.template">
+            <field name="code">500</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_50"/>
+            <field name="type">view</field>
+            <field name="name">Obligaciones y bonos a corto plazo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_500_child" model="account.account.template">
+            <field name="code">500</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_500"/>
+            <field name="type">other</field>
+            <field name="name">Obligaciones y bonos a corto plazo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_502" model="account.account.template">
+            <field name="code">502</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_50"/>
+            <field name="type">view</field>
+            <field name="name">Acciones o participaciones a corto plazo consideradas como pasivos financieros</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_502_child" model="account.account.template">
+            <field name="code">502</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_502"/>
+            <field name="type">other</field>
+            <field name="name">Acciones o participaciones a corto plazo consideradas como pasivos financieros</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_505" model="account.account.template">
+            <field name="code">505</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_50"/>
+            <field name="type">view</field>
+            <field name="name">Deudas representadas en otros valores negociables a corto plazo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_505_child" model="account.account.template">
+            <field name="code">505</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_505"/>
+            <field name="type">other</field>
+            <field name="name">Deudas representadas en otros valores negociables a corto plazo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_506" model="account.account.template">
+            <field name="code">506</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_50"/>
+            <field name="type">view</field>
+            <field name="name">Intereses a corto plazo de empréstitos y otras emisiones análogas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_506_child" model="account.account.template">
+            <field name="code">506</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_506"/>
+            <field name="type">other</field>
+            <field name="name">Intereses a corto plazo de empréstitos y otras emisiones análogas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_507" model="account.account.template">
+            <field name="code">507</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_50"/>
+            <field name="type">view</field>
+            <field name="name">Dividendos de acciones o participaciones consideradas como pasivos financieros</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_507_child" model="account.account.template">
+            <field name="code">507</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_507"/>
+            <field name="type">other</field>
+            <field name="name">Dividendos de acciones o participaciones consideradas como pasivos financieros</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_509" model="account.account.template">
+            <field name="code">509</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_50"/>
+            <field name="type">view</field>
+            <field name="name">Valores negociables amortizados</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5090" model="account.account.template">
+            <field name="code">5090</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_509"/>
+            <field name="type">view</field>
+            <field name="name">Obligaciones y bonos amortizados</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5090_child" model="account.account.template">
+            <field name="code">5090</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_5090"/>
+            <field name="type">other</field>
+            <field name="name">Obligaciones y bonos amortizados</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5095" model="account.account.template">
+            <field name="code">5095</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_509"/>
+            <field name="type">view</field>
+            <field name="name">Otros valores negociables amortizados</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5095_child" model="account.account.template">
+            <field name="code">5095</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_5095"/>
+            <field name="type">other</field>
+            <field name="name">Otros valores negociables amortizados</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_51" model="account.account.template">
+            <field name="code">51</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5"/>
+            <field name="type">view</field>
+            <field name="name">Deudas a corto plazo con partes vinculadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_510" model="account.account.template">
+            <field name="code">510</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_51"/>
+            <field name="type">view</field>
+            <field name="name">Deudas a corto plazo con entidades de crédito vinculadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5103" model="account.account.template">
+            <field name="code">5103</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_510"/>
+            <field name="type">view</field>
+            <field name="name">Deudas a corto plazo con entidades de crédito, empresas del grupo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5103_child" model="account.account.template">
+            <field name="code">5103</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5103"/>
+            <field name="type">other</field>
+            <field name="name">Deudas a corto plazo con entidades de crédito, empresas del grupo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5104" model="account.account.template">
+            <field name="code">5104</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_510"/>
+            <field name="type">view</field>
+            <field name="name">Deudas a corto plazo con entidades de crédito, empresas asociadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5104_child" model="account.account.template">
+            <field name="code">5104</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5104"/>
+            <field name="type">other</field>
+            <field name="name">Deudas a corto plazo con entidades de crédito, empresas asociadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5105" model="account.account.template">
+            <field name="code">5105</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_510"/>
+            <field name="type">view</field>
+            <field name="name">Deudas a corto plazo con otras entidades de crédito vinculadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5105_child" model="account.account.template">
+            <field name="code">5105</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5105"/>
+            <field name="type">other</field>
+            <field name="name">Deudas a corto plazo con otras entidades de crédito vinculadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_511" model="account.account.template">
+            <field name="code">511</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_51"/>
+            <field name="type">view</field>
+            <field name="name">Proveedores de inmovilizado a corto plazo, partes vinculadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5113" model="account.account.template">
+            <field name="code">5113</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_511"/>
+            <field name="type">view</field>
+            <field name="name">Proveedores de inmovilizado a corto plazo, empresas del grupo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5113_child" model="account.account.template">
+            <field name="code">5113</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5113"/>
+            <field name="type">other</field>
+            <field name="name">Proveedores de inmovilizado a corto plazo, empresas del grupo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5114" model="account.account.template">
+            <field name="code">5114</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_511"/>
+            <field name="type">view</field>
+            <field name="name">Proveedores de inmovilizado a corto plazo, empresas asociadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5114_child" model="account.account.template">
+            <field name="code">5114</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5114"/>
+            <field name="type">other</field>
+            <field name="name">Proveedores de inmovilizado a corto plazo, empresas asociadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5115" model="account.account.template">
+            <field name="code">5115</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_511"/>
+            <field name="type">view</field>
+            <field name="name">Proveedores de inmovilizado a corto plazo, otras partes vinculadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5115_child" model="account.account.template">
+            <field name="code">5115</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5115"/>
+            <field name="type">other</field>
+            <field name="name">Proveedores de inmovilizado a corto plazo, otras partes vinculadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_512" model="account.account.template">
+            <field name="code">512</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_51"/>
+            <field name="type">view</field>
+            <field name="name">Acreedores por arrendamiento financiero a corto plazo, partes vinculadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5123" model="account.account.template">
+            <field name="code">5123</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_512"/>
+            <field name="type">view</field>
+            <field name="name">Acreedores por arrendamiento financiero a corto plazo, empresas del grupo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5123_child" model="account.account.template">
+            <field name="code">5123</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5123"/>
+            <field name="type">other</field>
+            <field name="name">Acreedores por arrendamiento financiero a corto plazo, empresas del grupo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5124" model="account.account.template">
+            <field name="code">5124</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_512"/>
+            <field name="type">view</field>
+            <field name="name">Acreedores por arrendamiento financiero a corto plazo, empresas asociadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5124_child" model="account.account.template">
+            <field name="code">5124</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5124"/>
+            <field name="type">other</field>
+            <field name="name">Acreedores por arrendamiento financiero a corto plazo, empresas asociadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5125" model="account.account.template">
+            <field name="code">5125</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_512"/>
+            <field name="type">view</field>
+            <field name="name">Acreedores por arrendamiento financiero a corto plazo, otras partes vinculadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5125_child" model="account.account.template">
+            <field name="code">5125</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5125"/>
+            <field name="type">other</field>
+            <field name="name">Acreedores por arrendamiento financiero a corto plazo, otras partes vinculadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_513" model="account.account.template">
+            <field name="code">513</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_51"/>
+            <field name="type">view</field>
+            <field name="name">Otras deudas a corto plazo con partes vinculadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5133" model="account.account.template">
+            <field name="code">5133</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_513"/>
+            <field name="type">view</field>
+            <field name="name">Otras deudas a corto plazo con empresas del grupo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5133_child" model="account.account.template">
+            <field name="code">5133</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5133"/>
+            <field name="type">other</field>
+            <field name="name">Otras deudas a corto plazo con empresas del grupo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5134" model="account.account.template">
+            <field name="code">5134</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_513"/>
+            <field name="type">view</field>
+            <field name="name">Otras deudas a corto plazo con empresas asociadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5134_child" model="account.account.template">
+            <field name="code">5134</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5134"/>
+            <field name="type">other</field>
+            <field name="name">Otras deudas a corto plazo con empresas asociadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5135" model="account.account.template">
+            <field name="code">5135</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_513"/>
+            <field name="type">view</field>
+            <field name="name">Otras deudas a corto plazo con otras partes vinculadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5135_child" model="account.account.template">
+            <field name="code">5135</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5135"/>
+            <field name="type">other</field>
+            <field name="name">Otras deudas a corto plazo con otras partes vinculadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_514" model="account.account.template">
+            <field name="code">514</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_51"/>
+            <field name="type">view</field>
+            <field name="name">Intereses a corto plazo de deudas con partes vinculadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5143" model="account.account.template">
+            <field name="code">5143</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_514"/>
+            <field name="type">view</field>
+            <field name="name">Intereses a corto plazo de deudas con empresas del grupo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5143_child" model="account.account.template">
+            <field name="code">5143</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5143"/>
+            <field name="type">other</field>
+            <field name="name">Intereses a corto plazo de deudas con empresas del grupo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5144" model="account.account.template">
+            <field name="code">5144</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_514"/>
+            <field name="type">view</field>
+            <field name="name">Intereses a corto plazo de deudas con empresas asociadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5144_child" model="account.account.template">
+            <field name="code">5144</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5144"/>
+            <field name="type">other</field>
+            <field name="name">Intereses a corto plazo de deudas con empresas asociadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5145" model="account.account.template">
+            <field name="code">5145</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_514"/>
+            <field name="type">view</field>
+            <field name="name">Intereses a corto plazo de deudas con otras partes vinculadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5145_child" model="account.account.template">
+            <field name="code">5145</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5145"/>
+            <field name="type">other</field>
+            <field name="name">Intereses a corto plazo de deudas con otras partes vinculadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_52" model="account.account.template">
+            <field name="code">52</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5"/>
+            <field name="type">view</field>
+            <field name="name">Deudas a corto plazo por préstamos recibidos y otros conceptos</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_520" model="account.account.template">
+            <field name="code">520</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_52"/>
+            <field name="type">view</field>
+            <field name="name">Deudas a corto plazo con entidades de crédito</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5200" model="account.account.template">
+            <field name="code">5200</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_520"/>
+            <field name="type">view</field>
+            <field name="name">Préstamos a corto plazo de entidades de crédito</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5200_child" model="account.account.template">
+            <field name="code">5200</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_5200"/>
+            <field name="type">other</field>
+            <field name="name">Préstamos a corto plazo de entidades de crédito</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5201" model="account.account.template">
+            <field name="code">5201</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_520"/>
+            <field name="type">view</field>
+            <field name="name">Deudas a corto plazo por crédito dispuesto</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5201_child" model="account.account.template">
+            <field name="code">5201</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_5201"/>
+            <field name="type">other</field>
+            <field name="name">Deudas a corto plazo por crédito dispuesto</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5208" model="account.account.template">
+            <field name="code">5208</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_520"/>
+            <field name="type">view</field>
+            <field name="name">Deudas por efectos descontados</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5208_child" model="account.account.template">
+            <field name="code">5208</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_5208"/>
+            <field name="type">other</field>
+            <field name="name">Deudas por efectos descontados</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5209" model="account.account.template">
+            <field name="code">5209</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_520"/>
+            <field name="type">view</field>
+            <field name="name">Deudas por operaciones de “factoring”</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5209_child" model="account.account.template">
+            <field name="code">5209</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_5209"/>
+            <field name="type">other</field>
+            <field name="name">Deudas por operaciones de “factoring”</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_521" model="account.account.template">
+            <field name="code">521</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_52"/>
+            <field name="type">view</field>
+            <field name="name">Deudas a corto plazo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_521_child" model="account.account.template">
+            <field name="code">521</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_521"/>
+            <field name="type">other</field>
+            <field name="name">Deudas a corto plazo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_522" model="account.account.template">
+            <field name="code">522</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_52"/>
+            <field name="type">view</field>
+            <field name="name">Deudas a corto plazo transformables en subvenciones, donaciones y legados</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_522_child" model="account.account.template">
+            <field name="code">522</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_522"/>
+            <field name="type">other</field>
+            <field name="name">Deudas a corto plazo transformables en subvenciones, donaciones y legados</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_523" model="account.account.template">
+            <field name="code">523</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_52"/>
+            <field name="type">view</field>
+            <field name="name">Proveedores de inmovilizado a corto plazo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_523_child" model="account.account.template">
+            <field name="code">523</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_523"/>
+            <field name="type">other</field>
+            <field name="name">Proveedores de inmovilizado a corto plazo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_524" model="account.account.template">
+            <field name="code">524</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_52"/>
+            <field name="type">view</field>
+            <field name="name">Acreedores por arrendamiento financiero a corto plazo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_524_child" model="account.account.template">
+            <field name="code">524</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_524"/>
+            <field name="type">other</field>
+            <field name="name">Acreedores por arrendamiento financiero a corto plazo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_525" model="account.account.template">
+            <field name="code">525</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_52"/>
+            <field name="type">view</field>
+            <field name="name">Efectos a pagar a corto plazo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_525_child" model="account.account.template">
+            <field name="code">525</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_525"/>
+            <field name="type">other</field>
+            <field name="name">Efectos a pagar a corto plazo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_526" model="account.account.template">
+            <field name="code">526</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_52"/>
+            <field name="type">view</field>
+            <field name="name">Dividendo activo a pagar</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_526_child" model="account.account.template">
+            <field name="code">526</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_526"/>
+            <field name="type">other</field>
+            <field name="name">Dividendo activo a pagar</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_527" model="account.account.template">
+            <field name="code">527</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_52"/>
+            <field name="type">view</field>
+            <field name="name">Intereses a corto plazo de deudas con entidades de crédito</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_527_child" model="account.account.template">
+            <field name="code">527</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_527"/>
+            <field name="type">other</field>
+            <field name="name">Intereses a corto plazo de deudas con entidades de crédito</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_528" model="account.account.template">
+            <field name="code">528</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_52"/>
+            <field name="type">view</field>
+            <field name="name">Intereses a corto plazo de deudas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_528_child" model="account.account.template">
+            <field name="code">528</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_528"/>
+            <field name="type">other</field>
+            <field name="name">Intereses a corto plazo de deudas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_529" model="account.account.template">
+            <field name="code">529</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_52"/>
+            <field name="type">view</field>
+            <field name="name">Provisiones a corto plazo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5290" model="account.account.template">
+            <field name="code">5290</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_529"/>
+            <field name="type">view</field>
+            <field name="name">Provisión a corto plazo por retribuciones al personal</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5290_child" model="account.account.template">
+            <field name="code">5290</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_5290"/>
+            <field name="type">other</field>
+            <field name="name">Provisión a corto plazo por retribuciones al personal</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5291" model="account.account.template">
+            <field name="code">5291</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_529"/>
+            <field name="type">view</field>
+            <field name="name">Provisión a corto plazo para impuestos</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5291_child" model="account.account.template">
+            <field name="code">5291</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_5291"/>
+            <field name="type">other</field>
+            <field name="name">Provisión a corto plazo para impuestos</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5292" model="account.account.template">
+            <field name="code">5292</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_529"/>
+            <field name="type">view</field>
+            <field name="name">Provisión a corto plazo para otras responsabilidades</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5292_child" model="account.account.template">
+            <field name="code">5292</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_5292"/>
+            <field name="type">other</field>
+            <field name="name">Provisión a corto plazo para otras responsabilidades</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5293" model="account.account.template">
+            <field name="code">5293</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_529"/>
+            <field name="type">view</field>
+            <field name="name">Provisión a corto plazo por desmantelamiento, retiro o rehabilitación del inmovilizado</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5293_child" model="account.account.template">
+            <field name="code">5293</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_5293"/>
+            <field name="type">other</field>
+            <field name="name">Provisión a corto plazo por desmantelamiento, retiro o rehabilitación del inmovilizado</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5295" model="account.account.template">
+            <field name="code">5295</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_529"/>
+            <field name="type">view</field>
+            <field name="name">Provisión a corto plazo para actuaciones medioambientales</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5295_child" model="account.account.template">
+            <field name="code">5295</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_5295"/>
+            <field name="type">other</field>
+            <field name="name">Provisión a corto plazo para actuaciones medioambientales</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_53" model="account.account.template">
+            <field name="code">53</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5"/>
+            <field name="type">view</field>
+            <field name="name">Inversiones financieras a corto plazo en partes vinculadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_530" model="account.account.template">
+            <field name="code">530</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_53"/>
+            <field name="type">view</field>
+            <field name="name">Participaciones a corto plazo en partes vinculadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5303" model="account.account.template">
+            <field name="code">5303</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_530"/>
+            <field name="type">view</field>
+            <field name="name">Participaciones a corto plazo en empresas del grupo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5303_child" model="account.account.template">
+            <field name="code">5303</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5303"/>
+            <field name="type">other</field>
+            <field name="name">Participaciones a corto plazo en empresas del grupo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5304" model="account.account.template">
+            <field name="code">5304</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_530"/>
+            <field name="type">view</field>
+            <field name="name">Participaciones a corto plazo en empresas asociadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5304_child" model="account.account.template">
+            <field name="code">5304</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5304"/>
+            <field name="type">other</field>
+            <field name="name">Participaciones a corto plazo en empresas asociadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5305" model="account.account.template">
+            <field name="code">5305</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_530"/>
+            <field name="type">view</field>
+            <field name="name">Participaciones a corto plazo en otras partes vinculadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5305_child" model="account.account.template">
+            <field name="code">5305</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5305"/>
+            <field name="type">other</field>
+            <field name="name">Participaciones a corto plazo en otras partes vinculadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_531" model="account.account.template">
+            <field name="code">531</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_53"/>
+            <field name="type">view</field>
+            <field name="name">Valores representativos de deuda a corto plazo de partes vinculadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5313" model="account.account.template">
+            <field name="code">5313</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_531"/>
+            <field name="type">view</field>
+            <field name="name">Valores representativos de deuda a corto plazo de empresas del grupo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5313_child" model="account.account.template">
+            <field name="code">5313</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5313"/>
+            <field name="type">other</field>
+            <field name="name">Valores representativos de deuda a corto plazo de empresas del grupo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5314" model="account.account.template">
+            <field name="code">5314</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_531"/>
+            <field name="type">view</field>
+            <field name="name">Valores representativos de deuda a corto plazo de empresas asociadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5314_child" model="account.account.template">
+            <field name="code">5314</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5314"/>
+            <field name="type">other</field>
+            <field name="name">Valores representativos de deuda a corto plazo de empresas asociadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5315" model="account.account.template">
+            <field name="code">5315</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_531"/>
+            <field name="type">view</field>
+            <field name="name">Valores representativos de deuda a corto plazo de otras partes vinculadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5315_child" model="account.account.template">
+            <field name="code">5315</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5315"/>
+            <field name="type">other</field>
+            <field name="name">Valores representativos de deuda a corto plazo de otras partes vinculadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_532" model="account.account.template">
+            <field name="code">532</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_53"/>
+            <field name="type">view</field>
+            <field name="name">Créditos a corto plazo a partes vinculadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5323" model="account.account.template">
+            <field name="code">5323</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_532"/>
+            <field name="type">view</field>
+            <field name="name">Créditos a corto plazo a empresas del grupo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5323_child" model="account.account.template">
+            <field name="code">5323</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5323"/>
+            <field name="type">other</field>
+            <field name="name">Créditos a corto plazo a empresas del grupo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5324" model="account.account.template">
+            <field name="code">5324</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_532"/>
+            <field name="type">view</field>
+            <field name="name">Créditos a corto plazo a empresas asociadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5324_child" model="account.account.template">
+            <field name="code">5324</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5324"/>
+            <field name="type">other</field>
+            <field name="name">Créditos a corto plazo a empresas asociadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5325" model="account.account.template">
+            <field name="code">5325</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_532"/>
+            <field name="type">view</field>
+            <field name="name">Créditos a corto plazo a otras partes vinculadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5325_child" model="account.account.template">
+            <field name="code">5325</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5325"/>
+            <field name="type">other</field>
+            <field name="name">Créditos a corto plazo a otras partes vinculadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_533" model="account.account.template">
+            <field name="code">533</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_53"/>
+            <field name="type">view</field>
+            <field name="name">Intereses a corto plazo de valores representativos de deuda de partes vinculadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5333" model="account.account.template">
+            <field name="code">5333</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_533"/>
+            <field name="type">view</field>
+            <field name="name">Intereses a corto plazo de valores representativos de deuda de empresas del grupo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5333_child" model="account.account.template">
+            <field name="code">5333</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5333"/>
+            <field name="type">other</field>
+            <field name="name">Intereses a corto plazo de valores representativos de deuda de empresas del grupo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5334" model="account.account.template">
+            <field name="code">5334</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_533"/>
+            <field name="type">view</field>
+            <field name="name">Intereses a corto plazo de valores representativos de deuda de empresas asociadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5334_child" model="account.account.template">
+            <field name="code">5334</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5334"/>
+            <field name="type">other</field>
+            <field name="name">Intereses a corto plazo de valores representativos de deuda de empresas asociadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5335" model="account.account.template">
+            <field name="code">5335</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_533"/>
+            <field name="type">view</field>
+            <field name="name">Intereses a corto plazo de valores representativos de deuda de otras partes vinculadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5335_child" model="account.account.template">
+            <field name="code">5335</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5335"/>
+            <field name="type">other</field>
+            <field name="name">Intereses a corto plazo de valores representativos de deuda de otras partes vinculadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_534" model="account.account.template">
+            <field name="code">534</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_53"/>
+            <field name="type">view</field>
+            <field name="name">Intereses a corto plazo de créditos a partes vinculadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5343" model="account.account.template">
+            <field name="code">5343</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_534"/>
+            <field name="type">view</field>
+            <field name="name">Intereses a corto plazo de créditos a empresas del grupo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5343_child" model="account.account.template">
+            <field name="code">5343</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5343"/>
+            <field name="type">other</field>
+            <field name="name">Intereses a corto plazo de créditos a empresas del grupo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5344" model="account.account.template">
+            <field name="code">5344</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_534"/>
+            <field name="type">view</field>
+            <field name="name">Intereses a corto plazo de créditos a empresas asociadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5344_child" model="account.account.template">
+            <field name="code">5344</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5344"/>
+            <field name="type">other</field>
+            <field name="name">Intereses a corto plazo de créditos a empresas asociadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5345" model="account.account.template">
+            <field name="code">5345</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_534"/>
+            <field name="type">view</field>
+            <field name="name">Intereses a corto plazo de créditos a otras partes vinculadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5345_child" model="account.account.template">
+            <field name="code">5345</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5345"/>
+            <field name="type">other</field>
+            <field name="name">Intereses a corto plazo de créditos a otras partes vinculadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_535" model="account.account.template">
+            <field name="code">535</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_53"/>
+            <field name="type">view</field>
+            <field name="name">Dividendo a cobrar de inversiones financieras en partes vinculadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5353" model="account.account.template">
+            <field name="code">5353</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_535"/>
+            <field name="type">view</field>
+            <field name="name">Dividendo a cobrar de inversiones financieras en empresas del grupo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5353_child" model="account.account.template">
+            <field name="code">5353</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5353"/>
+            <field name="type">other</field>
+            <field name="name">Dividendo a cobrar de inversiones financieras en empresas del grupo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5354" model="account.account.template">
+            <field name="code">5354</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_535"/>
+            <field name="type">view</field>
+            <field name="name">Dividendo a cobrar de inversiones financieras en empresas asociadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5354_child" model="account.account.template">
+            <field name="code">5354</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5354"/>
+            <field name="type">other</field>
+            <field name="name">Dividendo a cobrar de inversiones financieras en empresas asociadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5355" model="account.account.template">
+            <field name="code">5355</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_535"/>
+            <field name="type">view</field>
+            <field name="name">Dividendo a cobrar de inversiones financieras en otras partes vinculadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5355_child" model="account.account.template">
+            <field name="code">5355</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5355"/>
+            <field name="type">other</field>
+            <field name="name">Dividendo a cobrar de inversiones financieras en otras partes vinculadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_539" model="account.account.template">
+            <field name="code">539</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_53"/>
+            <field name="type">view</field>
+            <field name="name">Desembolsos pendientes sobre participaciones a corto plazo en partes vinculadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5393" model="account.account.template">
+            <field name="code">5393</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_539"/>
+            <field name="type">view</field>
+            <field name="name">Desembolsos pendientes sobre participaciones a corto plazo en empresas del grupo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5393_child" model="account.account.template">
+            <field name="code">5393</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5393"/>
+            <field name="type">other</field>
+            <field name="name">Desembolsos pendientes sobre participaciones a corto plazo en empresas del grupo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5394" model="account.account.template">
+            <field name="code">5394</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_539"/>
+            <field name="type">view</field>
+            <field name="name">Desembolsos pendientes sobre participaciones a corto plazo en empresas asociadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5394_child" model="account.account.template">
+            <field name="code">5394</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5394"/>
+            <field name="type">other</field>
+            <field name="name">Desembolsos pendientes sobre participaciones a corto plazo en empresas asociadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5395" model="account.account.template">
+            <field name="code">5395</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_539"/>
+            <field name="type">view</field>
+            <field name="name">Desembolsos pendientes sobre participaciones a corto plazo en otras partes vinculadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5395_child" model="account.account.template">
+            <field name="code">5395</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5395"/>
+            <field name="type">other</field>
+            <field name="name">Desembolsos pendientes sobre participaciones a corto plazo en otras partes vinculadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_54" model="account.account.template">
+            <field name="code">54</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5"/>
+            <field name="type">view</field>
+            <field name="name">Otras inversiones financieras a corto plazo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_540" model="account.account.template">
+            <field name="code">540</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_54"/>
+            <field name="type">view</field>
+            <field name="name">Inversiones financieras a corto plazo en instrumentos de patrimonio</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_540_child" model="account.account.template">
+            <field name="code">540</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_540"/>
+            <field name="type">other</field>
+            <field name="name">Inversiones financieras a corto plazo en instrumentos de patrimonio</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_541" model="account.account.template">
+            <field name="code">541</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_54"/>
+            <field name="type">view</field>
+            <field name="name">Valores representativos de deuda a corto plazo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_541_child" model="account.account.template">
+            <field name="code">541</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_541"/>
+            <field name="type">other</field>
+            <field name="name">Valores representativos de deuda a corto plazo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_542" model="account.account.template">
+            <field name="code">542</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_54"/>
+            <field name="type">view</field>
+            <field name="name">Créditos a corto plazo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_542_child" model="account.account.template">
+            <field name="code">542</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_542"/>
+            <field name="type">other</field>
+            <field name="name">Créditos a corto plazo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_543" model="account.account.template">
+            <field name="code">543</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_54"/>
+            <field name="type">view</field>
+            <field name="name">Créditos a corto plazo por enajenación de inmovilizado</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_543_child" model="account.account.template">
+            <field name="code">543</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_543"/>
+            <field name="type">other</field>
+            <field name="name">Créditos a corto plazo por enajenación de inmovilizado</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_544" model="account.account.template">
+            <field name="code">544</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_54"/>
+            <field name="type">view</field>
+            <field name="name">Créditos a corto plazo al personal</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_544_child" model="account.account.template">
+            <field name="code">544</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_544"/>
+            <field name="type">other</field>
+            <field name="name">Créditos a corto plazo al personal</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_545" model="account.account.template">
+            <field name="code">545</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_54"/>
+            <field name="type">view</field>
+            <field name="name">Dividendo a cobrar</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_545_child" model="account.account.template">
+            <field name="code">545</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_545"/>
+            <field name="type">other</field>
+            <field name="name">Dividendo a cobrar</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_546" model="account.account.template">
+            <field name="code">546</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_54"/>
+            <field name="type">view</field>
+            <field name="name">Intereses a corto plazo de valores representativos de deudas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_546_child" model="account.account.template">
+            <field name="code">546</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_546"/>
+            <field name="type">other</field>
+            <field name="name">Intereses a corto plazo de valores representativos de deudas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_547" model="account.account.template">
+            <field name="code">547</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_54"/>
+            <field name="type">view</field>
+            <field name="name">Intereses a corto plazo de créditos</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_547_child" model="account.account.template">
+            <field name="code">547</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_547"/>
+            <field name="type">other</field>
+            <field name="name">Intereses a corto plazo de créditos</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_548" model="account.account.template">
+            <field name="code">548</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_54"/>
+            <field name="type">view</field>
+            <field name="name">Imposiciones a corto plazo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_548_child" model="account.account.template">
+            <field name="code">548</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_548"/>
+            <field name="type">other</field>
+            <field name="name">Imposiciones a corto plazo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_549" model="account.account.template">
+            <field name="code">549</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_54"/>
+            <field name="type">view</field>
+            <field name="name">Desembolsos pendientes sobre participaciones en el patrimonio neto a corto plazo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_549_child" model="account.account.template">
+            <field name="code">549</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_549"/>
+            <field name="type">other</field>
+            <field name="name">Desembolsos pendientes sobre participaciones en el patrimonio neto a corto plazo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_55" model="account.account.template">
+            <field name="code">55</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5"/>
+            <field name="type">view</field>
+            <field name="name">Otras cuentas no bancarias</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_550" model="account.account.template">
+            <field name="code">550</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_55"/>
+            <field name="type">view</field>
+            <field name="name">Titular de la explotación</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_550_child" model="account.account.template">
+            <field name="code">550</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_550"/>
+            <field name="type">other</field>
+            <field name="name">Titular de la explotación</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_551" model="account.account.template">
+            <field name="code">551</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_55"/>
+            <field name="type">view</field>
+            <field name="name">Cuenta corriente con patronos y otros</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_551_child" model="account.account.template">
+            <field name="code">551</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_551"/>
+            <field name="type">other</field>
+            <field name="name">Cuenta corriente con patronos y otros</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_552" model="account.account.template">
+            <field name="code">552</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_55"/>
+            <field name="type">view</field>
+            <field name="name">Cuenta corriente con otras personas y entidades vinculadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5523" model="account.account.template">
+            <field name="code">5523</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_552"/>
+            <field name="type">view</field>
+            <field name="name">Cuenta corriente con empresas del grupo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5523_child" model="account.account.template">
+            <field name="code">5523</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5523"/>
+            <field name="type">other</field>
+            <field name="name">Cuenta corriente con empresas del grupo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5524" model="account.account.template">
+            <field name="code">5524</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_552"/>
+            <field name="type">view</field>
+            <field name="name">Cuenta corriente con empresas asociadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5524_child" model="account.account.template">
+            <field name="code">5524</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5524"/>
+            <field name="type">other</field>
+            <field name="name">Cuenta corriente con empresas asociadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5525" model="account.account.template">
+            <field name="code">5525</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_552"/>
+            <field name="type">view</field>
+            <field name="name">Cuenta corriente con otras partes vinculadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5525_child" model="account.account.template">
+            <field name="code">5525</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5525"/>
+            <field name="type">other</field>
+            <field name="name">Cuenta corriente con otras partes vinculadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_554" model="account.account.template">
+            <field name="code">554</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_55"/>
+            <field name="type">view</field>
+            <field name="name">Cuenta corriente con uniones temporales de empresas y comunidades de bienes</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_554_child" model="account.account.template">
+            <field name="code">554</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_554"/>
+            <field name="type">other</field>
+            <field name="name">Cuenta corriente con uniones temporales de empresas y comunidades de bienes</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_555" model="account.account.template">
+            <field name="code">555</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_55"/>
+            <field name="type">view</field>
+            <field name="name">Partidas pendientes de aplicación</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_555_child" model="account.account.template">
+            <field name="code">555</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_555"/>
+            <field name="type">other</field>
+            <field name="name">Partidas pendientes de aplicación</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_556" model="account.account.template">
+            <field name="code">556</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_55"/>
+            <field name="type">view</field>
+            <field name="name">Desembolsos exigidos sobre participaciones en el patrimonio neto</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5563" model="account.account.template">
+            <field name="code">5563</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_556"/>
+            <field name="type">view</field>
+            <field name="name">Desembolsos exigidos sobre participaciones, empresas del grupo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5563_child" model="account.account.template">
+            <field name="code">5563</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5563"/>
+            <field name="type">other</field>
+            <field name="name">Desembolsos exigidos sobre participaciones, empresas del grupo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5564" model="account.account.template">
+            <field name="code">5564</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_556"/>
+            <field name="type">view</field>
+            <field name="name">Desembolsos exigidos sobre participaciones, empresas asociadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5564_child" model="account.account.template">
+            <field name="code">5564</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5564"/>
+            <field name="type">other</field>
+            <field name="name">Desembolsos exigidos sobre participaciones, empresas asociadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5565" model="account.account.template">
+            <field name="code">5565</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_556"/>
+            <field name="type">view</field>
+            <field name="name">Desembolsos exigidos sobre participaciones, otras partes vinculadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5565_child" model="account.account.template">
+            <field name="code">5565</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5565"/>
+            <field name="type">other</field>
+            <field name="name">Desembolsos exigidos sobre participaciones, otras partes vinculadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5566" model="account.account.template">
+            <field name="code">5566</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_556"/>
+            <field name="type">view</field>
+            <field name="name">Desembolsos exigidos sobre participaciones de otras empresas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5566_child" model="account.account.template">
+            <field name="code">5566</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5566"/>
+            <field name="type">other</field>
+            <field name="name">Desembolsos exigidos sobre participaciones de otras empresas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_557" model="account.account.template">
+            <field name="code">557</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_55"/>
+            <field name="type">view</field>
+            <field name="name">Dividendo activo a cuenta</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_557_child" model="account.account.template">
+            <field name="code">557</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_557"/>
+            <field name="type">other</field>
+            <field name="name">Dividendo activo a cuenta</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_558" model="account.account.template">
+            <field name="code">558</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_55"/>
+            <field name="type">view</field>
+            <field name="name">Fundadores y asociados por desembolsos exigidos</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5580" model="account.account.template">
+            <field name="code">5580</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_558"/>
+            <field name="type">view</field>
+            <field name="name">Socios por desembolsos exigidos sobre acciones o participaciones ordinarias</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5580_child" model="account.account.template">
+            <field name="code">5580</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5580"/>
+            <field name="type">other</field>
+            <field name="name">Socios por desembolsos exigidos sobre acciones o participaciones ordinarias</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5585" model="account.account.template">
+            <field name="code">5585</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_558"/>
+            <field name="type">view</field>
+            <field name="name">Socios por desembolsos exigidos sobre acciones o participaciones consideradas como pasivos financieros</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5585_child" model="account.account.template">
+            <field name="code">5585</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5585"/>
+            <field name="type">other</field>
+            <field name="name">Socios por desembolsos exigidos sobre acciones o participaciones consideradas como pasivos financieros</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_559" model="account.account.template">
+            <field name="code">559</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_55"/>
+            <field name="type">view</field>
+            <field name="name">Derivados financieros a corto plazo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5590" model="account.account.template">
+            <field name="code">5590</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_559"/>
+            <field name="type">view</field>
+            <field name="name">Activos por derivados financieros a corto plazo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5590_child" model="account.account.template">
+            <field name="code">5590</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5590"/>
+            <field name="type">other</field>
+            <field name="name">Activos por derivados financieros a corto plazo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5595" model="account.account.template">
+            <field name="code">5595</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_559"/>
+            <field name="type">view</field>
+            <field name="name">Pasivos por derivados financieros a corto plazo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5595_child" model="account.account.template">
+            <field name="code">5595</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5595"/>
+            <field name="type">other</field>
+            <field name="name">Pasivos por derivados financieros a corto plazo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_56" model="account.account.template">
+            <field name="code">56</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5"/>
+            <field name="type">view</field>
+            <field name="name">Fianzas y depósitos recibidos y constituidos a corto plazo y ajustes por periodificación</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_560" model="account.account.template">
+            <field name="code">560</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_56"/>
+            <field name="type">view</field>
+            <field name="name">Fianzas recibidas a corto plazo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_560_child" model="account.account.template">
+            <field name="code">560</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_560"/>
+            <field name="type">other</field>
+            <field name="name">Fianzas recibidas a corto plazo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_561" model="account.account.template">
+            <field name="code">561</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_56"/>
+            <field name="type">view</field>
+            <field name="name">Depósitos recibidos a corto plazo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_561_child" model="account.account.template">
+            <field name="code">561</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_561"/>
+            <field name="type">other</field>
+            <field name="name">Depósitos recibidos a corto plazo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_565" model="account.account.template">
+            <field name="code">565</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_56"/>
+            <field name="type">view</field>
+            <field name="name">Fianzas constituidas a corto plazo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_565_child" model="account.account.template">
+            <field name="code">565</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_565"/>
+            <field name="type">other</field>
+            <field name="name">Fianzas constituidas a corto plazo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_566" model="account.account.template">
+            <field name="code">566</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_56"/>
+            <field name="type">view</field>
+            <field name="name">Depósitos constituidos a corto plazo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_566_child" model="account.account.template">
+            <field name="code">566</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_566"/>
+            <field name="type">other</field>
+            <field name="name">Depósitos constituidos a corto plazo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_567" model="account.account.template">
+            <field name="code">567</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_56"/>
+            <field name="type">view</field>
+            <field name="name">Intereses pagados por anticipado</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_567_child" model="account.account.template">
+            <field name="code">567</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_567"/>
+            <field name="type">other</field>
+            <field name="name">Intereses pagados por anticipado</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_568" model="account.account.template">
+            <field name="code">568</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_56"/>
+            <field name="type">view</field>
+            <field name="name">Intereses cobrados por anticipado</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_568_child" model="account.account.template">
+            <field name="code">568</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_568"/>
+            <field name="type">other</field>
+            <field name="name">Intereses cobrados por anticipado</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_57" model="account.account.template">
+            <field name="code">57</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5"/>
+            <field name="type">view</field>
+            <field name="name">Tesorería</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_570" model="account.account.template">
+            <field name="code">570</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_57"/>
+            <field name="type">view</field>
+            <field name="name">Caja, euros</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_570_child" model="account.account.template">
+            <field name="code">570</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_570"/>
+            <field name="type">liquidity</field>
+            <field name="name">Caja, euros</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_571" model="account.account.template">
+            <field name="code">571</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_57"/>
+            <field name="type">view</field>
+            <field name="name">Caja, moneda extranjera</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_571_child" model="account.account.template">
+            <field name="code">571</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_571"/>
+            <field name="type">liquidity</field>
+            <field name="name">Caja, moneda extranjera</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_572" model="account.account.template">
+            <field name="code">572</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_57"/>
+            <field name="type">view</field>
+            <field name="name">Bancos e instituciones de crédito c/c vista, euros</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_572_child" model="account.account.template">
+            <field name="code">572</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_572"/>
+            <field name="type">liquidity</field>
+            <field name="name">Bancos e instituciones de crédito c/c vista, euros</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_573" model="account.account.template">
+            <field name="code">573</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_57"/>
+            <field name="type">view</field>
+            <field name="name">Bancos e instituciones de crédito c/c vista, moneda extranjera</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_573_child" model="account.account.template">
+            <field name="code">573</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_573"/>
+            <field name="type">liquidity</field>
+            <field name="name">Bancos e instituciones de crédito c/c vista, moneda extranjera</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_574" model="account.account.template">
+            <field name="code">574</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_57"/>
+            <field name="type">view</field>
+            <field name="name">Bancos e instituciones de crédito, cuentas de ahorro, euros</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_574_child" model="account.account.template">
+            <field name="code">574</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_574"/>
+            <field name="type">liquidity</field>
+            <field name="name">Bancos e instituciones de crédito, cuentas de ahorro, euros</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_575" model="account.account.template">
+            <field name="code">575</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_57"/>
+            <field name="type">view</field>
+            <field name="name">Bancos e instituciones de crédito, cuentas de ahorro, moneda extranjera</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_575_child" model="account.account.template">
+            <field name="code">575</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_575"/>
+            <field name="type">liquidity</field>
+            <field name="name">Bancos e instituciones de crédito, cuentas de ahorro, moneda extranjera</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_576" model="account.account.template">
+            <field name="code">576</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_57"/>
+            <field name="type">view</field>
+            <field name="name">Inversiones a corto plazo de gran liquidez</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_576_child" model="account.account.template">
+            <field name="code">576</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_576"/>
+            <field name="type">liquidity</field>
+            <field name="name">Inversiones a corto plazo de gran liquidez</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_59" model="account.account.template">
+            <field name="code">59</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro del valor de inversiones financieras a corto plazo y de activos no corrientes mantenidos para la venta</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_593" model="account.account.template">
+            <field name="code">593</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_59"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor de participaciones a corto plazo en partes vinculadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5933" model="account.account.template">
+            <field name="code">5933</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_593"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor de participaciones a corto plazo en empresas del grupo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5933_child" model="account.account.template">
+            <field name="code">5933</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5933"/>
+            <field name="type">other</field>
+            <field name="name">Deterioro de valor de participaciones a corto plazo en empresas del grupo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5934" model="account.account.template">
+            <field name="code">5934</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_593"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor de participaciones a corto plazo en empresas asociadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5934_child" model="account.account.template">
+            <field name="code">5934</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5934"/>
+            <field name="type">other</field>
+            <field name="name">Deterioro de valor de participaciones a corto plazo en empresas asociadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5935" model="account.account.template">
+            <field name="code">5935</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_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="financieras"/>
+        </record>
+        <record id="pgc_assoc_5935_child" model="account.account.template">
+            <field name="code">5935</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_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="financieras"/>
+        </record>
+        <record id="pgc_assoc_594" model="account.account.template">
+            <field name="code">594</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_59"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor de valores representativos de deuda a corto plazo de partes vinculadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5943" model="account.account.template">
+            <field name="code">5943</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_594"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor de valores representativos de deuda a corto plazo de empresas del grupo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5943_child" model="account.account.template">
+            <field name="code">5943</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5943"/>
+            <field name="type">other</field>
+            <field name="name">Deterioro de valor de valores representativos de deuda a corto plazo de empresas del grupo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5944" model="account.account.template">
+            <field name="code">5944</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_594"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor de valores representativos de deuda a corto plazo de empresas asociadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5944_child" model="account.account.template">
+            <field name="code">5944</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5944"/>
+            <field name="type">other</field>
+            <field name="name">Deterioro de valor de valores representativos de deuda a corto plazo de empresas asociadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5945" model="account.account.template">
+            <field name="code">5945</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_594"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor de valores representativos de deuda a corto plazo de otras partes vinculadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5945_child" model="account.account.template">
+            <field name="code">5945</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5945"/>
+            <field name="type">other</field>
+            <field name="name">Deterioro de valor de valores representativos de deuda a corto plazo de otras partes vinculadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_595" model="account.account.template">
+            <field name="code">595</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_59"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor de créditos a corto plazo a partes vinculadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5953" model="account.account.template">
+            <field name="code">5953</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_595"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor de créditos a corto plazo a empresas del grupo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5953_child" model="account.account.template">
+            <field name="code">5953</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5953"/>
+            <field name="type">other</field>
+            <field name="name">Deterioro de valor de créditos a corto plazo a empresas del grupo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5954" model="account.account.template">
+            <field name="code">5954</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_595"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor de créditos a corto plazo a empresas asociadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5954_child" model="account.account.template">
+            <field name="code">5954</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5954"/>
+            <field name="type">other</field>
+            <field name="name">Deterioro de valor de créditos a corto plazo a empresas asociadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5955" model="account.account.template">
+            <field name="code">5955</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_595"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor de créditos a corto plazo a otras partes vinculadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5955_child" model="account.account.template">
+            <field name="code">5955</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5955"/>
+            <field name="type">other</field>
+            <field name="name">Deterioro de valor de créditos a corto plazo a otras partes vinculadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_596" model="account.account.template">
+            <field name="code">596</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_59"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor de participaciones a corto plazo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_596_child" model="account.account.template">
+            <field name="code">596</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_596"/>
+            <field name="type">other</field>
+            <field name="name">Deterioro de valor de participaciones a corto plazo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_597" model="account.account.template">
+            <field name="code">597</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_59"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor de valores representativos de deuda a corto plazo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_597_child" model="account.account.template">
+            <field name="code">597</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_597"/>
+            <field name="type">other</field>
+            <field name="name">Deterioro de valor de valores representativos de deuda a corto plazo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_598" model="account.account.template">
+            <field name="code">598</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_59"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor de créditos a corto plazo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_598_child" model="account.account.template">
+            <field name="code">598</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_598"/>
+            <field name="type">other</field>
+            <field name="name">Deterioro de valor de créditos a corto plazo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_6" model="account.account.template">
+            <field name="code">6</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_0"/>
+            <field name="type">view</field>
+            <field name="name">Compras y Gastos</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_60" model="account.account.template">
+            <field name="code">60</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6"/>
+            <field name="type">view</field>
+            <field name="name">Compras</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_600" model="account.account.template">
+            <field name="code">600</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_60"/>
+            <field name="type">view</field>
+            <field name="name">Compras de bienes destinados a la actividad</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_600_child" model="account.account.template">
+            <field name="code">600</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_600"/>
+            <field name="type">other</field>
+            <field name="name">Compras de bienes destinados a la actividad</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_601" model="account.account.template">
+            <field name="code">601</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_60"/>
+            <field name="type">view</field>
+            <field name="name">Compras de materias primas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_601_child" model="account.account.template">
+            <field name="code">601</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_601"/>
+            <field name="type">other</field>
+            <field name="name">Compras de materias primas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_602" model="account.account.template">
+            <field name="code">602</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_60"/>
+            <field name="type">view</field>
+            <field name="name">Compras de otros aprovisionamientos</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_602_child" model="account.account.template">
+            <field name="code">602</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_602"/>
+            <field name="type">other</field>
+            <field name="name">Compras de otros aprovisionamientos</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_606" model="account.account.template">
+            <field name="code">606</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_60"/>
+            <field name="type">view</field>
+            <field name="name">Descuentos sobre compras por pronto pago</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6060" model="account.account.template">
+            <field name="code">6060</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_606"/>
+            <field name="type">view</field>
+            <field name="name">Descuentos sobre compras por pronto pago de bienes destinados a la actividad</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6060_child" model="account.account.template">
+            <field name="code">6060</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6060"/>
+            <field name="type">other</field>
+            <field name="name">Descuentos sobre compras por pronto pago de bienes destinados a la actividad</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6061" model="account.account.template">
+            <field name="code">6061</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_606"/>
+            <field name="type">view</field>
+            <field name="name">Descuentos sobre compras por pronto pago de materias primas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6061_child" model="account.account.template">
+            <field name="code">6061</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6061"/>
+            <field name="type">other</field>
+            <field name="name">Descuentos sobre compras por pronto pago de materias primas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6062" model="account.account.template">
+            <field name="code">6062</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_606"/>
+            <field name="type">view</field>
+            <field name="name">Descuentos sobre compras por pronto pago de otros aprovisionamientos</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6062_child" model="account.account.template">
+            <field name="code">6062</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6062"/>
+            <field name="type">other</field>
+            <field name="name">Descuentos sobre compras por pronto pago de otros aprovisionamientos</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_607" model="account.account.template">
+            <field name="code">607</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_60"/>
+            <field name="type">view</field>
+            <field name="name">Trabajos realizados por otras empresas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_607_child" model="account.account.template">
+            <field name="code">607</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_607"/>
+            <field name="type">other</field>
+            <field name="name">Trabajos realizados por otras empresas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_608" model="account.account.template">
+            <field name="code">608</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_60"/>
+            <field name="type">view</field>
+            <field name="name">Devoluciones de compras y operaciones similares</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6080" model="account.account.template">
+            <field name="code">6080</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_608"/>
+            <field name="type">view</field>
+            <field name="name">Devoluciones de compras de bienes destinados a la actividad</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6080_child" model="account.account.template">
+            <field name="code">6080</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6080"/>
+            <field name="type">other</field>
+            <field name="name">Devoluciones de compras de bienes destinados a la actividad</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6081" model="account.account.template">
+            <field name="code">6081</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_608"/>
+            <field name="type">view</field>
+            <field name="name">Devoluciones de compras de materias primas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6081_child" model="account.account.template">
+            <field name="code">6081</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6081"/>
+            <field name="type">other</field>
+            <field name="name">Devoluciones de compras de materias primas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6082" model="account.account.template">
+            <field name="code">6082</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_608"/>
+            <field name="type">view</field>
+            <field name="name">Devoluciones de compras de otros aprovisionamientos</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6082_child" model="account.account.template">
+            <field name="code">6082</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6082"/>
+            <field name="type">other</field>
+            <field name="name">Devoluciones de compras de otros aprovisionamientos</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_609" model="account.account.template">
+            <field name="code">609</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_60"/>
+            <field name="type">view</field>
+            <field name="name">“Rappels” por compras</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6090" model="account.account.template">
+            <field name="code">6090</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_609"/>
+            <field name="type">view</field>
+            <field name="name">"Rappels" por compras de bienes destinados a la actividad</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6090_child" model="account.account.template">
+            <field name="code">6090</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6090"/>
+            <field name="type">other</field>
+            <field name="name">"Rappels" por compras de bienes destinados a la actividad</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6091" model="account.account.template">
+            <field name="code">6091</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_609"/>
+            <field name="type">view</field>
+            <field name="name">"Rappels" por compras de materias primas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6091_child" model="account.account.template">
+            <field name="code">6091</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6091"/>
+            <field name="type">other</field>
+            <field name="name">"Rappels" por compras de materias primas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6092" model="account.account.template">
+            <field name="code">6092</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_609"/>
+            <field name="type">view</field>
+            <field name="name">"Rappels" por compras de otros aprovisionamientos</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6092_child" model="account.account.template">
+            <field name="code">6092</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6092"/>
+            <field name="type">other</field>
+            <field name="name">"Rappels" por compras de otros aprovisionamientos</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_61" model="account.account.template">
+            <field name="code">61</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6"/>
+            <field name="type">view</field>
+            <field name="name">Variación de existencias</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_610" model="account.account.template">
+            <field name="code">610</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_61"/>
+            <field name="type">view</field>
+            <field name="name">Variación de existencias de bienes destinados a la actividad</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_610_child" model="account.account.template">
+            <field name="code">610</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_610"/>
+            <field name="type">other</field>
+            <field name="name">Variación de existencias de mercaderías</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_611" model="account.account.template">
+            <field name="code">611</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_61"/>
+            <field name="type">view</field>
+            <field name="name">Variación de existencias de materias primas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_611_child" model="account.account.template">
+            <field name="code">611</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_611"/>
+            <field name="type">other</field>
+            <field name="name">Variación de existencias de materias primas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_612" model="account.account.template">
+            <field name="code">612</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_61"/>
+            <field name="type">view</field>
+            <field name="name">Variación de existencias de otros aprovisionamientos</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_612_child" model="account.account.template">
+            <field name="code">612</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_612"/>
+            <field name="type">other</field>
+            <field name="name">Variación de existencias de otros aprovisionamientos</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_62" model="account.account.template">
+            <field name="code">62</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6"/>
+            <field name="type">view</field>
+            <field name="name">Servicios Exteriores</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_620" model="account.account.template">
+            <field name="code">620</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_62"/>
+            <field name="type">view</field>
+            <field name="name">Gastos en investigación y desarrollo del ejercicio</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_620_child" model="account.account.template">
+            <field name="code">620</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_620"/>
+            <field name="type">other</field>
+            <field name="name">Gastos en investigación y desarrollo del ejercicio</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_621" model="account.account.template">
+            <field name="code">621</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_62"/>
+            <field name="type">view</field>
+            <field name="name">Arrendamientos y cánones</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_621_child" model="account.account.template">
+            <field name="code">621</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_621"/>
+            <field name="type">other</field>
+            <field name="name">Arrendamientos y cánones</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_622" model="account.account.template">
+            <field name="code">622</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_62"/>
+            <field name="type">view</field>
+            <field name="name">Reparaciones y conservación</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_622_child" model="account.account.template">
+            <field name="code">622</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_622"/>
+            <field name="type">other</field>
+            <field name="name">Reparaciones y conservación</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_623" model="account.account.template">
+            <field name="code">623</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_62"/>
+            <field name="type">view</field>
+            <field name="name">Servicios de profesionales independientes</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_623_child" model="account.account.template">
+            <field name="code">623</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_623"/>
+            <field name="type">other</field>
+            <field name="name">Servicios de profesionales independientes</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_624" model="account.account.template">
+            <field name="code">624</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_62"/>
+            <field name="type">view</field>
+            <field name="name">Transportes</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_624_child" model="account.account.template">
+            <field name="code">624</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_624"/>
+            <field name="type">other</field>
+            <field name="name">Transportes</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_625" model="account.account.template">
+            <field name="code">625</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_62"/>
+            <field name="type">view</field>
+            <field name="name">Primas de seguros</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_625_child" model="account.account.template">
+            <field name="code">625</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_625"/>
+            <field name="type">other</field>
+            <field name="name">Primas de seguros</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_626" model="account.account.template">
+            <field name="code">626</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_62"/>
+            <field name="type">view</field>
+            <field name="name">Servicios bancarios y similares</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_626_child" model="account.account.template">
+            <field name="code">626</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_626"/>
+            <field name="type">other</field>
+            <field name="name">Servicios bancarios y similares</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_627" model="account.account.template">
+            <field name="code">627</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_62"/>
+            <field name="type">view</field>
+            <field name="name">Publicidad, propaganda y relaciones públicas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_627_child" model="account.account.template">
+            <field name="code">627</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_627"/>
+            <field name="type">other</field>
+            <field name="name">Publicidad, propaganda y relaciones públicas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_628" model="account.account.template">
+            <field name="code">628</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_62"/>
+            <field name="type">view</field>
+            <field name="name">Suministros</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_628_child" model="account.account.template">
+            <field name="code">628</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_628"/>
+            <field name="type">other</field>
+            <field name="name">Suministros</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_629" model="account.account.template">
+            <field name="code">629</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_62"/>
+            <field name="type">view</field>
+            <field name="name">Otros servicios</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_629_child" model="account.account.template">
+            <field name="code">629</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_629"/>
+            <field name="type">other</field>
+            <field name="name">Otros servicios</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_63" model="account.account.template">
+            <field name="code">63</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6"/>
+            <field name="type">view</field>
+            <field name="name">Tributos</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_630" model="account.account.template">
+            <field name="code">630</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_63"/>
+            <field name="type">view</field>
+            <field name="name">Impuesto sobre beneficios</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6300" model="account.account.template">
+            <field name="code">6300</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_630"/>
+            <field name="type">view</field>
+            <field name="name">Impuesto corriente</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6300_child" model="account.account.template">
+            <field name="code">6300</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6300"/>
+            <field name="type">other</field>
+            <field name="name">Impuesto corriente</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6301" model="account.account.template">
+            <field name="code">6301</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_630"/>
+            <field name="type">view</field>
+            <field name="name">Impuesto diferido</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6301_child" model="account.account.template">
+            <field name="code">6301</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6301"/>
+            <field name="type">other</field>
+            <field name="name">Impuesto diferido</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_631" model="account.account.template">
+            <field name="code">631</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_63"/>
+            <field name="type">view</field>
+            <field name="name">Otros tributos</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_631_child" model="account.account.template">
+            <field name="code">631</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_631"/>
+            <field name="type">other</field>
+            <field name="name">Otros tributos</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_633" model="account.account.template">
+            <field name="code">633</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_63"/>
+            <field name="type">view</field>
+            <field name="name">Ajustes negativos en la imposición sobre beneficios</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_633_child" model="account.account.template">
+            <field name="code">633</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_633"/>
+            <field name="type">other</field>
+            <field name="name">Ajustes negativos en la imposición sobre beneficios</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_634" model="account.account.template">
+            <field name="code">634</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_63"/>
+            <field name="type">view</field>
+            <field name="name">Ajustes negativos en la imposición indirecta</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6341" model="account.account.template">
+            <field name="code">6341</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_634"/>
+            <field name="type">view</field>
+            <field name="name">Ajustes negativos en IVA de activo corriente</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6341_child" model="account.account.template">
+            <field name="code">6341</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6341"/>
+            <field name="type">other</field>
+            <field name="name">Ajustes negativos en IVA de activo corriente</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6342" model="account.account.template">
+            <field name="code">6342</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_634"/>
+            <field name="type">view</field>
+            <field name="name">Ajustes negativos en IVA de inversiones</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6342_child" model="account.account.template">
+            <field name="code">6342</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6342"/>
+            <field name="type">other</field>
+            <field name="name">Ajustes negativos en IVA de inversiones</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_636" model="account.account.template">
+            <field name="code">636</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_63"/>
+            <field name="type">view</field>
+            <field name="name">Devolución de impuestos</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_636_child" model="account.account.template">
+            <field name="code">636</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_636"/>
+            <field name="type">other</field>
+            <field name="name">Devolución de impuestos</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_638" model="account.account.template">
+            <field name="code">638</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_63"/>
+            <field name="type">view</field>
+            <field name="name">Ajustes positivos en la imposición sobre beneficios</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_638_child" model="account.account.template">
+            <field name="code">638</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_638"/>
+            <field name="type">other</field>
+            <field name="name">Ajustes positivos en la imposición sobre beneficios</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_639" model="account.account.template">
+            <field name="code">639</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_63"/>
+            <field name="type">view</field>
+            <field name="name">Ajustes positivos en la imposición indirecta</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6391" model="account.account.template">
+            <field name="code">6391</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_639"/>
+            <field name="type">view</field>
+            <field name="name">Ajustes positivos en IVA de activo corriente</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6391_child" model="account.account.template">
+            <field name="code">6391</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6391"/>
+            <field name="type">other</field>
+            <field name="name">Ajustes positivos en IVA de activo corriente</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6392" model="account.account.template">
+            <field name="code">6392</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_639"/>
+            <field name="type">view</field>
+            <field name="name">Ajustes positivos en IVA de inversiones</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6392_child" model="account.account.template">
+            <field name="code">6392</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6392"/>
+            <field name="type">other</field>
+            <field name="name">Ajustes positivos en IVA de inversiones</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_64" model="account.account.template">
+            <field name="code">64</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6"/>
+            <field name="type">view</field>
+            <field name="name">Gastos de personal</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_640" model="account.account.template">
+            <field name="code">640</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_64"/>
+            <field name="type">view</field>
+            <field name="name">Sueldos y salarios</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_640_child" model="account.account.template">
+            <field name="code">640</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_640"/>
+            <field name="type">other</field>
+            <field name="name">Sueldos y salarios</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_641" model="account.account.template">
+            <field name="code">641</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_64"/>
+            <field name="type">view</field>
+            <field name="name">Indemnizaciones</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_641_child" model="account.account.template">
+            <field name="code">641</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_641"/>
+            <field name="type">other</field>
+            <field name="name">Indemnizaciones</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_642" model="account.account.template">
+            <field name="code">642</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_64"/>
+            <field name="type">view</field>
+            <field name="name">Seguridad Social a cargo de la empresa</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_642_child" model="account.account.template">
+            <field name="code">642</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_642"/>
+            <field name="type">other</field>
+            <field name="name">Seguridad Social a cargo de la empresa</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_649" model="account.account.template">
+            <field name="code">649</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_64"/>
+            <field name="type">view</field>
+            <field name="name">Otros gastos sociales</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_649_child" model="account.account.template">
+            <field name="code">649</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_649"/>
+            <field name="type">other</field>
+            <field name="name">Otros gastos sociales</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_65" model="account.account.template">
+            <field name="code">65</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6"/>
+            <field name="type">view</field>
+            <field name="name">Ayudas monetarias de la entidad y otros gastos de gestión</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_650" model="account.account.template">
+            <field name="code">650</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_65"/>
+            <field name="type">view</field>
+            <field name="name">Ayudas monetarias</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+
+        <record id="pgc_assoc_6501" model="account.account.template">
+            <field name="code">6501</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_650"/>
+            <field name="type">view</field>
+            <field name="name">Ayudas monetarias individuales</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6501_child" model="account.account.template">
+            <field name="code">6501</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6501"/>
+            <field name="type">other</field>
+            <field name="name">Ayudas monetarias individuales</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+
+        <record id="pgc_assoc_6502" model="account.account.template">
+            <field name="code">6502</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_650"/>
+            <field name="type">view</field>
+            <field name="name">Ayudas monetarias a entidades</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6502_child" model="account.account.template">
+            <field name="code">6502</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6502"/>
+            <field name="type">other</field>
+            <field name="name">Ayudas monetarias a entidades</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+
+        <record id="pgc_assoc_6503" model="account.account.template">
+            <field name="code">6503</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_650"/>
+            <field name="type">view</field>
+            <field name="name">Ayudas monetarias realizadas a través de otras entidades o centros</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6503_child" model="account.account.template">
+            <field name="code">6503</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6503"/>
+            <field name="type">other</field>
+            <field name="name">Ayudas monetarias realizadas a través de otras entidades o centros</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+
+        <record id="pgc_assoc_6504" model="account.account.template">
+            <field name="code">6504</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_650"/>
+            <field name="type">view</field>
+            <field name="name">Ayudas monetarias de cooperación internacional</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6504_child" model="account.account.template">
+            <field name="code">6504</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6504"/>
+            <field name="type">other</field>
+            <field name="name">Ayudas monetarias de cooperación internacional</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+
+
+
+
+        <record id="pgc_assoc_651" model="account.account.template">
+            <field name="code">651</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_65"/>
+            <field name="type">view</field>
+            <field name="name">Ayudas no monetarias</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6510" model="account.account.template">
+            <field name="code">6510</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_651"/>
+            <field name="type">view</field>
+            <field name="name">Beneficio transferido (gestor)</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6510_child" model="account.account.template">
+            <field name="code">6510</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6510"/>
+            <field name="type">other</field>
+            <field name="name">Beneficio transferido (gestor)</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6511" model="account.account.template">
+            <field name="code">6511</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_651"/>
+            <field name="type">view</field>
+            <field name="name">Ayudas no monetarias individuales</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6511_child" model="account.account.template">
+            <field name="code">6511</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6511"/>
+            <field name="type">other</field>
+            <field name="name">Ayudas no monetarias individuales</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6512" model="account.account.template">
+            <field name="code">6512</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_651"/>
+            <field name="type">view</field>
+            <field name="name">Ayudas no monetarias a entidades</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6512_child" model="account.account.template">
+            <field name="code">6512</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6512"/>
+            <field name="type">other</field>
+            <field name="name">Ayudas no monetarias a entidades</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+
+        <record id="pgc_assoc_6513" model="account.account.template">
+            <field name="code">6513</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_651"/>
+            <field name="type">view</field>
+            <field name="name">Ayudas no monetarias realizadas a través de otras entidades o centros</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6513_child" model="account.account.template">
+            <field name="code">6513</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6513"/>
+            <field name="type">other</field>
+            <field name="name">Ayudas no monetarias realizadas a través de otras entidades o centros</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+
+        <record id="pgc_assoc_6514" model="account.account.template">
+            <field name="code">6514</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_651"/>
+            <field name="type">view</field>
+            <field name="name">Ayudas no monetarias de cooperación internacional</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6514_child" model="account.account.template">
+            <field name="code">6514</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6514"/>
+            <field name="type">other</field>
+            <field name="name">Ayudas no monetarias de cooperación internacional</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+
+        <record id="pgc_assoc_653" model="account.account.template">
+            <field name="code">653</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_65"/>
+            <field name="type">view</field>
+            <field name="name">Compensación de gastos por prestaciones de colaboración</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_653_child" model="account.account.template">
+            <field name="code">653</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_653"/>
+            <field name="type">other</field>
+            <field name="name">Compensación de gastos por prestaciones de colaboración</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+
+        <record id="pgc_assoc_654" model="account.account.template">
+            <field name="code">654</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_65"/>
+            <field name="type">view</field>
+            <field name="name">Reembolsos de gastos al órgano de gobierno</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_654_child" model="account.account.template">
+            <field name="code">654</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_654"/>
+            <field name="type">other</field>
+            <field name="name">Reembolsos de gastos al órgano de gobierno</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+
+        <record id="pgc_assoc_655" model="account.account.template">
+            <field name="code">655</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_65"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas de créditos derivados de la actividad incobrables</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_655_child" model="account.account.template">
+            <field name="code">655</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_655"/>
+            <field name="type">other</field>
+            <field name="name">Pérdidas de créditos derivados de la actividad incobrables</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+
+
+        <record id="pgc_assoc_656" model="account.account.template">
+            <field name="code">656</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_65"/>
+            <field name="type">view</field>
+            <field name="name">Resultados de operaciones en común</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6560" model="account.account.template">
+            <field name="code">6560</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_656"/>
+            <field name="type">view</field>
+            <field name="name">Beneficio transferido (gestor)</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6560_child" model="account.account.template">
+            <field name="code">6560</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6560"/>
+            <field name="type">other</field>
+            <field name="name">Beneficio transferido (gestor)</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+
+        <record id="pgc_assoc_6561" model="account.account.template">
+            <field name="code">6561</field>
+            <field name="reconcile" eval="False"/>    
+            <field name="parent_id" ref="pgc_assoc_656"/>
+            <field name="type">view</field>
+            <field name="name">Pérdida soportada (partícipe o asociado no gestor)</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6561_child" model="account.account.template">
+            <field name="code">6561</field>
+            <field name="reconcile" eval="False"/>    
+            <field name="parent_id" ref="pgc_assoc_6561"/>
+            <field name="type">other</field>
+            <field name="name">Pérdida soportada(partícipe o asociado no gestor)</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+
+        <record id="pgc_assoc_658" model="account.account.template">
+            <field name="code">658</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_65"/>
+            <field name="type">view</field>
+            <field name="name">Reintegro de subvenciones, donaciones y legados recibidos, afectados a la actividad propia de la entidad</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_658_child" model="account.account.template">
+            <field name="code">658</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_658"/>
+            <field name="type">other</field>
+            <field name="name">Reintegro de subvenciones, donaciones y legados recibidos, afectos a la actividad propia de la entidad </field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+
+
+        <record id="pgc_assoc_659" model="account.account.template">
+            <field name="code">659</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_65"/>
+            <field name="type">view</field>
+            <field name="name">Otras pérdidas en gestión corriente</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_659_child" model="account.account.template">
+            <field name="code">659</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_659"/>
+            <field name="type">other</field>
+            <field name="name">Otras pérdidas en gestión corriente</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_66" model="account.account.template">
+            <field name="code">66</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6"/>
+            <field name="type">view</field>
+            <field name="name">Gastos financieros</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_660" model="account.account.template">
+            <field name="code">660</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_66"/>
+            <field name="type">view</field>
+            <field name="name">Gastos financieros por actualización de provisiones</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_660_child" model="account.account.template">
+            <field name="code">660</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_660"/>
+            <field name="type">other</field>
+            <field name="name">Gastos financieros por actualización de provisiones</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_661" model="account.account.template">
+            <field name="code">661</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_66"/>
+            <field name="type">view</field>
+            <field name="name">Intereses de obligaciones y bonos</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6610" model="account.account.template">
+            <field name="code">6610</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_661"/>
+            <field name="type">view</field>
+            <field name="name">Intereses de obligaciones y bonos, empresas del grupo</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6610_child" model="account.account.template">
+            <field name="code">6610</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6610"/>
+            <field name="type">other</field>
+            <field name="name">Intereses de obligaciones y bonos, empresas del grupo</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6611" model="account.account.template">
+            <field name="code">6611</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_661"/>
+            <field name="type">view</field>
+            <field name="name">Intereses de obligaciones y bonos, empresas asociadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6611_child" model="account.account.template">
+            <field name="code">6611</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6611"/>
+            <field name="type">other</field>
+            <field name="name">Intereses de obligaciones y bonos, empresas asociadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6612" model="account.account.template">
+            <field name="code">6612</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_661"/>
+            <field name="type">view</field>
+            <field name="name">Intereses de obligaciones y bonos, otras partes vinculadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6612_child" model="account.account.template">
+            <field name="code">6612</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6612"/>
+            <field name="type">other</field>
+            <field name="name">Intereses de obligaciones y bonos, otras partes vinculadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6613" model="account.account.template">
+            <field name="code">6613</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_661"/>
+            <field name="type">view</field>
+            <field name="name">Intereses de obligaciones y bonos, otras empresas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6613_child" model="account.account.template">
+            <field name="code">6613</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6613"/>
+            <field name="type">other</field>
+            <field name="name">Intereses de obligaciones y bonos, otras empresas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6615" model="account.account.template">
+            <field name="code">6615</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_661"/>
+            <field name="type">view</field>
+            <field name="name">Intereses de obligaciones y bonos a corto plazo, empresas del grupo</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6615_child" model="account.account.template">
+            <field name="code">6615</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6615"/>
+            <field name="type">other</field>
+            <field name="name">Intereses de obligaciones y bonos a corto plazo, empresas del grupo</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6616" model="account.account.template">
+            <field name="code">6616</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_661"/>
+            <field name="type">view</field>
+            <field name="name">Intereses de obligaciones y bonos a corto plazo, empresas asociadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6616_child" model="account.account.template">
+            <field name="code">6616</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6616"/>
+            <field name="type">other</field>
+            <field name="name">Intereses de obligaciones y bonos a corto plazo, empresas asociadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6617" model="account.account.template">
+            <field name="code">6617</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_661"/>
+            <field name="type">view</field>
+            <field name="name">Intereses de obligaciones y bonos a corto plazo, otras partes vinculadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6617_child" model="account.account.template">
+            <field name="code">6617</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6617"/>
+            <field name="type">other</field>
+            <field name="name">Intereses de obligaciones y bonos a corto plazo, otras partes vinculadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6618" model="account.account.template">
+            <field name="code">6618</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_661"/>
+            <field name="type">view</field>
+            <field name="name">Intereses de obligaciones y bonos a corto plazo, otras empresas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6618_child" model="account.account.template">
+            <field name="code">6618</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6618"/>
+            <field name="type">other</field>
+            <field name="name">Intereses de obligaciones y bonos a corto plazo, otras empresas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_662" model="account.account.template">
+            <field name="code">662</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_66"/>
+            <field name="type">view</field>
+            <field name="name">Ingresos de créditos a largo plazo</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6620" model="account.account.template">
+            <field name="code">6620</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_662"/>
+            <field name="type">view</field>
+            <field name="name">Ingresos de créditos a largo plazo, empresas del grupo</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6620_child" model="account.account.template">
+            <field name="code">6620</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6620"/>
+            <field name="type">other</field>
+            <field name="name">Ingresos de créditos a largo plazo, empresas del grupo</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6621" model="account.account.template">
+            <field name="code">6621</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_662"/>
+            <field name="type">view</field>
+            <field name="name">Ingresos de créditos a largo plazo, empresas asociadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6621_child" model="account.account.template">
+            <field name="code">6621</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6621"/>
+            <field name="type">other</field>
+            <field name="name">Ingresos de créditos a largo plazo, empresas asociadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6622" model="account.account.template">
+            <field name="code">6622</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_662"/>
+            <field name="type">view</field>
+            <field name="name">Ingresos de créditos a largo plazo, otras partes vinculadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6622_child" model="account.account.template">
+            <field name="code">6622</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6622"/>
+            <field name="type">other</field>
+            <field name="name">Ingresos de créditos a largo plazo, otras partes vinculadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6623" model="account.account.template">
+            <field name="code">6623</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_662"/>
+            <field name="type">view</field>
+            <field name="name">Ingresos de créditos a largo plazo con entidades de crédito</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6623_child" model="account.account.template">
+            <field name="code">6623</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6623"/>
+            <field name="type">other</field>
+            <field name="name">Ingresos de créditos a largo plazo con entidades de crédito</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6624" model="account.account.template">
+            <field name="code">6624</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_662"/>
+            <field name="type">view</field>
+            <field name="name">Ingresos de créditos a largo plazo, otras empresas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6624_child" model="account.account.template">
+            <field name="code">6624</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6624"/>
+            <field name="type">other</field>
+            <field name="name">Ingresos de créditos a largo plazo, otras empresas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_663" model="account.account.template">
+            <field name="code">663</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_66"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas por valoración de activos y pasivos financieros por su valor razonable</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_663_child" model="account.account.template">
+            <field name="code">663</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_663"/>
+            <field name="type">other</field>
+            <field name="name">Pérdidas por valoración de activos y pasivos financieros por su valor razonable</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_664" model="account.account.template">
+            <field name="code">664</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_66"/>
+            <field name="type">view</field>
+            <field name="name">Dividendos de acciones o participaciones consideradas como pasivos financieros</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6640" model="account.account.template">
+            <field name="code">6640</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_664"/>
+            <field name="type">view</field>
+            <field name="name">Dividendos de pasivos, empresas del grupo</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6640_child" model="account.account.template">
+            <field name="code">6640</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6640"/>
+            <field name="type">other</field>
+            <field name="name">Dividendos de pasivos, empresas del grupo</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6641" model="account.account.template">
+            <field name="code">6641</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_664"/>
+            <field name="type">view</field>
+            <field name="name">Dividendos de pasivos, empresas asociadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6641_child" model="account.account.template">
+            <field name="code">6641</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6641"/>
+            <field name="type">other</field>
+            <field name="name">Dividendos de pasivos, empresas asociadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6642" model="account.account.template">
+            <field name="code">6642</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_664"/>
+            <field name="type">view</field>
+            <field name="name">Dividendos de pasivos, otras partes vinculadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6642_child" model="account.account.template">
+            <field name="code">6642</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6642"/>
+            <field name="type">other</field>
+            <field name="name">Dividendos de pasivos, otras partes vinculadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6643" model="account.account.template">
+            <field name="code">6643</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_664"/>
+            <field name="type">view</field>
+            <field name="name">Dividendos de pasivos, otras empresas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6643_child" model="account.account.template">
+            <field name="code">6643</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6643"/>
+            <field name="type">other</field>
+            <field name="name">Dividendos de pasivos, otras empresas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_665" model="account.account.template">
+            <field name="code">665</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_66"/>
+            <field name="type">view</field>
+            <field name="name">Intereses por descuento de efectos y operaciones de “factoring”</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6650" model="account.account.template">
+            <field name="code">6650</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_665"/>
+            <field name="type">view</field>
+            <field name="name">Intereses por descuento de efectos en entidades de crédito del grupo</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6650_child" model="account.account.template">
+            <field name="code">6650</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6650"/>
+            <field name="type">other</field>
+            <field name="name">Intereses por descuento de efectos en entidades de crédito del grupo</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6651" model="account.account.template">
+            <field name="code">6651</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_665"/>
+            <field name="type">view</field>
+            <field name="name">Intereses por descuento de efectos en entidades de crédito asociadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6651_child" model="account.account.template">
+            <field name="code">6651</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6651"/>
+            <field name="type">other</field>
+            <field name="name">Intereses por descuento de efectos en entidades de crédito asociadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6652" model="account.account.template">
+            <field name="code">6652</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_665"/>
+            <field name="type">view</field>
+            <field name="name">Intereses por descuento de efectos en entidades de crédito vinculadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6652_child" model="account.account.template">
+            <field name="code">6652</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6652"/>
+            <field name="type">other</field>
+            <field name="name">Intereses por descuento de efectos en entidades de crédito vinculadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6653" model="account.account.template">
+            <field name="code">6653</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_665"/>
+            <field name="type">view</field>
+            <field name="name">Intereses por descuento de efectos en otras entidades de crédito</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6653_child" model="account.account.template">
+            <field name="code">6653</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6653"/>
+            <field name="type">other</field>
+            <field name="name">Intereses por descuento de efectos en otras entidades de crédito</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6654" model="account.account.template">
+            <field name="code">6654</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_665"/>
+            <field name="type">view</field>
+            <field name="name">Intereses por operaciones de "factoring" con entidades de crédito del grupo</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6654_child" model="account.account.template">
+            <field name="code">6654</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6654"/>
+            <field name="type">other</field>
+            <field name="name">Intereses por operaciones de "factoring" con entidades de crédito del grupo</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6655" model="account.account.template">
+            <field name="code">6655</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_665"/>
+            <field name="type">view</field>
+            <field name="name">Intereses por operaciones de "factoring" con entidades de crédito asociadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6655_child" model="account.account.template">
+            <field name="code">6655</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6655"/>
+            <field name="type">other</field>
+            <field name="name">Intereses por operaciones de "factoring" con entidades de crédito asociadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6656" model="account.account.template">
+            <field name="code">6656</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_665"/>
+            <field name="type">view</field>
+            <field name="name">Intereses por operaciones de "factoring" con entidades de crédito vinculadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6656_child" model="account.account.template">
+            <field name="code">6656</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6656"/>
+            <field name="type">other</field>
+            <field name="name">Intereses por operaciones de "factoring" con entidades de crédito vinculadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6657" model="account.account.template">
+            <field name="code">6657</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_665"/>
+            <field name="type">view</field>
+            <field name="name">Intereses por operaciones de "factoring" con otras entidades de crédito</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6657_child" model="account.account.template">
+            <field name="code">6657</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6657"/>
+            <field name="type">other</field>
+            <field name="name">Intereses por operaciones de "factoring" con otras entidades de crédito</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_666" model="account.account.template">
+            <field name="code">666</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_66"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas en participaciones y valores representativos de deuda</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6660" model="account.account.template">
+            <field name="code">6660</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_666"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas en valores representativos de deuda, empresas del grupo</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6660_child" model="account.account.template">
+            <field name="code">6660</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6660"/>
+            <field name="type">other</field>
+            <field name="name">Pérdidas en valores representativos de deuda, empresas del grupo</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6661" model="account.account.template">
+            <field name="code">6661</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_666"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas en valores representativos de deuda, empresas asociadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6661_child" model="account.account.template">
+            <field name="code">6661</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6661"/>
+            <field name="type">other</field>
+            <field name="name">Pérdidas en valores representativos de deuda, empresas asociadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6662" model="account.account.template">
+            <field name="code">6662</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_666"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas en valores representativos de deuda, otras partes vinculadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6662_child" model="account.account.template">
+            <field name="code">6662</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6662"/>
+            <field name="type">other</field>
+            <field name="name">Pérdidas en valores representativos de deuda, otras partes vinculadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6663" model="account.account.template">
+            <field name="code">6663</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_666"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas en valores representativos de deuda, otras empresas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6663_child" model="account.account.template">
+            <field name="code">6663</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6663"/>
+            <field name="type">other</field>
+            <field name="name">Pérdidas en valores representativos de deuda, otras empresas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6665" model="account.account.template">
+            <field name="code">6665</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_666"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas en valores representativos de deuda a corto plazo, empresas del grupo</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6665_child" model="account.account.template">
+            <field name="code">6665</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6665"/>
+            <field name="type">other</field>
+            <field name="name">Pérdidas en valores representativos de deuda a corto plazo, empresas del grupo</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6666" model="account.account.template">
+            <field name="code">6666</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_666"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas en valores representativos de deuda a corto plazo, empresas asociadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6666_child" model="account.account.template">
+            <field name="code">6666</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6666"/>
+            <field name="type">other</field>
+            <field name="name">Pérdidas en valores representativos de deuda a corto plazo, empresas asociadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6667" model="account.account.template">
+            <field name="code">6667</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_666"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas en valores representativos de deuda a corto plazo, otras partes vinculadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6667_child" model="account.account.template">
+            <field name="code">6667</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6667"/>
+            <field name="type">other</field>
+            <field name="name">Pérdidas en valores representativos de deuda a corto plazo, otras partes vinculadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6668" model="account.account.template">
+            <field name="code">6668</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_666"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas en valores representativos de deuda a corto plazo, otras empresas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6668_child" model="account.account.template">
+            <field name="code">6668</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6668"/>
+            <field name="type">other</field>
+            <field name="name">Pérdidas en valores representativos de deuda a corto plazo, otras empresas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_667" model="account.account.template">
+            <field name="code">667</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_66"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas de créditos no comerciales</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6670" model="account.account.template">
+            <field name="code">6670</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_667"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas de créditos, empresas del grupo</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6670_child" model="account.account.template">
+            <field name="code">6670</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6670"/>
+            <field name="type">other</field>
+            <field name="name">Pérdidas de créditos, empresas del grupo</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6671" model="account.account.template">
+            <field name="code">6671</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_667"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas de créditos, empresas asociadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6671_child" model="account.account.template">
+            <field name="code">6671</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6671"/>
+            <field name="type">other</field>
+            <field name="name">Pérdidas de créditos, empresas asociadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6672" model="account.account.template">
+            <field name="code">6672</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_667"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas de créditos, otras partes vinculadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6672_child" model="account.account.template">
+            <field name="code">6672</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6672"/>
+            <field name="type">other</field>
+            <field name="name">Pérdidas de créditos, otras partes vinculadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6673" model="account.account.template">
+            <field name="code">6673</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_667"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas de créditos, otras empresas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6673_child" model="account.account.template">
+            <field name="code">6673</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6673"/>
+            <field name="type">other</field>
+            <field name="name">Pérdidas de créditos, otras empresas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6675" model="account.account.template">
+            <field name="code">6675</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_667"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas de créditos a corto plazo, empresas del grupo</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6675_child" model="account.account.template">
+            <field name="code">6675</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6675"/>
+            <field name="type">other</field>
+            <field name="name">Pérdidas de créditos a corto plazo, empresas del grupo</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6676" model="account.account.template">
+            <field name="code">6676</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_667"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas de créditos a corto plazo, empresas asociadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6676_child" model="account.account.template">
+            <field name="code">6676</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6676"/>
+            <field name="type">other</field>
+            <field name="name">Pérdidas de créditos a corto plazo, empresas asociadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6677" model="account.account.template">
+            <field name="code">6677</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_667"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas de créditos a corto plazo, otras partes vinculadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6677_child" model="account.account.template">
+            <field name="code">6677</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6677"/>
+            <field name="type">other</field>
+            <field name="name">Pérdidas de créditos a corto plazo, otras partes vinculadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6678" model="account.account.template">
+            <field name="code">6678</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_667"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas de créditos a corto plazo, otras empresas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6678_child" model="account.account.template">
+            <field name="code">6678</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6678"/>
+            <field name="type">other</field>
+            <field name="name">Pérdidas de créditos a corto plazo, otras empresas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_668" model="account.account.template">
+            <field name="code">668</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_66"/>
+            <field name="type">view</field>
+            <field name="name">Diferencias negativas de cambio</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_668_child" model="account.account.template">
+            <field name="code">668</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_668"/>
+            <field name="type">other</field>
+            <field name="name">Diferencias negativas de cambio</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_669" model="account.account.template">
+            <field name="code">669</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_66"/>
+            <field name="type">view</field>
+            <field name="name">Otros gastos financieros</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_669_child" model="account.account.template">
+            <field name="code">669</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_669"/>
+            <field name="type">other</field>
+            <field name="name">Otros gastos financieros</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_67" model="account.account.template">
+            <field name="code">67</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas procedentes de activos no corrientes y gastos excepcionales</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_670" model="account.account.template">
+            <field name="code">670</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_67"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas procedentes del inmovilizado intangible</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_670_child" model="account.account.template">
+            <field name="code">670</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_670"/>
+            <field name="type">other</field>
+            <field name="name">Pérdidas procedentes del inmovilizado intangible</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_671" model="account.account.template">
+            <field name="code">671</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_67"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas procedentes del inmovilizado material y bienes del Patrimonio Histórico</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_671_child" model="account.account.template">
+            <field name="code">671</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_671"/>
+            <field name="type">other</field>
+            <field name="name">Pérdidas procedentes del inmovilizado material y bienes del Patrimonio Histórico</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_672" model="account.account.template">
+            <field name="code">672</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_67"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas procedentes de las inversiones inmobiliarias</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_672_child" model="account.account.template">
+            <field name="code">672</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_672"/>
+            <field name="type">other</field>
+            <field name="name">Pérdidas procedentes de las inversiones inmobiliarias</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_673" model="account.account.template">
+            <field name="code">673</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_67"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas procedentes de participaciones en partes vinculadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6733" model="account.account.template">
+            <field name="code">6733</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_673"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas procedentes de participaciones en, empresas del grupo</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6733_child" model="account.account.template">
+            <field name="code">6733</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6733"/>
+            <field name="type">other</field>
+            <field name="name">Pérdidas procedentes de participaciones en, empresas del grupo</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6734" model="account.account.template">
+            <field name="code">6734</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_673"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas procedentes de participaciones, empresas asociadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6734_child" model="account.account.template">
+            <field name="code">6734</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6734"/>
+            <field name="type">other</field>
+            <field name="name">Pérdidas procedentes de participaciones, empresas asociadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6735" model="account.account.template">
+            <field name="code">6735</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_673"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas procedentes de participaciones, otras partes vinculadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6735_child" model="account.account.template">
+            <field name="code">6735</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6735"/>
+            <field name="type">other</field>
+            <field name="name">Pérdidas procedentes de participaciones, otras partes vinculadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_675" model="account.account.template">
+            <field name="code">675</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_67"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas por operaciones con obligaciones propias</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_675_child" model="account.account.template">
+            <field name="code">675</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_675"/>
+            <field name="type">other</field>
+            <field name="name">Pérdidas por operaciones con obligaciones propias</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_678" model="account.account.template">
+            <field name="code">678</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_67"/>
+            <field name="type">view</field>
+            <field name="name">Gastos excepcionales</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_678_child" model="account.account.template">
+            <field name="code">678</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_678"/>
+            <field name="type">other</field>
+            <field name="name">Gastos excepcionales</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_68" model="account.account.template">
+            <field name="code">68</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6"/>
+            <field name="type">view</field>
+            <field name="name">Dotaciones para amortizaciones</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_680" model="account.account.template">
+            <field name="code">680</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_68"/>
+            <field name="type">view</field>
+            <field name="name">Amortización del inmovilizado intangible</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_680_child" model="account.account.template">
+            <field name="code">680</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_680"/>
+            <field name="type">other</field>
+            <field name="name">Amortización del inmovilizado intangible</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_681" model="account.account.template">
+            <field name="code">681</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_68"/>
+            <field name="type">view</field>
+            <field name="name">Amortización del inmovilizado material</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_681_child" model="account.account.template">
+            <field name="code">681</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_681"/>
+            <field name="type">other</field>
+            <field name="name">Amortización del inmovilizado material</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_682" model="account.account.template">
+            <field name="code">682</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_68"/>
+            <field name="type">view</field>
+            <field name="name">Amortización de las inversiones inmobiliarias</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_682_child" model="account.account.template">
+            <field name="code">682</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_682"/>
+            <field name="type">other</field>
+            <field name="name">Amortización de las inversiones inmobiliarias</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_69" model="account.account.template">
+            <field name="code">69</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas por deterioro y otras dotaciones</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_690" model="account.account.template">
+            <field name="code">690</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_69"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas por deterioro del inmovilizado intangible</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_690_child" model="account.account.template">
+            <field name="code">690</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_690"/>
+            <field name="type">other</field>
+            <field name="name">Pérdidas por deterioro del inmovilizado intangible</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_691" model="account.account.template">
+            <field name="code">691</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_69"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas por deterioro del inmovilizado material y bienes del Patrimonio Histórico</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_691_child" model="account.account.template">
+            <field name="code">691</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_691"/>
+            <field name="type">other</field>
+            <field name="name">Pérdidas por deterioro del inmovilizado material y bienes del Patrimonio Histórico</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+
+        <record id="pgc_assoc_6910" model="account.account.template">
+            <field name="code">6910</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_691"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas por deterioro del inmovilizado material</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <!--
+        <record id="pgc_assoc_6910_child" model="account.account.template">
+            <field name="code">6910</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6910"/>
+            <field name="type">other</field>
+            <field name="name">Pérdidas por deterioro del inmovilizado material</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+-->
+        <record id="pgc_assoc_6911" model="account.account.template">
+            <field name="code">6911</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_691"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas por deterioro de bienes del Patrimonio Histórico</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6911_child" model="account.account.template">
+            <field name="code">6911</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6911"/>
+            <field name="type">other</field>
+            <field name="name">Pérdidas por deterioro bienes del Patrimonio Histórico</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+
+
+
+        <record id="pgc_assoc_692" model="account.account.template">
+            <field name="code">692</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_69"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas por deterioro de las inversiones inmobiliarias</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_692_child" model="account.account.template">
+            <field name="code">692</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_692"/>
+            <field name="type">other</field>
+            <field name="name">Pérdidas por deterioro de las inversiones inmobiliarias</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_693" model="account.account.template">
+            <field name="code">693</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_69"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas por deterioro de existencias</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6930" model="account.account.template">
+            <field name="code">6930</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_693"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas por deterioro de productos terminados y en curso de fabricación</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6930_child" model="account.account.template">
+            <field name="code">6930</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6930"/>
+            <field name="type">other</field>
+            <field name="name">Pérdidas por deterioro de productos terminados y en curso de fabricación</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6931" model="account.account.template">
+            <field name="code">6931</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_693"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas por deterioro de mercaderías</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6931_child" model="account.account.template">
+            <field name="code">6931</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6931"/>
+            <field name="type">other</field>
+            <field name="name">Pérdidas por deterioro de mercaderías</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6932" model="account.account.template">
+            <field name="code">6932</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_693"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas por deterioro de materias primas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6932_child" model="account.account.template">
+            <field name="code">6932</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6932"/>
+            <field name="type">other</field>
+            <field name="name">Pérdidas por deterioro de materias primas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6933" model="account.account.template">
+            <field name="code">6933</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_693"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas por deterioro de otros aprovisionamientos</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6933_child" model="account.account.template">
+            <field name="code">6933</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6933"/>
+            <field name="type">other</field>
+            <field name="name">Pérdidas por deterioro de otros aprovisionamientos</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_694" model="account.account.template">
+            <field name="code">694</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_69"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas por deterioro de créditos por operaciones de la actividad</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_694_child" model="account.account.template">
+            <field name="code">694</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_694"/>
+            <field name="type">other</field>
+            <field name="name">Pérdidas por deterioro de créditos por operaciones de la actividad</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_695" model="account.account.template">
+            <field name="code">695</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_69"/>
+            <field name="type">view</field>
+            <field name="name">Dotación a la provisión por operaciones comerciales</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6954" model="account.account.template">
+            <field name="code">6954</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_695"/>
+            <field name="type">view</field>
+            <field name="name">Dotación a la provisión por contratos onerosos</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6954_child" model="account.account.template">
+            <field name="code">6954</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6954"/>
+            <field name="type">other</field>
+            <field name="name">Dotación a la provisión por contratos onerosos</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6959" model="account.account.template">
+            <field name="code">6959</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_695"/>
+            <field name="type">view</field>
+            <field name="name">Dotación a la provisión para otras operaciones comerciales</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6959_child" model="account.account.template">
+            <field name="code">6959</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6959"/>
+            <field name="type">other</field>
+            <field name="name">Dotación a la provisión para otras operaciones comerciales</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_696" model="account.account.template">
+            <field name="code">696</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_69"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas por deterioro de participaciones y valores representativos de deuda</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6960" model="account.account.template">
+            <field name="code">6960</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_696"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas por deterioro de participaciones en instrumentos de patrimonio neto, empresas del grupo</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6960_child" model="account.account.template">
+            <field name="code">6960</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6960"/>
+            <field name="type">other</field>
+            <field name="name">Pérdidas por deterioro de participaciones en instrumentos de patrimonio neto, empresas del grupo</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6961" model="account.account.template">
+            <field name="code">6961</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_696"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas por deterioro de participaciones en instrumentos de patrimonio neto, empresas asociadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6961_child" model="account.account.template">
+            <field name="code">6961</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6961"/>
+            <field name="type">other</field>
+            <field name="name">Pérdidas por deterioro de participaciones en instrumentos de patrimonio neto, empresas asociadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6962" model="account.account.template">
+            <field name="code">6962</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_696"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas por deterioro de participaciones en instrumentos de patrimonio neto, otras partes vinculadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6962_child" model="account.account.template">
+            <field name="code">6962</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6962"/>
+            <field name="type">other</field>
+            <field name="name">Pérdidas por deterioro de participaciones en instrumentos de patrimonio neto, otras partes vinculadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6963" model="account.account.template">
+            <field name="code">6963</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_696"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas por deterioro de participaciones en instrumentos de patrimonio neto, otras empresas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6963_child" model="account.account.template">
+            <field name="code">6963</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6963"/>
+            <field name="type">other</field>
+            <field name="name">Pérdidas por deterioro de participaciones en instrumentos de patrimonio neto, otras empresas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6965" model="account.account.template">
+            <field name="code">6965</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_696"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas por deterioro en valores representativos de deuda, empresas del grupo</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6965_child" model="account.account.template">
+            <field name="code">6965</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6965"/>
+            <field name="type">other</field>
+            <field name="name">Pérdidas por deterioro en valores representativos de deuda, empresas del grupo</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6966" model="account.account.template">
+            <field name="code">6966</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_696"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas por deterioro en valores representativos de deuda, empresas asociadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6966_child" model="account.account.template">
+            <field name="code">6966</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6966"/>
+            <field name="type">other</field>
+            <field name="name">Pérdidas por deterioro en valores representativos de deuda, empresas asociadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6967" model="account.account.template">
+            <field name="code">6967</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_696"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas por deterioro en valores representativos de deuda, otras partes vinculadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6967_child" model="account.account.template">
+            <field name="code">6967</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6967"/>
+            <field name="type">other</field>
+            <field name="name">Pérdidas por deterioro en valores representativos de deuda, otras partes vinculadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6968" model="account.account.template">
+            <field name="code">6968</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_696"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas por deterioro en valores representativos de deuda, otras empresas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6968_child" model="account.account.template">
+            <field name="code">6968</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6968"/>
+            <field name="type">other</field>
+            <field name="name">Pérdidas por deterioro en valores representativos de deuda, otras empresas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_697" model="account.account.template">
+            <field name="code">697</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_69"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas por deterioro de créditos</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6970" model="account.account.template">
+            <field name="code">6970</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_697"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas por deterioro de créditos, empresas del grupo</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6970_child" model="account.account.template">
+            <field name="code">6970</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6970"/>
+            <field name="type">other</field>
+            <field name="name">Pérdidas por deterioro de créditos, empresas del grupo</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6971" model="account.account.template">
+            <field name="code">6971</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_697"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas por deterioro de créditos, empresas asociadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6971_child" model="account.account.template">
+            <field name="code">6971</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6971"/>
+            <field name="type">other</field>
+            <field name="name">Pérdidas por deterioro de créditos, empresas asociadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6972" model="account.account.template">
+            <field name="code">6972</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_697"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas por deterioro de créditos, otras partes vinculadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6972_child" model="account.account.template">
+            <field name="code">6972</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6972"/>
+            <field name="type">other</field>
+            <field name="name">Pérdidas por deterioro de créditos, otras partes vinculadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6973" model="account.account.template">
+            <field name="code">6973</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_697"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas por deterioro de créditos, otras empresas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6973_child" model="account.account.template">
+            <field name="code">6973</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6973"/>
+            <field name="type">other</field>
+            <field name="name">Pérdidas por deterioro de créditos, otras empresas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_698" model="account.account.template">
+            <field name="code">698</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_69"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas por deterioro de participaciones y valores representativos de deuda a corto plazo</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6980" model="account.account.template">
+            <field name="code">6980</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_698"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas por deterioro de participaciones en instrumentos de patrimonio neto a corto plazo, empresas del grupo</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6980_child" model="account.account.template">
+            <field name="code">6980</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6980"/>
+            <field name="type">other</field>
+            <field name="name">Pérdidas por deterioro de participaciones en instrumentos de patrimonio neto a corto plazo, empresas del grupo</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6981" model="account.account.template">
+            <field name="code">6981</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_698"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas por deterioro de participaciones en instrumentos de patrimonio neto a corto plazo, empresas asociadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6981_child" model="account.account.template">
+            <field name="code">6981</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6981"/>
+            <field name="type">other</field>
+            <field name="name">Pérdidas por deterioro de participaciones en instrumentos de patrimonio neto a corto plazo, empresas asociadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6985" model="account.account.template">
+            <field name="code">6985</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_698"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas por deterioro en valores representativos de deuda a corto plazo, empresas del grupo</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6985_child" model="account.account.template">
+            <field name="code">6985</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6985"/>
+            <field name="type">other</field>
+            <field name="name">Pérdidas por deterioro en valores representativos de deuda a corto plazo, empresas del grupo</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6986" model="account.account.template">
+            <field name="code">6986</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_698"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas por deterioro en valores representativos de deuda a corto plazo, empresas asociadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6986_child" model="account.account.template">
+            <field name="code">6986</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6986"/>
+            <field name="type">other</field>
+            <field name="name">Pérdidas por deterioro en valores representativos de deuda a corto plazo, empresas asociadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6987" model="account.account.template">
+            <field name="code">6987</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_698"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas por deterioro en valores representativos de deuda a corto plazo, otras partes vinculadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6987_child" model="account.account.template">
+            <field name="code">6987</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6987"/>
+            <field name="type">other</field>
+            <field name="name">Pérdidas por deterioro en valores representativos de deuda a corto plazo, otras partes vinculadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6988" model="account.account.template">
+            <field name="code">6988</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_698"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas por deterioro en valores representativos de deuda a corto plazo, otras empresas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6988_child" model="account.account.template">
+            <field name="code">6988</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6988"/>
+            <field name="type">other</field>
+            <field name="name">Pérdidas por deterioro en valores representativos de deuda a corto plazo, otras empresas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_699" model="account.account.template">
+            <field name="code">699</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_69"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas por deterioro de créditos a corto plazo</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6990" model="account.account.template">
+            <field name="code">6990</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_699"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas por deterioro de créditos a corto plazo, empresas del grupo</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6990_child" model="account.account.template">
+            <field name="code">6990</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6990"/>
+            <field name="type">other</field>
+            <field name="name">Pérdidas por deterioro de créditos a corto plazo, empresas del grupo</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6991" model="account.account.template">
+            <field name="code">6991</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_699"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas por deterioro de créditos a corto plazo, empresas asociadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6991_child" model="account.account.template">
+            <field name="code">6991</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6991"/>
+            <field name="type">other</field>
+            <field name="name">Pérdidas por deterioro de créditos a corto plazo, empresas asociadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6992" model="account.account.template">
+            <field name="code">6992</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_699"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas por deterioro de créditos a corto plazo, otras partes vinculadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6992_child" model="account.account.template">
+            <field name="code">6992</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6992"/>
+            <field name="type">other</field>
+            <field name="name">Pérdidas por deterioro de créditos a corto plazo, otras partes vinculadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6993" model="account.account.template">
+            <field name="code">6993</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_699"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas por deterioro de créditos a corto plazo, otras empresas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6993_child" model="account.account.template">
+            <field name="code">6993</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6993"/>
+            <field name="type">other</field>
+            <field name="name">Pérdidas por deterioro de créditos a corto plazo, otras empresas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_7" model="account.account.template">
+            <field name="code">7</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_0"/>
+            <field name="type">view</field>
+            <field name="name">Ventas e ingresos</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_70" model="account.account.template">
+            <field name="code">70</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7"/>
+            <field name="type">view</field>
+            <field name="name">Ventas de mercaderías, de producción propia, de servicios, etc.</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_700" model="account.account.template">
+            <field name="code">700</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_70"/>
+            <field name="type">view</field>
+            <field name="name">Ventas de mercaderías</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7000" model="account.account.template">
+            <field name="code">7000</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_700"/>
+            <field name="type">view</field>
+            <field name="name">Ventas de mercaderías en España</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7000_child" model="account.account.template">
+            <field name="code">7000</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7000"/>
+            <field name="type">other</field>
+            <field name="name">Ventas de mercaderías en España</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7001" model="account.account.template">
+            <field name="code">7001</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_700"/>
+            <field name="type">view</field>
+            <field name="name">Ventas de mercaderías Intracomunitarias</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7001_child" model="account.account.template">
+            <field name="code">7001</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7001"/>
+            <field name="type">other</field>
+            <field name="name">Ventas de mercaderías Intracomunitarias</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7002" model="account.account.template">
+            <field name="code">7002</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_700"/>
+            <field name="type">view</field>
+            <field name="name">Ventas de mercaderías Exportación</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7002_child" model="account.account.template">
+            <field name="code">7002</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7002"/>
+            <field name="type">other</field>
+            <field name="name">Ventas de mercaderías Exportación</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_701" model="account.account.template">
+            <field name="code">701</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_70"/>
+            <field name="type">view</field>
+            <field name="name">Ventas de productos terminados</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7010" model="account.account.template">
+            <field name="code">7010</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_701"/>
+            <field name="type">view</field>
+            <field name="name">Ventas de productos terminados en España</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7010_child" model="account.account.template">
+            <field name="code">7010</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7010"/>
+            <field name="type">other</field>
+            <field name="name">Ventas de productos terminados en España</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7011" model="account.account.template">
+            <field name="code">7011</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_701"/>
+            <field name="type">view</field>
+            <field name="name">Ventas de productos terminados Intracomunitarias</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7011_child" model="account.account.template">
+            <field name="code">7011</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7011"/>
+            <field name="type">other</field>
+            <field name="name">Ventas de productos terminados Intracomunitarias</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7012" model="account.account.template">
+            <field name="code">7012</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_701"/>
+            <field name="type">view</field>
+            <field name="name">Ventas de productos terminados Exportación</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7012_child" model="account.account.template">
+            <field name="code">7012</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7012"/>
+            <field name="type">other</field>
+            <field name="name">Ventas de productos terminados Exportación</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_702" model="account.account.template">
+            <field name="code">702</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_70"/>
+            <field name="type">view</field>
+            <field name="name">Ventas de productos semiterminados</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7020" model="account.account.template">
+            <field name="code">7020</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_702"/>
+            <field name="type">view</field>
+            <field name="name">Ventas de productos semiterminados en España</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7020_child" model="account.account.template">
+            <field name="code">7020</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7020"/>
+            <field name="type">other</field>
+            <field name="name">Ventas de productos semiterminados en España</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7021" model="account.account.template">
+            <field name="code">7021</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_702"/>
+            <field name="type">view</field>
+            <field name="name">Ventas de productos semiterminados Intracomunitarias</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7021_child" model="account.account.template">
+            <field name="code">7021</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7021"/>
+            <field name="type">other</field>
+            <field name="name">Ventas de productos semiterminados Intracomunitarias</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7022" model="account.account.template">
+            <field name="code">7022</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_702"/>
+            <field name="type">view</field>
+            <field name="name">Ventas de productos semiterminados Exportación</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7022_child" model="account.account.template">
+            <field name="code">7022</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7022"/>
+            <field name="type">other</field>
+            <field name="name">Ventas de productos semiterminados Exportación</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_703" model="account.account.template">
+            <field name="code">703</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_70"/>
+            <field name="type">view</field>
+            <field name="name">Ventas de subproductos y residuos</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7030" model="account.account.template">
+            <field name="code">7030</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_703"/>
+            <field name="type">view</field>
+            <field name="name">Ventas de subproductos y residuos en España</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7030_child" model="account.account.template">
+            <field name="code">7030</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7030"/>
+            <field name="type">other</field>
+            <field name="name">Ventas de subproductos y residuos en España</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7031" model="account.account.template">
+            <field name="code">7031</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_703"/>
+            <field name="type">view</field>
+            <field name="name">Ventas de subproductos y residuos Intracomunitarias</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7031_child" model="account.account.template">
+            <field name="code">7031</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7031"/>
+            <field name="type">other</field>
+            <field name="name">Ventas de subproductos y residuos Intracomunitarias</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7032" model="account.account.template">
+            <field name="code">7032</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_703"/>
+            <field name="type">view</field>
+            <field name="name">Ventas de subproductos y residuos Exportación</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7032_child" model="account.account.template">
+            <field name="code">7032</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7032"/>
+            <field name="type">other</field>
+            <field name="name">Ventas de subproductos y residuos Exportación</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_704" model="account.account.template">
+            <field name="code">704</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_70"/>
+            <field name="type">view</field>
+            <field name="name">Ventas de envases y embalajes</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7040" model="account.account.template">
+            <field name="code">7040</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_704"/>
+            <field name="type">view</field>
+            <field name="name">Ventas de envases y embalajes en España</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7040_child" model="account.account.template">
+            <field name="code">7040</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7040"/>
+            <field name="type">other</field>
+            <field name="name">Ventas de envases y embalajes en España</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7041" model="account.account.template">
+            <field name="code">7041</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_704"/>
+            <field name="type">view</field>
+            <field name="name">Ventas de envases y embalajes Intracomunitarias</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7041_child" model="account.account.template">
+            <field name="code">7041</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7041"/>
+            <field name="type">other</field>
+            <field name="name">Ventas de envases y embalajes Intracomunitarias</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7042" model="account.account.template">
+            <field name="code">7042</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_704"/>
+            <field name="type">view</field>
+            <field name="name">Ventas de envases y embalajes Exportación</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7042_child" model="account.account.template">
+            <field name="code">7042</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7042"/>
+            <field name="type">other</field>
+            <field name="name">Ventas de envases y embalajes Exportación</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_705" model="account.account.template">
+            <field name="code">705</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_70"/>
+            <field name="type">view</field>
+            <field name="name">Prestaciones de servicios</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7050" model="account.account.template">
+            <field name="code">7050</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_705"/>
+            <field name="type">view</field>
+            <field name="name">Prestaciones de servicios en España</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7050_child" model="account.account.template">
+            <field name="code">7050</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7050"/>
+            <field name="type">other</field>
+            <field name="name">Prestaciones de servicios en España</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7051" model="account.account.template">
+            <field name="code">7051</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_705"/>
+            <field name="type">view</field>
+            <field name="name">Prestaciones de servicios Intracomunitarias</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7051_child" model="account.account.template">
+            <field name="code">7051</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7051"/>
+            <field name="type">other</field>
+            <field name="name">Prestaciones de servicios Intracomunitarias</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7052" model="account.account.template">
+            <field name="code">7052</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_705"/>
+            <field name="type">view</field>
+            <field name="name">Prestaciones de servicios fuera de la UE</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7052_child" model="account.account.template">
+            <field name="code">7052</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7052"/>
+            <field name="type">other</field>
+            <field name="name">Prestaciones de servicios fuera de la UE</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_706" model="account.account.template">
+            <field name="code">706</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_70"/>
+            <field name="type">view</field>
+            <field name="name">Descuentos sobre ventas por pronto pago</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7060" model="account.account.template">
+            <field name="code">7060</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_706"/>
+            <field name="type">view</field>
+            <field name="name">Descuentos sobre ventas por pronto pago de mercaderías</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7060_child" model="account.account.template">
+            <field name="code">7060</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7060"/>
+            <field name="type">other</field>
+            <field name="name">Descuentos sobre ventas por pronto pago de mercaderías</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7061" model="account.account.template">
+            <field name="code">7061</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_706"/>
+            <field name="type">view</field>
+            <field name="name">Descuentos sobre ventas por pronto pago de productos terminados</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7061_child" model="account.account.template">
+            <field name="code">7061</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7061"/>
+            <field name="type">other</field>
+            <field name="name">Descuentos sobre ventas por pronto pago de productos terminados</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7062" model="account.account.template">
+            <field name="code">7062</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_706"/>
+            <field name="type">view</field>
+            <field name="name">Descuentos sobre ventas por pronto pago de productos semiterminados</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7062_child" model="account.account.template">
+            <field name="code">7062</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7062"/>
+            <field name="type">other</field>
+            <field name="name">Descuentos sobre ventas por pronto pago de productos semiterminados</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7063" model="account.account.template">
+            <field name="code">7063</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_706"/>
+            <field name="type">view</field>
+            <field name="name">Descuentos sobre ventas por pronto pago de subproductos y residuos</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7063_child" model="account.account.template">
+            <field name="code">7063</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7063"/>
+            <field name="type">other</field>
+            <field name="name">Descuentos sobre ventas por pronto pago de subproductos y residuos</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_708" model="account.account.template">
+            <field name="code">708</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_70"/>
+            <field name="type">view</field>
+            <field name="name">Devoluciones de ventas y operaciones similares</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7080" model="account.account.template">
+            <field name="code">7080</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_708"/>
+            <field name="type">view</field>
+            <field name="name">Devoluciones de ventas de mercaderías</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7080_child" model="account.account.template">
+            <field name="code">7080</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7080"/>
+            <field name="type">other</field>
+            <field name="name">Devoluciones de ventas de mercaderías</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7081" model="account.account.template">
+            <field name="code">7081</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_708"/>
+            <field name="type">view</field>
+            <field name="name">Devoluciones de ventas de productos terminados</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7081_child" model="account.account.template">
+            <field name="code">7081</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7081"/>
+            <field name="type">other</field>
+            <field name="name">Devoluciones de ventas de productos terminados</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7082" model="account.account.template">
+            <field name="code">7082</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_708"/>
+            <field name="type">view</field>
+            <field name="name">Devoluciones de ventas de productos semiterminados</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7082_child" model="account.account.template">
+            <field name="code">7082</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7082"/>
+            <field name="type">other</field>
+            <field name="name">Devoluciones de ventas de productos semiterminados</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7083" model="account.account.template">
+            <field name="code">7083</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_708"/>
+            <field name="type">view</field>
+            <field name="name">Devoluciones de ventas de subproductos y residuos</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7083_child" model="account.account.template">
+            <field name="code">7083</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7083"/>
+            <field name="type">other</field>
+            <field name="name">Devoluciones de ventas de subproductos y residuos</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7084" model="account.account.template">
+            <field name="code">7084</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_708"/>
+            <field name="type">view</field>
+            <field name="name">Devoluciones de ventas de envases y embalajes</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7084_child" model="account.account.template">
+            <field name="code">7084</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7084"/>
+            <field name="type">other</field>
+            <field name="name">Devoluciones de ventas de envases y embalajes</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_709" model="account.account.template">
+            <field name="code">709</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_70"/>
+            <field name="type">view</field>
+            <field name="name">"Rappels" sobre ventas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7090" model="account.account.template">
+            <field name="code">7090</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_709"/>
+            <field name="type">view</field>
+            <field name="name">"Rappels" sobre ventas de mercaderías</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7090_child" model="account.account.template">
+            <field name="code">7090</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7090"/>
+            <field name="type">other</field>
+            <field name="name">"Rappels" sobre ventas de mercaderías</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7091" model="account.account.template">
+            <field name="code">7091</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_709"/>
+            <field name="type">view</field>
+            <field name="name">"Rappels" sobre ventas de productos terminados</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7091_child" model="account.account.template">
+            <field name="code">7091</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7091"/>
+            <field name="type">other</field>
+            <field name="name">"Rappels" sobre ventas de productos terminados</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7092" model="account.account.template">
+            <field name="code">7092</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_709"/>
+            <field name="type">view</field>
+            <field name="name">"Rappels" sobre ventas de productos semiterminados</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7092_child" model="account.account.template">
+            <field name="code">7092</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7092"/>
+            <field name="type">other</field>
+            <field name="name">"Rappels" sobre ventas de productos semiterminados</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7093" model="account.account.template">
+            <field name="code">7093</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_709"/>
+            <field name="type">view</field>
+            <field name="name">"Rappels" sobre ventas de subproductos y residuos</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7093_child" model="account.account.template">
+            <field name="code">7093</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7093"/>
+            <field name="type">other</field>
+            <field name="name">"Rappels" sobre ventas de subproductos y residuos</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7094" model="account.account.template">
+            <field name="code">7094</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_709"/>
+            <field name="type">view</field>
+            <field name="name">"Rappels" sobre ventas de envases y embalajes</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7094_child" model="account.account.template">
+            <field name="code">7094</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7094"/>
+            <field name="type">other</field>
+            <field name="name">"Rappels" sobre ventas de envases y embalajes</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_71" model="account.account.template">
+            <field name="code">71</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7"/>
+            <field name="type">view</field>
+            <field name="name">Variación de existencias</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_710" model="account.account.template">
+            <field name="code">710</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_71"/>
+            <field name="type">view</field>
+            <field name="name">Variación de existencias de productos en curso</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_710_child" model="account.account.template">
+            <field name="code">710</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_710"/>
+            <field name="type">other</field>
+            <field name="name">Variación de existencias de productos en curso</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_711" model="account.account.template">
+            <field name="code">711</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_71"/>
+            <field name="type">view</field>
+            <field name="name">Variación de existencias de productos semiterminados</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_711_child" model="account.account.template">
+            <field name="code">711</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_711"/>
+            <field name="type">other</field>
+            <field name="name">Variación de existencias de productos semiterminados</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_712" model="account.account.template">
+            <field name="code">712</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_71"/>
+            <field name="type">view</field>
+            <field name="name">Variación de existencias de productos terminados</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_712_child" model="account.account.template">
+            <field name="code">712</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_712"/>
+            <field name="type">other</field>
+            <field name="name">Variación de existencias de productos terminados</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_713" model="account.account.template">
+            <field name="code">713</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_71"/>
+            <field name="type">view</field>
+            <field name="name">Variación de existencias de subproductos, residuos y materiales recuperados</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_713_child" model="account.account.template">
+            <field name="code">713</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_713"/>
+            <field name="type">other</field>
+            <field name="name">Variación de existencias de subproductos, residuos y materiales recuperados</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_72" model="account.account.template">
+            <field name="code">72</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7"/>
+            <field name="type">view</field>
+            <field name="name">Ingresos propios de la entidad</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_720" model="account.account.template">
+            <field name="code">720</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_72"/>
+            <field name="type">view</field>
+            <field name="name">Cuotas de asociados y afiliados</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_720_child" model="account.account.template">
+            <field name="code">720</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_720"/>
+            <field name="type">other</field>
+            <field name="name">Cuotas de asociados y afiliados</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+
+        <record id="pgc_assoc_721" model="account.account.template">
+            <field name="code">721</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_72"/>
+            <field name="type">view</field>
+            <field name="name">Cuotas de usuarios</field>
+            <field name="user_type" ref="ingresos"/> 
+        </record>
+        <record id="pgc_assoc_721_child" model="account.account.template">
+            <field name="code">721</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_721"/>
+            <field name="type">other</field>
+            <field name="name">Cuotas de usuarios</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+
+        <record id="pgc_assoc_722" model="account.account.template">
+            <field name="code">722</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_72"/>
+            <field name="type">view</field>
+            <field name="name">Promociones de captación de recursos</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_722_child" model="account.account.template">
+            <field name="code">722</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_722"/>
+            <field name="type">other</field>
+            <field name="name">Promociones de captación de recursos</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+
+        <record id="pgc_assoc_723" model="account.account.template">
+            <field name="code">723</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_72"/>
+            <field name="type">view</field>
+            <field name="name">Ingresos de patrocinadores y colaboraciones</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7230" model="account.account.template">
+            <field name="code">7230</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_723"/>
+            <field name="type">view</field>
+            <field name="name">Patrocinio</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7230_child" model="account.account.template">
+            <field name="code">7230</field>
+            <field name="reconcile" eval="False"/>    
+            <field name="parent_id" ref="pgc_assoc_7230"/>
+            <field name="type">other</field>
+            <field name="name">Patrocinio</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+
+        <record id="pgc_assoc_7231" model="account.account.template">
+            <field name="code">7231</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_723"/>
+            <field name="type">view</field>
+            <field name="name">Patrocinio publicitario</field>
+            <field name="user_type" ref="ingresos"/> 
+        </record>
+        <record id="pgc_assoc_7231_child" model="account.account.template">
+            <field name="code">7231</field>
+            <field name="reconcile" eval="False"/>     
+            <field name="parent_id" ref="pgc_assoc_7231"/>
+            <field name="type">other</field>
+            <field name="name">Patrocinio publicitario</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+
+
+        <record id="pgc_assoc_7233" model="account.account.template">
+            <field name="code">7233</field>
+            <field name="reconcile" eval="False"/>    
+            <field name="parent_id" ref="pgc_assoc_723"/>
+            <field name="type">view</field>
+            <field name="name">Colaboraciones empresariales</field>
+            <field name="user_type" ref="ingresos"/>  
+        </record>
+        <record id="pgc_assoc_7233_child" model="account.account.template">
+            <field name="code">7233</field>
+            <field name="reconcile" eval="False"/>     
+            <field name="parent_id" ref="pgc_assoc_7233"/>
+            <field name="type">other</field>
+            <field name="name">Colaboraciones empresariales</field>
+            <field name="user_type" ref="ingresos"/>  
+        </record>
+
+
+
+        <record id="pgc_assoc_728" model="account.account.template">
+            <field name="code">728</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_72"/>
+            <field name="type">view</field>
+            <field name="name">Ingresos por reintegro de ayudas y asignaciones</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_728_child" model="account.account.template">
+            <field name="code">728</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_728"/>
+            <field name="type">other</field>
+            <field name="name">Ingresos por reintegro de ayudas y asignaciones</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+
+
+
+        <record id="pgc_assoc_73" model="account.account.template">
+            <field name="code">73</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7"/>
+            <field name="type">view</field>
+            <field name="name">Trabajos realizados para la empresa</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_730" model="account.account.template">
+            <field name="code">730</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_73"/>
+            <field name="type">view</field>
+            <field name="name">Trabajos realizados para el inmovilizado intangible</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_730_child" model="account.account.template">
+            <field name="code">730</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_730"/>
+            <field name="type">other</field>
+            <field name="name">Trabajos realizados para el inmovilizado intangible</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_731" model="account.account.template">
+            <field name="code">731</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_73"/>
+            <field name="type">view</field>
+            <field name="name">Trabajos realizados para el inmovilizado material</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_731_child" model="account.account.template">
+            <field name="code">731</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_731"/>
+            <field name="type">other</field>
+            <field name="name">Trabajos realizados para el inmovilizado material</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_732" model="account.account.template">
+            <field name="code">732</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_73"/>
+            <field name="type">view</field>
+            <field name="name">Trabajos realizados en inversiones inmobiliarias</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_732_child" model="account.account.template">
+            <field name="code">732</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_732"/>
+            <field name="type">other</field>
+            <field name="name">Trabajos realizados en inversiones inmobiliarias</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_733" model="account.account.template">
+            <field name="code">733</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_73"/>
+            <field name="type">view</field>
+            <field name="name">Trabajos realizados para el inmovilizado material en curso</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_733_child" model="account.account.template">
+            <field name="code">733</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_733"/>
+            <field name="type">other</field>
+            <field name="name">Trabajos realizados para el inmovilizado material en curso</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_74" model="account.account.template">
+            <field name="code">74</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7"/>
+            <field name="type">view</field>
+            <field name="name">Subvenciones, donaciones y legados</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_740" model="account.account.template">
+            <field name="code">740</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_74"/>
+            <field name="type">view</field>
+            <field name="name">Subvenciones, donaciones y legados a la explotación</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_740_child" model="account.account.template">
+            <field name="code">740</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_740"/>
+            <field name="type">other</field>
+            <field name="name">Subvenciones, donaciones y legados a la explotación</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_746" model="account.account.template">
+            <field name="code">746</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_74"/>
+            <field name="type">view</field>
+            <field name="name">Subvenciones, donaciones y legados de capital transferidos al resultado del ejercicio</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_746_child" model="account.account.template">
+            <field name="code">746</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_746"/>
+            <field name="type">other</field>
+            <field name="name">Subvenciones, donaciones y legados de capital transferidos al resultado del ejercicio</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_747" model="account.account.template">
+            <field name="code">747</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_74"/>
+            <field name="type">view</field>
+            <field name="name">Otras subvenciones, donaciones y legados transferidos al resultado del ejercicio</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_747_child" model="account.account.template">
+            <field name="code">747</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_747"/>
+            <field name="type">other</field>
+            <field name="name">Otras subvenciones, donaciones y legados transferidos al resultado del ejercicio</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_75" model="account.account.template">
+            <field name="code">75</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7"/>
+            <field name="type">view</field>
+            <field name="name">Otros ingresos de gestión</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_751" model="account.account.template">
+            <field name="code">751</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_75"/>
+            <field name="type">view</field>
+            <field name="name">Resultados de operaciones en común</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7510" model="account.account.template">
+            <field name="code">7510</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_751"/>
+            <field name="type">view</field>
+            <field name="name">Pérdida transferido (gestor)</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7510_child" model="account.account.template">
+            <field name="code">7510</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7510"/>
+            <field name="type">other</field>
+            <field name="name">Pérdida transferido (gestor)</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7511" model="account.account.template">
+            <field name="code">7511</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_751"/>
+            <field name="type">view</field>
+            <field name="name">Beneficio atribuido (partícipe o asociado no gestor)</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7511_child" model="account.account.template">
+            <field name="code">7511</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7511"/>
+            <field name="type">other</field>
+            <field name="name">Beneficio atribuido (partícipe o asociado no gestor)</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_752" model="account.account.template">
+            <field name="code">752</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_75"/>
+            <field name="type">view</field>
+            <field name="name">Ingresos por arrendamientos</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_752_child" model="account.account.template">
+            <field name="code">752</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_752"/>
+            <field name="type">other</field>
+            <field name="name">Ingresos por arrendamientos</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_753" model="account.account.template">
+            <field name="code">753</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_75"/>
+            <field name="type">view</field>
+            <field name="name">Ingresos de propiedad industrial cedida en explotación</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_753_child" model="account.account.template">
+            <field name="code">753</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_753"/>
+            <field name="type">other</field>
+            <field name="name">Ingresos de propiedad industrial cedida en explotación</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_754" model="account.account.template">
+            <field name="code">754</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_75"/>
+            <field name="type">view</field>
+            <field name="name">Ingresos por comisiones</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_754_child" model="account.account.template">
+            <field name="code">754</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_754"/>
+            <field name="type">other</field>
+            <field name="name">Ingresos por comisiones</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_755" model="account.account.template">
+            <field name="code">755</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_75"/>
+            <field name="type">view</field>
+            <field name="name">Ingresos por servicios al personal</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_755_child" model="account.account.template">
+            <field name="code">755</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_755"/>
+            <field name="type">other</field>
+            <field name="name">Ingresos por servicios al personal</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_759" model="account.account.template">
+            <field name="code">759</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_75"/>
+            <field name="type">view</field>
+            <field name="name">Ingresos por servicios diversos</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_759_child" model="account.account.template">
+            <field name="code">759</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_759"/>
+            <field name="type">other</field>
+            <field name="name">Ingresos por servicios diversos</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_76" model="account.account.template">
+            <field name="code">76</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7"/>
+            <field name="type">view</field>
+            <field name="name">Ingresos financieros</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_760" model="account.account.template">
+            <field name="code">760</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_76"/>
+            <field name="type">view</field>
+            <field name="name">Ingresos de participaciones en instrumentos de patrimonio</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7600" model="account.account.template">
+            <field name="code">7600</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_760"/>
+            <field name="type">view</field>
+            <field name="name">Ingresos de participaciones en instrumentos de patrimonio, empresas del grupo</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7600_child" model="account.account.template">
+            <field name="code">7600</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7600"/>
+            <field name="type">other</field>
+            <field name="name">Ingresos de participaciones en instrumentos de patrimonio, empresas del grupo</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7601" model="account.account.template">
+            <field name="code">7601</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_760"/>
+            <field name="type">view</field>
+            <field name="name">Ingresos de participaciones en instrumentos de patrimonio, empresas asociadas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7601_child" model="account.account.template">
+            <field name="code">7601</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7601"/>
+            <field name="type">other</field>
+            <field name="name">Ingresos de participaciones en instrumentos de patrimonio, empresas asociadas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7602" model="account.account.template">
+            <field name="code">7602</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_760"/>
+            <field name="type">view</field>
+            <field name="name">Ingresos de participaciones en instrumentos de patrimonio, otras partes vinculadas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7602_child" model="account.account.template">
+            <field name="code">7602</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7602"/>
+            <field name="type">other</field>
+            <field name="name">Ingresos de participaciones en instrumentos de patrimonio, otras partes vinculadas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7603" model="account.account.template">
+            <field name="code">7603</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_760"/>
+            <field name="type">view</field>
+            <field name="name">Ingresos de participaciones en instrumentos de patrimonio, otras empresas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7603_child" model="account.account.template">
+            <field name="code">7603</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7603"/>
+            <field name="type">other</field>
+            <field name="name">Ingresos de participaciones en instrumentos de patrimonio, otras empresas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_761" model="account.account.template">
+            <field name="code">761</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_76"/>
+            <field name="type">view</field>
+            <field name="name">Ingresos de valores representativos de deuda</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7610" model="account.account.template">
+            <field name="code">7610</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_761"/>
+            <field name="type">view</field>
+            <field name="name">Ingresos de valores representativos de deuda, empresas del grupo</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7610_child" model="account.account.template">
+            <field name="code">7610</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7610"/>
+            <field name="type">other</field>
+            <field name="name">Ingresos de valores representativos de deuda, empresas del grupo</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7611" model="account.account.template">
+            <field name="code">7611</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_761"/>
+            <field name="type">view</field>
+            <field name="name">Ingresos de valores representativos de deuda, empresas asociadas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7611_child" model="account.account.template">
+            <field name="code">7611</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7611"/>
+            <field name="type">other</field>
+            <field name="name">Ingresos de valores representativos de deuda, empresas asociadas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7612" model="account.account.template">
+            <field name="code">7612</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_761"/>
+            <field name="type">view</field>
+            <field name="name">Ingresos de valores representativos de deuda, otras partes vinculadas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7612_child" model="account.account.template">
+            <field name="code">7612</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7612"/>
+            <field name="type">other</field>
+            <field name="name">Ingresos de valores representativos de deuda, otras partes vinculadas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7613" model="account.account.template">
+            <field name="code">7613</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_761"/>
+            <field name="type">view</field>
+            <field name="name">Ingresos de valores representativos de deuda, otras empresas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7613_child" model="account.account.template">
+            <field name="code">7613</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7613"/>
+            <field name="type">other</field>
+            <field name="name">Ingresos de valores representativos de deuda, otras empresas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_762" model="account.account.template">
+            <field name="code">762</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_76"/>
+            <field name="type">view</field>
+            <field name="name">Ingresos de créditos</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7620" model="account.account.template">
+            <field name="code">7620</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_762"/>
+            <field name="type">view</field>
+            <field name="name">Ingresos de créditos a largo plazo</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_76200" model="account.account.template">
+            <field name="code">76200</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7620"/>
+            <field name="type">view</field>
+            <field name="name">Ingresos de créditos a largo plazo, empresas del grupo</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_76200_child" model="account.account.template">
+            <field name="code">76200</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_76200"/>
+            <field name="type">other</field>
+            <field name="name">Ingresos de créditos a largo plazo, empresas del grupo</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_76201" model="account.account.template">
+            <field name="code">76201</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7620"/>
+            <field name="type">view</field>
+            <field name="name">Ingresos de créditos a largo plazo, empresas asociadas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_76201_child" model="account.account.template">
+            <field name="code">76201</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_76201"/>
+            <field name="type">other</field>
+            <field name="name">Ingresos de créditos a largo plazo, empresas asociadas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_76202" model="account.account.template">
+            <field name="code">76202</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7620"/>
+            <field name="type">view</field>
+            <field name="name">Ingresos de créditos a largo plazo, otras partes vinculadas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_76202_child" model="account.account.template">
+            <field name="code">76202</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_76202"/>
+            <field name="type">other</field>
+            <field name="name">Ingresos de créditos a largo plazo, otras partes vinculadas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_76203" model="account.account.template">
+            <field name="code">76203</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7620"/>
+            <field name="type">view</field>
+            <field name="name">Ingresos de créditos a largo plazo, otras empresas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_76203_child" model="account.account.template">
+            <field name="code">76203</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_76203"/>
+            <field name="type">other</field>
+            <field name="name">Ingresos de créditos a largo plazo, otras empresas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7621" model="account.account.template">
+            <field name="code">7621</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_762"/>
+            <field name="type">view</field>
+            <field name="name">Ingresos de créditos a corto plazo</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_76210" model="account.account.template">
+            <field name="code">76210</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7621"/>
+            <field name="type">view</field>
+            <field name="name">Ingresos de créditos a corto plazo, empresas del grupo</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_76210_child" model="account.account.template">
+            <field name="code">76210</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_76210"/>
+            <field name="type">other</field>
+            <field name="name">Ingresos de créditos a corto plazo, empresas del grupo</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_76211" model="account.account.template">
+            <field name="code">76211</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7621"/>
+            <field name="type">view</field>
+            <field name="name">Ingresos de créditos a corto plazo, empresas asociadas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_76211_child" model="account.account.template">
+            <field name="code">76211</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_76211"/>
+            <field name="type">other</field>
+            <field name="name">Ingresos de créditos a corto plazo, empresas asociadas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_76212" model="account.account.template">
+            <field name="code">76212</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7621"/>
+            <field name="type">view</field>
+            <field name="name">Ingresos de créditos a corto plazo, otras partes vinculadas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_76212_child" model="account.account.template">
+            <field name="code">76212</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_76212"/>
+            <field name="type">other</field>
+            <field name="name">Ingresos de créditos a corto plazo, otras partes vinculadas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_76213" model="account.account.template">
+            <field name="code">76213</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7621"/>
+            <field name="type">view</field>
+            <field name="name">Ingresos de créditos a corto plazo, otras empresas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_76213_child" model="account.account.template">
+            <field name="code">76213</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_76213"/>
+            <field name="type">other</field>
+            <field name="name">Ingresos de créditos a corto plazo, otras empresas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_763" model="account.account.template">
+            <field name="code">763</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_76"/>
+            <field name="type">view</field>
+            <field name="name">Beneficios por valoración de activos y pasivos financieros por su valor razonable</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_763_child" model="account.account.template">
+            <field name="code">763</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_763"/>
+            <field name="type">other</field>
+            <field name="name">Beneficios por valoración de activos y pasivos financieros por su valor razonable</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_766" model="account.account.template">
+            <field name="code">766</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_76"/>
+            <field name="type">view</field>
+            <field name="name">Beneficios en participaciones y valores representativos de deuda</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7660" model="account.account.template">
+            <field name="code">7660</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_766"/>
+            <field name="type">view</field>
+            <field name="name">Beneficios en valores representativos de deuda a largo plazo, empresas del grupo</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7660_child" model="account.account.template">
+            <field name="code">7660</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7660"/>
+            <field name="type">other</field>
+            <field name="name">Beneficios en valores representativos de deuda a largo plazo, empresas del grupo</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7661" model="account.account.template">
+            <field name="code">7661</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_766"/>
+            <field name="type">view</field>
+            <field name="name">Beneficios en valores representativos de deuda a largo plazo, empresas asociadas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7661_child" model="account.account.template">
+            <field name="code">7661</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7661"/>
+            <field name="type">other</field>
+            <field name="name">Beneficios en valores representativos de deuda a largo plazo, empresas asociadas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7662" model="account.account.template">
+            <field name="code">7662</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_766"/>
+            <field name="type">view</field>
+            <field name="name">Beneficios en valores representativos de deuda a largo plazo, otras partes vinculadas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7662_child" model="account.account.template">
+            <field name="code">7662</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7662"/>
+            <field name="type">other</field>
+            <field name="name">Beneficios en valores representativos de deuda a largo plazo, otras partes vinculadas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7663" model="account.account.template">
+            <field name="code">7663</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_766"/>
+            <field name="type">view</field>
+            <field name="name">Beneficios en valores representativos de deuda a largo plazo, otras empresas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7663_child" model="account.account.template">
+            <field name="code">7663</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7663"/>
+            <field name="type">other</field>
+            <field name="name">Beneficios en valores representativos de deuda a largo plazo, otras empresas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7665" model="account.account.template">
+            <field name="code">7665</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_766"/>
+            <field name="type">view</field>
+            <field name="name">Beneficios en valores representativos de deuda a corto plazo, empresas del grupo</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7665_child" model="account.account.template">
+            <field name="code">7665</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7665"/>
+            <field name="type">other</field>
+            <field name="name">Beneficios en valores representativos de deuda a corto plazo, empresas del grupo</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7666" model="account.account.template">
+            <field name="code">7666</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_766"/>
+            <field name="type">view</field>
+            <field name="name">Beneficios en valores representativos de deuda a corto plazo, empresas asociadas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7666_child" model="account.account.template">
+            <field name="code">7666</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7666"/>
+            <field name="type">other</field>
+            <field name="name">Beneficios en valores representativos de deuda a corto plazo, empresas asociadas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7667" model="account.account.template">
+            <field name="code">7667</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_766"/>
+            <field name="type">view</field>
+            <field name="name">Beneficios en valores representativos de deuda a corto plazo, otras partes vinculadas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7667_child" model="account.account.template">
+            <field name="code">7667</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7667"/>
+            <field name="type">other</field>
+            <field name="name">Beneficios en valores representativos de deuda a corto plazo, otras partes vinculadas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7668" model="account.account.template">
+            <field name="code">7668</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_766"/>
+            <field name="type">view</field>
+            <field name="name">Beneficios en valores representativos de deuda a corto plazo, otras empresas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7668_child" model="account.account.template">
+            <field name="code">7668</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7668"/>
+            <field name="type">other</field>
+            <field name="name">Beneficios en valores representativos de deuda a corto plazo, otras empresas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_768" model="account.account.template">
+            <field name="code">768</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_76"/>
+            <field name="type">view</field>
+            <field name="name">Diferencias positivas de cambio</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_768_child" model="account.account.template">
+            <field name="code">768</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_768"/>
+            <field name="type">other</field>
+            <field name="name">Diferencias positivas de cambio</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_769" model="account.account.template">
+            <field name="code">769</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_76"/>
+            <field name="type">view</field>
+            <field name="name">Otros ingresos financieros</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_769_child" model="account.account.template">
+            <field name="code">769</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_769"/>
+            <field name="type">other</field>
+            <field name="name">Otros ingresos financieros</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_77" model="account.account.template">
+            <field name="code">77</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7"/>
+            <field name="type">view</field>
+            <field name="name">Beneficios procedentes de activos no corrientes e ingresos excepcionales</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_770" model="account.account.template">
+            <field name="code">770</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_77"/>
+            <field name="type">view</field>
+            <field name="name">Beneficios procedentes del inmovilizado intangible</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_770_child" model="account.account.template">
+            <field name="code">770</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_770"/>
+            <field name="type">other</field>
+            <field name="name">Beneficios procedentes del inmovilizado intangible</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_771" model="account.account.template">
+            <field name="code">771</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_77"/>
+            <field name="type">view</field>
+            <field name="name">Beneficios procedentes del inmovilizado material</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_771_child" model="account.account.template">
+            <field name="code">771</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_771"/>
+            <field name="type">other</field>
+            <field name="name">Beneficios procedentes del inmovilizado material</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_772" model="account.account.template">
+            <field name="code">772</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_77"/>
+            <field name="type">view</field>
+            <field name="name">Beneficios procedentes de las inversiones inmobiliarias</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_772_child" model="account.account.template">
+            <field name="code">772</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_772"/>
+            <field name="type">other</field>
+            <field name="name">Beneficios procedentes de las inversiones inmobiliarias</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_773" model="account.account.template">
+            <field name="code">773</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_77"/>
+            <field name="type">view</field>
+            <field name="name">Beneficios procedentes de participaciones a largo plazo en partes vinculadas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7733" model="account.account.template">
+            <field name="code">7733</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_773"/>
+            <field name="type">view</field>
+            <field name="name">Beneficios procedentes de participaciones a largo plazo en, empresas del grupo</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7733_child" model="account.account.template">
+            <field name="code">7733</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7733"/>
+            <field name="type">other</field>
+            <field name="name">Beneficios procedentes de participaciones a largo plazo en, empresas del grupo</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7734" model="account.account.template">
+            <field name="code">7734</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_773"/>
+            <field name="type">view</field>
+            <field name="name">Beneficios procedentes de participaciones a largo plazo, empresas asociadas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7734_child" model="account.account.template">
+            <field name="code">7734</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7734"/>
+            <field name="type">other</field>
+            <field name="name">Beneficios procedentes de participaciones a largo plazo, empresas asociadas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7735" model="account.account.template">
+            <field name="code">7735</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_773"/>
+            <field name="type">view</field>
+            <field name="name">Beneficios procedentes de participaciones a largo plazo, otras partes vinculadas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7735_child" model="account.account.template">
+            <field name="code">7735</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7735"/>
+            <field name="type">other</field>
+            <field name="name">Beneficios procedentes de participaciones a largo plazo, otras partes vinculadas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_775" model="account.account.template">
+            <field name="code">775</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_77"/>
+            <field name="type">view</field>
+            <field name="name">Beneficos por operaciones con obligaciones propias</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_775_child" model="account.account.template">
+            <field name="code">775</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_775"/>
+            <field name="type">other</field>
+            <field name="name">Beneficos por operaciones con obligaciones propias</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_778" model="account.account.template">
+            <field name="code">778</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_77"/>
+            <field name="type">view</field>
+            <field name="name">Ingresos excepcionales</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_778_child" model="account.account.template">
+            <field name="code">778</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_778"/>
+            <field name="type">other</field>
+            <field name="name">Ingresos excepcionales</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_79" model="account.account.template">
+            <field name="code">79</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7"/>
+            <field name="type">view</field>
+            <field name="name">Excesos y aplicaciones de provisiones y de pérdidas por deterioro</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_790" model="account.account.template">
+            <field name="code">790</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_79"/>
+            <field name="type">view</field>
+            <field name="name">Reversión del deterioro del inmovilizado intangible</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_790_child" model="account.account.template">
+            <field name="code">790</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_790"/>
+            <field name="type">other</field>
+            <field name="name">Reversión del deterioro del inmovilizado intangible</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_791" model="account.account.template">
+            <field name="code">791</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_79"/>
+            <field name="type">view</field>
+            <field name="name">Reversión del deterioro del inmovilizado material y de bienes del Patrimonio Histórico</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_791_child" model="account.account.template">
+            <field name="code">791</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_791"/>
+            <field name="type">other</field>
+            <field name="name">Reversión del deterioro del inmovilizado material y de bienes del Patrimonio Histórico</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_792" model="account.account.template">
+            <field name="code">792</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_79"/>
+            <field name="type">view</field>
+            <field name="name">Reversión del deterioro de las inversiones inmobiliarias</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_792_child" model="account.account.template">
+            <field name="code">792</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_792"/>
+            <field name="type">other</field>
+            <field name="name">Reversión del deterioro de las inversiones inmobiliarias</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_793" model="account.account.template">
+            <field name="code">793</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_79"/>
+            <field name="type">view</field>
+            <field name="name">Reversión del deterioro de existencias</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7930" model="account.account.template">
+            <field name="code">7930</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_793"/>
+            <field name="type">view</field>
+            <field name="name">Reversión del deterioro de productos terminados y en curso de fabricación</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7930_child" model="account.account.template">
+            <field name="code">7930</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7930"/>
+            <field name="type">other</field>
+            <field name="name">Reversión del deterioro de productos terminados y en curso de fabricación</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7931" model="account.account.template">
+            <field name="code">7931</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_793"/>
+            <field name="type">view</field>
+            <field name="name">Reversión del deterioro de mercaderías</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7931_child" model="account.account.template">
+            <field name="code">7931</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7931"/>
+            <field name="type">other</field>
+            <field name="name">Reversión del deterioro de mercaderías</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7932" model="account.account.template">
+            <field name="code">7932</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_793"/>
+            <field name="type">view</field>
+            <field name="name">Reversión del deterioro de materias primas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7932_child" model="account.account.template">
+            <field name="code">7932</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7932"/>
+            <field name="type">other</field>
+            <field name="name">Reversión del deterioro de materias primas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7933" model="account.account.template">
+            <field name="code">7933</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_793"/>
+            <field name="type">view</field>
+            <field name="name">Reversión del deterioro de otros aprovisionamientos</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7933_child" model="account.account.template">
+            <field name="code">7933</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7933"/>
+            <field name="type">other</field>
+            <field name="name">Reversión del deterioro de otros aprovisionamientos</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_794" model="account.account.template">
+            <field name="code">794</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_79"/>
+            <field name="type">view</field>
+            <field name="name">Reversión del deterioro de créditos por operaciones de la actividad</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_794_child" model="account.account.template">
+            <field name="code">794</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_794"/>
+            <field name="type">other</field>
+            <field name="name">Reversión del deterioro de créditos por operaciones de la actividad</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_795" model="account.account.template">
+            <field name="code">795</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_79"/>
+            <field name="type">view</field>
+            <field name="name">Exceso de provisiones</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7951" model="account.account.template">
+            <field name="code">7951</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_795"/>
+            <field name="type">view</field>
+            <field name="name">Exceso de provisión para impuestos</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7951_child" model="account.account.template">
+            <field name="code">7951</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7951"/>
+            <field name="type">other</field>
+            <field name="name">Exceso de provisión para impuestos</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7952" model="account.account.template">
+            <field name="code">7952</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_795"/>
+            <field name="type">view</field>
+            <field name="name">Exceso de provisión para otras responsabilidades</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7952_child" model="account.account.template">
+            <field name="code">7952</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7952"/>
+            <field name="type">other</field>
+            <field name="name">Exceso de provisión para otras responsabilidades</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7954" model="account.account.template">
+            <field name="code">7954</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_795"/>
+            <field name="type">view</field>
+            <field name="name">Exceso de provisión por operaciones comerciales</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_79544" model="account.account.template">
+            <field name="code">79544</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7954"/>
+            <field name="type">view</field>
+            <field name="name">Exceso de provisión por contratos onerosos</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_79544_child" model="account.account.template">
+            <field name="code">79544</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_79544"/>
+            <field name="type">other</field>
+            <field name="name">Exceso de provisión por contratos onerosos</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_79549" model="account.account.template">
+            <field name="code">79549</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7954"/>
+            <field name="type">view</field>
+            <field name="name">Exceso de provisión para otras operaciones comerciales</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_79549_child" model="account.account.template">
+            <field name="code">79549</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_79549"/>
+            <field name="type">other</field>
+            <field name="name">Exceso de provisión para otras operaciones comerciales</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7955" model="account.account.template">
+            <field name="code">7955</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_795"/>
+            <field name="type">view</field>
+            <field name="name">Exceso de provisión para actuaciones medioambientales</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7955_child" model="account.account.template">
+            <field name="code">7955</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7955"/>
+            <field name="type">other</field>
+            <field name="name">Exceso de provisión para actuaciones medioambientales</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_796" model="account.account.template">
+            <field name="code">796</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_79"/>
+            <field name="type">view</field>
+            <field name="name">Reversión del deterioro de participaciones y valores representativos de deuda a largo plazo</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7960" model="account.account.template">
+            <field name="code">7960</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_796"/>
+            <field name="type">view</field>
+            <field name="name">Reversión del deterioro de participaciones en instrumentos de patrimonio neto a largo plazo, empresas del grupo</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7960_child" model="account.account.template">
+            <field name="code">7960</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7960"/>
+            <field name="type">other</field>
+            <field name="name">Reversión del deterioro de participaciones en instrumentos de patrimonio neto a largo plazo, empresas del grupo</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7961" model="account.account.template">
+            <field name="code">7961</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_796"/>
+            <field name="type">view</field>
+            <field name="name">Reversión del deterioro de participaciones en instrumentos de patrimonio neto a largo plazo, empresas asociadas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7961_child" model="account.account.template">
+            <field name="code">7961</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7961"/>
+            <field name="type">other</field>
+            <field name="name">Reversión del deterioro de participaciones en instrumentos de patrimonio neto a largo plazo, empresas asociadas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7962" model="account.account.template">
+            <field name="code">7962</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_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="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7962_child" model="account.account.template">
+            <field name="code">7962</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_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="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7963" model="account.account.template">
+            <field name="code">7963</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_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="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7963_child" model="account.account.template">
+            <field name="code">7963</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_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="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7965" model="account.account.template">
+            <field name="code">7965</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_796"/>
+            <field name="type">view</field>
+            <field name="name">Reversión del deterioro de valores representativos de deuda a largo plazo, empresas del grupo</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7965_child" model="account.account.template">
+            <field name="code">7965</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7965"/>
+            <field name="type">other</field>
+            <field name="name">Reversión del deterioro de valores representativos de deuda a largo plazo, empresas del grupo</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7966" model="account.account.template">
+            <field name="code">7966</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_796"/>
+            <field name="type">view</field>
+            <field name="name">Reversión del deterioro de valores representativos de deuda a largo plazo, empresas asociadas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7966_child" model="account.account.template">
+            <field name="code">7966</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7966"/>
+            <field name="type">other</field>
+            <field name="name">Reversión del deterioro de valores representativos de deuda a largo plazo, empresas asociadas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7967" model="account.account.template">
+            <field name="code">7967</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_796"/>
+            <field name="type">view</field>
+            <field name="name">Reversión del deterioro de valores representativos de deuda a largo plazo, otras partes vinculadas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7967_child" model="account.account.template">
+            <field name="code">7967</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7967"/>
+            <field name="type">other</field>
+            <field name="name">Reversión del deterioro de valores representativos de deuda a largo plazo, otras partes vinculadas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7968" model="account.account.template">
+            <field name="code">7968</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_796"/>
+            <field name="type">view</field>
+            <field name="name">Reversión del deterioro de valores representativos de deuda a largo plazo, otras empresas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7968_child" model="account.account.template">
+            <field name="code">7968</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7968"/>
+            <field name="type">other</field>
+            <field name="name">Reversión del deterioro de valores representativos de deuda a largo plazo, otras empresas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_797" model="account.account.template">
+            <field name="code">797</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_79"/>
+            <field name="type">view</field>
+            <field name="name">Reversión del deterioro de créditos a largo plazo</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7970" model="account.account.template">
+            <field name="code">7970</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_797"/>
+            <field name="type">view</field>
+            <field name="name">Reversión del deterioro de créditos a largo plazo, empresas del grupo</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7970_child" model="account.account.template">
+            <field name="code">7970</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7970"/>
+            <field name="type">other</field>
+            <field name="name">Reversión del deterioro de créditos a largo plazo, empresas del grupo</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7971" model="account.account.template">
+            <field name="code">7971</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_797"/>
+            <field name="type">view</field>
+            <field name="name">Reversión del deterioro de créditos a largo plazo, empresas asociadas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7971_child" model="account.account.template">
+            <field name="code">7971</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7971"/>
+            <field name="type">other</field>
+            <field name="name">Reversión del deterioro de créditos a largo plazo, empresas asociadas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7972" model="account.account.template">
+            <field name="code">7972</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_797"/>
+            <field name="type">view</field>
+            <field name="name">Reversión del deterioro de créditos a largo plazo, otras partes vinculadas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7972_child" model="account.account.template">
+            <field name="code">7972</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7972"/>
+            <field name="type">other</field>
+            <field name="name">Reversión del deterioro de créditos a largo plazo, otras partes vinculadas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7973" model="account.account.template">
+            <field name="code">7973</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_797"/>
+            <field name="type">view</field>
+            <field name="name">Reversión del deterioro de créditos a largo plazo, otras empresas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7973_child" model="account.account.template">
+            <field name="code">7973</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7973"/>
+            <field name="type">other</field>
+            <field name="name">Reversión del deterioro de créditos a largo plazo, otras empresas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_798" model="account.account.template">
+            <field name="code">798</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_79"/>
+            <field name="type">view</field>
+            <field name="name">Reversión del deterioro de participaciones y valores representativos de deuda a corto plazo</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7980" model="account.account.template">
+            <field name="code">7980</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_798"/>
+            <field name="type">view</field>
+            <field name="name">Reversión del deterioro de participaciones en instrumentos de patrimonio neto a corto plazo, empresas del grupo</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7980_child" model="account.account.template">
+            <field name="code">7980</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7980"/>
+            <field name="type">other</field>
+            <field name="name">Reversión del deterioro de participaciones en instrumentos de patrimonio neto a corto plazo, empresas del grupo</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7981" model="account.account.template">
+            <field name="code">7981</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_798"/>
+            <field name="type">view</field>
+            <field name="name">Reversión del deterioro de participaciones en instrumentos de patrimonio neto a corto plazo, empresas asociadas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7981_child" model="account.account.template">
+            <field name="code">7981</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7981"/>
+            <field name="type">other</field>
+            <field name="name">Reversión del deterioro de participaciones en instrumentos de patrimonio neto a corto plazo, empresas asociadas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7985" model="account.account.template">
+            <field name="code">7985</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_798"/>
+            <field name="type">view</field>
+            <field name="name">Reversión del deterioro de valores representativos de deuda a corto plazo, empresas del grupo</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7985_child" model="account.account.template">
+            <field name="code">7985</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7985"/>
+            <field name="type">other</field>
+            <field name="name">Reversión del deterioro de valores representativos de deuda a corto plazo, empresas del grupo</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7986" model="account.account.template">
+            <field name="code">7986</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_798"/>
+            <field name="type">view</field>
+            <field name="name">Reversión del deterioro de valores representativos de deuda a corto plazo, empresas asociadas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7986_child" model="account.account.template">
+            <field name="code">7986</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7986"/>
+            <field name="type">other</field>
+            <field name="name">Reversión del deterioro de valores representativos de deuda a corto plazo, empresas asociadas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7987" model="account.account.template">
+            <field name="code">7987</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_798"/>
+            <field name="type">view</field>
+            <field name="name">Reversión del deterioro de valores representativos de deuda a corto plazo, otras partes vinculadas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7987_child" model="account.account.template">
+            <field name="code">7987</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7987"/>
+            <field name="type">other</field>
+            <field name="name">Reversión del deterioro de valores representativos de deuda a corto plazo, otras partes vinculadas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7988" model="account.account.template">
+            <field name="code">7988</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_798"/>
+            <field name="type">view</field>
+            <field name="name">Reversión del deterioro de valores representativos de deuda a corto plazo, otras empresas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7988_child" model="account.account.template">
+            <field name="code">7988</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7988"/>
+            <field name="type">other</field>
+            <field name="name">Reversión del deterioro de valores representativos de deuda a corto plazo, otras empresas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_799" model="account.account.template">
+            <field name="code">799</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_798"/>
+            <field name="type">view</field>
+            <field name="name">Reversión del deterioro de créditos a corto plazo</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7990" model="account.account.template">
+            <field name="code">7990</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_798"/>
+            <field name="type">view</field>
+            <field name="name">Reversión del deterioro de créditos a corto plazo, empresas del grupo</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7990_child" model="account.account.template">
+            <field name="code">7990</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7990"/>
+            <field name="type">other</field>
+            <field name="name">Reversión del deterioro de créditos a corto plazo, empresas del grupo</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7991" model="account.account.template">
+            <field name="code">7991</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_798"/>
+            <field name="type">view</field>
+            <field name="name">Reversión del deterioro de créditos a corto plazo, empresas asociadas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7991_child" model="account.account.template">
+            <field name="code">7991</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7991"/>
+            <field name="type">other</field>
+            <field name="name">Reversión del deterioro de créditos a corto plazo, empresas asociadas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7992" model="account.account.template">
+            <field name="code">7992</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_799"/>
+            <field name="type">view</field>
+            <field name="name">Reversión del deterioro de créditos a corto plazo, otras partes vinculadas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7992_child" model="account.account.template">
+            <field name="code">7992</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7992"/>
+            <field name="type">other</field>
+            <field name="name">Reversión del deterioro de créditos a corto plazo, otras partes vinculadas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7993" model="account.account.template">
+            <field name="code">7993</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_799"/>
+            <field name="type">view</field>
+            <field name="name">Reversión del deterioro de créditos a corto plazo, otras empresas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7993_child" model="account.account.template">
+            <field name="code">7993</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7993"/>
+            <field name="type">other</field>
+            <field name="name">Reversión del deterioro de créditos a corto plazo, otras empresas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+
+      <!-- Tax Code Configuration -->
+
+        <record id="vat_code_chart_assoc_root" model="account.tax.code.template">
+            <field name="name">Plantilla Plan de Impuestos ASSOC</field>
+        </record>
+
+      <!-- Chart template -->
+
+        <record id="l10nES_chart_template_assoc" model="account.chart.template">
+            <field name="name">Plantilla PGCE Asociaciones 2008</field>
+            <field name="account_root_id" ref="pgc_assoc_0"/>
+            <field name="tax_code_root_id" ref="vat_code_chart_assoc_root"/>
+            <field name="bank_account_view_id" ref="pgc_assoc_572"/>
+            <field name="property_account_receivable" ref="pgc_assoc_4300_child"/>
+            <field name="property_account_payable" ref="pgc_assoc_4100_child"/>
+            <field name="property_account_expense_categ" ref="pgc_assoc_600_child"/>
+            <field name="property_account_income_categ" ref="pgc_assoc_7000_child"/>
+        </record>
+
+    </data>
+</openerp>
diff --git a/addons/l10n_es/account_chart_pymes.xml b/addons/l10n_es/account_chart_pymes.xml
index ed2e4f18e7c..223d80e3193 100644
--- a/addons/l10n_es/account_chart_pymes.xml
+++ b/addons/l10n_es/account_chart_pymes.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data noupdate="1">
+    <data noupdate="0">
   
       <!-- 
       Plantilla del árbol de cuentas del Plan General Contable PYMES 2008.
@@ -11,23 +11,23 @@
       como base para los siguientes cambios:
 
       - Se eliminan las cuentas: 
-            (111), (1110), (1111), (1143), (115), (133), (134), (1340), (1341),
+    	    (111), (1110), (1111), (1143), (115), (133), (134), (1340), (1341),
                 (135), (136), (140), (146), (147), (1765), (1768), (178), (189),
-            (204), (2550), (2553), (257),
-            (466),
-            (501), (5091), (5290), (5296), (5297), (553), (5530), (5531),
+    	    (204), (2550), (2553), (257),
+    	    (466),
+    	    (501), (5091), (5290), (5296), (5297), (553), (5530), (5531),
                 (5532), (5533), (5593), (5598), (569), (58), (580), (581),
                 (582), (583), (584), (585), (586), (587), (588), (589),
                 (599), (5990), (5991), (5992), (5993), (5994),
-            (643), (643), (644), (645), (644), (6440), (6442), (645), (6450), 
+    	    (643), (643), (644), (645), (644), (6440), (6442), (645), (6450), 
                 (6457), (6630), (6631), (6632), (6633),
-            (7630), (7631), (7632), (7633), (767), (774), (7950), (7956), (7957);
-            el grupo 8 entero;
-            el grupo 9 entero.
+    	    (7630), (7631), (7632), (7633), (767), (774), (7950), (7956), (7957);
+    	    el grupo 8 entero;
+    	    el grupo 9 entero.
       - Cambian de nombre las cuentas: 
-            (2935), (296), (5935), (596), (7962), (7963)
+    	    (2935), (296), (5935), (596), (7962), (7963)
       - Se crean las cuentas:
-            (5590), (5595), (663), (763)
+    	    (5590), (5595), (663), (763)
 
       Otros cambios:
 
@@ -2357,7 +2357,7 @@
             <field name="reconcile" eval="False"/>
             <field name="parent_id" ref="pgc_pymes_281"/>
             <field name="type">view</field>
-            <field name="name">Amortización acumulada de otras instaciones</field>
+            <field name="name">Amortización acumulada de otras instalaciones</field>
             <field name="user_type" ref="inmo"/>
         </record>
         <record id="pgc_pymes_2815_child" model="account.account.template">
@@ -2365,7 +2365,7 @@
             <field name="reconcile" eval="False"/>
             <field name="parent_id" ref="pgc_pymes_2815"/>
             <field name="type">other</field>
-            <field name="name">Amortización acumulada de otras instaciones</field>
+            <field name="name">Amortización acumulada de otras instalaciones</field>
             <field name="user_type" ref="inmo"/>
         </record>
         <record id="pgc_pymes_2816" model="account.account.template">
@@ -4410,7 +4410,7 @@
         </record>
         <record id="pgc_pymes_460_child" model="account.account.template">
             <field name="code">460</field>
-            <field name="reconcile" eval="False"/>
+            <field name="reconcile" eval="True"/>
             <field name="parent_id" ref="pgc_pymes_460"/>
             <field name="type">other</field>
             <field name="name">Anticipos de remuneraciones</field>
@@ -4426,7 +4426,7 @@
         </record>
         <record id="pgc_pymes_465_child" model="account.account.template">
             <field name="code">465</field>
-            <field name="reconcile" eval="False"/>
+            <field name="reconcile" eval="True"/>
             <field name="parent_id" ref="pgc_pymes_465"/>
             <field name="type">other</field>
             <field name="name">Remuneraciones pendientes de pago</field>
@@ -4456,8 +4456,8 @@
             <field name="name">Hacienda Pública, deudora por IVA</field>
             <field name="user_type" ref="tax"/>
         </record>
-        <record id="pgc_pymes_4700_child" model="account.account.template">
-            <field name="code">4700</field>
+        <record id="pgc_pymes_470000" model="account.account.template">
+            <field name="code">470000</field>
             <field name="reconcile" eval="True"/>
             <field name="parent_id" ref="pgc_pymes_4700"/>
             <field name="type">receivable</field>
@@ -4520,6 +4520,14 @@
             <field name="name">Hacienda Pública, IVA soportado</field>
             <field name="user_type" ref="tax"/>
         </record>
+        <record id="pgc_pymes_472000" model="account.account.template">
+            <field name="code">472000</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_472"/>
+            <field name="type">other</field>
+            <field name="name">Hacienda Pública. IVA soportado</field>
+            <field name="user_type" ref="tax"/>
+        </record>
         <record id="pgc_pymes_473" model="account.account.template">
             <field name="code">473</field>
             <field name="reconcile" eval="False"/>
@@ -4600,8 +4608,8 @@
             <field name="name">Hacienda Pública, acreedora por IVA</field>
             <field name="user_type" ref="tax"/>
         </record>
-        <record id="pgc_pymes_4750_child" model="account.account.template">
-            <field name="code">4750</field>
+        <record id="pgc_pymes_475000" model="account.account.template">
+            <field name="code">475000</field>
             <field name="reconcile" eval="True"/>
             <field name="parent_id" ref="pgc_pymes_4750"/>
             <field name="type">payable</field>
@@ -4680,6 +4688,14 @@
             <field name="name">Hacienda Pública, IVA repercutido</field>
             <field name="user_type" ref="tax"/>
         </record>
+        <record id="pgc_pymes_477000" model="account.account.template">
+            <field name="code">477000</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_pymes_477"/>
+            <field name="type">other</field>
+            <field name="name">Hacienda Pública, IVA repercutido</field>
+            <field name="user_type" ref="tax"/>
+        </record>
         <record id="pgc_pymes_479" model="account.account.template">
             <field name="code">479</field>
             <field name="reconcile" eval="False"/>
@@ -7869,7 +7885,7 @@
             <field name="reconcile" eval="False"/>
             <field name="parent_id" ref="pgc_pymes_66"/>
             <field name="type">view</field>
-            <field name="name">Ingresos de créditos a largo plazo</field>
+            <field name="name">Intereses de deudas</field>
             <field name="user_type" ref="gastos"/>
         </record>
         <record id="pgc_pymes_6620" model="account.account.template">
@@ -7877,7 +7893,7 @@
             <field name="reconcile" eval="False"/>
             <field name="parent_id" ref="pgc_pymes_662"/>
             <field name="type">view</field>
-            <field name="name">Ingresos de créditos a largo plazo, empresas del grupo</field>
+            <field name="name">Intereses de deudas, empresas del grupo</field>
             <field name="user_type" ref="gastos"/>
         </record>
         <record id="pgc_pymes_6620_child" model="account.account.template">
@@ -7885,7 +7901,7 @@
             <field name="reconcile" eval="False"/>
             <field name="parent_id" ref="pgc_pymes_6620"/>
             <field name="type">other</field>
-            <field name="name">Ingresos de créditos a largo plazo, empresas del grupo</field>
+            <field name="name">Intereses de deudas, empresas del grupo</field>
             <field name="user_type" ref="gastos"/>
         </record>
         <record id="pgc_pymes_6621" model="account.account.template">
@@ -7893,7 +7909,7 @@
             <field name="reconcile" eval="False"/>
             <field name="parent_id" ref="pgc_pymes_662"/>
             <field name="type">view</field>
-            <field name="name">Ingresos de créditos a largo plazo, empresas asociadas</field>
+            <field name="name">Intereses de deudas, empresas asociadas</field>
             <field name="user_type" ref="gastos"/>
         </record>
         <record id="pgc_pymes_6621_child" model="account.account.template">
@@ -7901,7 +7917,7 @@
             <field name="reconcile" eval="False"/>
             <field name="parent_id" ref="pgc_pymes_6621"/>
             <field name="type">other</field>
-            <field name="name">Ingresos de créditos a largo plazo, empresas asociadas</field>
+            <field name="name">Intereses de deudas, empresas asociadas</field>
             <field name="user_type" ref="gastos"/>
         </record>
         <record id="pgc_pymes_6622" model="account.account.template">
@@ -7909,7 +7925,7 @@
             <field name="reconcile" eval="False"/>
             <field name="parent_id" ref="pgc_pymes_662"/>
             <field name="type">view</field>
-            <field name="name">Ingresos de créditos a largo plazo, otras partes vinculadas</field>
+            <field name="name">Intereses de deudas, otras partes vinculadas</field>
             <field name="user_type" ref="gastos"/>
         </record>
         <record id="pgc_pymes_6622_child" model="account.account.template">
@@ -7917,7 +7933,7 @@
             <field name="reconcile" eval="False"/>
             <field name="parent_id" ref="pgc_pymes_6622"/>
             <field name="type">other</field>
-            <field name="name">Ingresos de créditos a largo plazo, otras partes vinculadas</field>
+            <field name="name">Intereses de deudas, otras partes vinculadas</field>
             <field name="user_type" ref="gastos"/>
         </record>
         <record id="pgc_pymes_6623" model="account.account.template">
@@ -7925,7 +7941,7 @@
             <field name="reconcile" eval="False"/>
             <field name="parent_id" ref="pgc_pymes_662"/>
             <field name="type">view</field>
-            <field name="name">Ingresos de créditos a largo plazo con entidades de crédito</field>
+            <field name="name">Intereses de deudas con entidades de crédito</field>
             <field name="user_type" ref="gastos"/>
         </record>
         <record id="pgc_pymes_6623_child" model="account.account.template">
@@ -7933,7 +7949,7 @@
             <field name="reconcile" eval="False"/>
             <field name="parent_id" ref="pgc_pymes_6623"/>
             <field name="type">other</field>
-            <field name="name">Ingresos de créditos a largo plazo con entidades de crédito</field>
+            <field name="name">Intereses de deudas con entidades de crédito</field>
             <field name="user_type" ref="gastos"/>
         </record>
         <record id="pgc_pymes_6624" model="account.account.template">
@@ -7941,7 +7957,7 @@
             <field name="reconcile" eval="False"/>
             <field name="parent_id" ref="pgc_pymes_662"/>
             <field name="type">view</field>
-            <field name="name">Ingresos de créditos a largo plazo, otras empresas</field>
+            <field name="name">Intereses de deudas, otras empresas</field>
             <field name="user_type" ref="gastos"/>
         </record>
         <record id="pgc_pymes_6624_child" model="account.account.template">
@@ -7949,7 +7965,7 @@
             <field name="reconcile" eval="False"/>
             <field name="parent_id" ref="pgc_pymes_6624"/>
             <field name="type">other</field>
-            <field name="name">Ingresos de créditos a largo plazo, otras empresas</field>
+            <field name="name">Intereses de deudas, otras empresas</field>
             <field name="user_type" ref="gastos"/>
         </record>
         <record id="pgc_pymes_663" model="account.account.template">
diff --git a/addons/l10n_es/fiscal_templates.xml b/addons/l10n_es/fiscal_templates.xml
index 5c6d056d2f6..d603e7181b4 100644
--- a/addons/l10n_es/fiscal_templates.xml
+++ b/addons/l10n_es/fiscal_templates.xml
@@ -1,17 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data noupdate="1">
+    <data noupdate="0">
 
     <!-- Definición de posiciones fiscales Régimen Nacional, Recargo de Equivalencia,
-         Extracomunitario, Intracomunitario y Retención de IRPF 18%, 15%, 7%, 1%
+         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 -->
+           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 -->
+
+        <!-- Fiscal Position Templates -->
 
-    <!-- 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="l10nES_chart_template"/>
@@ -32,6 +36,16 @@
             <field name="chart_template_id" ref="l10nES_chart_template"/>
         </record>
 
+        <record id="fp_irpf21" model="account.fiscal.position.template">
+            <field name="name">Retención IRPF 21%</field>
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+        </record>
+
+        <record id="fp_irpf20" model="account.fiscal.position.template">
+            <field name="name">Retención IRPF 20%</field>
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+        </record>
+
         <record id="fp_irpf19" model="account.fiscal.position.template">
             <field name="name">Retención IRPF 19%</field>
             <field name="chart_template_id" ref="l10nES_chart_template"/>
@@ -47,6 +61,11 @@
             <field name="chart_template_id" ref="l10nES_chart_template"/>
         </record>
 
+        <record id="fp_irpf9" model="account.fiscal.position.template">
+            <field name="name">Retención IRPF 9%</field>
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+        </record>
+
         <record id="fp_irpf7" model="account.fiscal.position.template">
             <field name="name">Retención IRPF 7%</field>
             <field name="chart_template_id" ref="l10nES_chart_template"/>
@@ -68,6 +87,54 @@
 
     <!-- Extracomunitarios fiscal.position.tax.template-->
 
+        <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_7" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_extra" />
+            <field name="tax_src_id" ref="iva_sop_7" />
+            <field name="tax_dest_id" ref="iva_X7_compras_bc" />
+        </record>
+
+        <record id="fptt_extra_7_inv" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_extra" />
+            <field name="tax_src_id" ref="iva_sop_7_inv" />
+            <field name="tax_dest_id" ref="iva_X7_compras_bi" />
+        </record>
+
+        <record id="fptt_extra_8" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_extra" />
+            <field name="tax_src_id" ref="iva_sop_8" />
+            <field name="tax_dest_id" ref="iva_X8_compras_bc" />
+        </record>
+
+        <record id="fptt_extra_8_inv" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_extra" />
+            <field name="tax_src_id" ref="iva_sop_8_inv" />
+            <field name="tax_dest_id" ref="iva_X8_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_16" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_extra" />
             <field name="tax_src_id" ref="iva_sop_16" />
@@ -78,7 +145,7 @@
             <field name="tax_src_id" ref="iva_sop_16_inv" />
             <field name="tax_dest_id" ref="iva_X16_compras_bi" />
         </record>
-    
+
         <record id="fptt_extra_18" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_extra" />
             <field name="tax_src_id" ref="iva_sop_18" />
@@ -90,35 +157,15 @@
             <field name="tax_dest_id" ref="iva_X18_compras_bi" />
         </record>
 
-        <record id="fptt_extra_7" model="account.fiscal.position.tax.template">
+        <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_7" />
-            <field name="tax_dest_id" ref="iva_X7_compras_bc" />
+            <field name="tax_src_id" ref="iva_sop_21" />
+            <field name="tax_dest_id" ref="iva_X21_compras_bc" />
         </record>
-        <record id="fptt_extra_7_inv" model="account.fiscal.position.tax.template">
+        <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_7_inv" />
-            <field name="tax_dest_id" ref="iva_X7_compras_bi" />
-        </record>
-        <record id="fptt_extra_8" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_extra" />
-            <field name="tax_src_id" ref="iva_sop_8" />
-            <field name="tax_dest_id" ref="iva_X8_compras_bc" />
-        </record>
-        <record id="fptt_extra_8_inv" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_extra" />
-            <field name="tax_src_id" ref="iva_sop_8_inv" />
-            <field name="tax_dest_id" ref="iva_X8_compras_bi" />
-        </record>
-        <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" />
+            <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">
@@ -138,6 +185,12 @@
             <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_16" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_extra" />
             <field name="tax_src_id" ref="iva_rep_16" />
@@ -148,29 +201,24 @@
             <field name="tax_src_id" ref="iva_rep_18" />
             <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 fiscal.position.tax.template-->
 
-        <record id="fptt_intra_16" model="account.fiscal.position.tax.template">
+        <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_16" />
-            <field name="tax_dest_id" ref="iva_IC_compras_16_bc" />
+            <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_16_inv" model="account.fiscal.position.tax.template">
+
+        <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_16_inv" />
-            <field name="tax_dest_id" ref="iva_IC_compras_16_bi" />
-        </record>
-    
-        <record id="fptt_intra_18" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_intra" />
-            <field name="tax_src_id" ref="iva_sop_18" />
-            <field name="tax_dest_id" ref="iva_IC_compras_18_bc" />
-        </record>
-        <record id="fptt_intra_18_inv" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_intra" />
-            <field name="tax_src_id" ref="iva_sop_18_inv" />
-            <field name="tax_dest_id" ref="iva_IC_compras_18_bi" />
+            <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_7" model="account.fiscal.position.tax.template">
@@ -178,30 +226,71 @@
             <field name="tax_src_id" ref="iva_sop_7" />
             <field name="tax_dest_id" ref="iva_IC_compras_7_bc" />
         </record>
+
         <record id="fptt_intra_7_inv" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_intra" />
             <field name="tax_src_id" ref="iva_sop_7_inv" />
             <field name="tax_dest_id" ref="iva_IC_compras_7_bi" />
         </record>
+
         <record id="fptt_intra_8" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_intra" />
             <field name="tax_src_id" ref="iva_sop_8" />
             <field name="tax_dest_id" ref="iva_IC_compras_8_bc" />
         </record>
+
         <record id="fptt_intra_8_inv" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_intra" />
             <field name="tax_src_id" ref="iva_sop_8_inv" />
             <field name="tax_dest_id" ref="iva_IC_compras_8_bi" />
         </record>
-        <record id="fptt_intra_4" model="account.fiscal.position.tax.template">
+
+        <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_4" />
-            <field name="tax_dest_id" ref="iva_IC_compras_4_bc" />
+            <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_4_inv" model="account.fiscal.position.tax.template">
+
+        <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_4_inv" />
-            <field name="tax_dest_id" ref="iva_IC_compras_4_bi" />
+            <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_16" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_intra" />
+            <field name="tax_src_id" ref="iva_sop_16" />
+            <field name="tax_dest_id" ref="iva_IC_compras_16_bc" />
+        </record>
+
+        <record id="fptt_intra_16_inv" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_intra" />
+            <field name="tax_src_id" ref="iva_sop_16_inv" />
+            <field name="tax_dest_id" ref="iva_IC_compras_16_bi" />
+        </record>
+
+        <record id="fptt_intra_18" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_intra" />
+            <field name="tax_src_id" ref="iva_sop_18" />
+            <field name="tax_dest_id" ref="iva_IC_compras_18_bc" />
+        </record>
+
+        <record id="fptt_intra_18_inv" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_intra" />
+            <field name="tax_src_id" ref="iva_sop_18_inv" />
+            <field name="tax_dest_id" ref="iva_IC_compras_18_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">
@@ -215,27 +304,87 @@
             <field name="tax_src_id" ref="iva_rep_7" />
             <field name="tax_dest_id" ref="iva_IO" />
         </record>
-    
+
         <record id="fptt_intra_ventas_8" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_intra" />
             <field name="tax_src_id" ref="iva_rep_8" />
             <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_16" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_intra" />
             <field name="tax_src_id" ref="iva_rep_16" />
             <field name="tax_dest_id" ref="iva_IO" />
         </record>
-    
+
         <record id="fptt_intra_ventas_18" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_intra" />
             <field name="tax_src_id" ref="iva_rep_18" />
             <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 fiscal.position.tax.template-->
 
+        <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_7" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_recargo" />
+            <field name="tax_src_id" ref="iva_rep_7" />
+            <field name="tax_dest_id" ref="iva_rep_7" />
+        </record>
+
+        <record id="fptt_recargo_7_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_recargo" />
+            <field name="tax_src_id" ref="iva_rep_7" />
+            <field name="tax_dest_id" ref="re_1" />
+        </record>
+
+        <record id="fptt_recargo_8" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_recargo" />
+            <field name="tax_src_id" ref="iva_rep_8" />
+            <field name="tax_dest_id" ref="iva_rep_8" />
+        </record>
+
+        <record id="fptt_recargo_8_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_recargo" />
+            <field name="tax_src_id" ref="iva_rep_8" />
+            <field name="tax_dest_id" ref="re_1" />
+        </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_16" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_recargo" />
             <field name="tax_src_id" ref="iva_rep_16" />
@@ -260,42 +409,188 @@
             <field name="tax_dest_id" ref="re_4" />
         </record>
 
-        <record id="fptt_recargo_7" model="account.fiscal.position.tax.template">
+        <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_7" />
-            <field name="tax_dest_id" ref="iva_rep_7" />
+            <field name="tax_src_id" ref="iva_rep_21" />
+            <field name="tax_dest_id" ref="iva_rep_21" />
         </record>
 
-        <record id="fptt_recargo_7_2" model="account.fiscal.position.tax.template">
+        <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_7" />
-            <field name="tax_dest_id" ref="re_1" />
-        </record>
-    
-        <record id="fptt_recargo_8" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_recargo" />
-            <field name="tax_src_id" ref="iva_rep_8" />
-            <field name="tax_dest_id" ref="iva_rep_8" />
+            <field name="tax_src_id" ref="iva_rep_21" />
+            <field name="tax_dest_id" ref="re_52" />
         </record>
 
-        <record id="fptt_recargo_8_2" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_recargo" />
-            <field name="tax_src_id" ref="iva_rep_8" />
-            <field name="tax_dest_id" ref="re_1" />
+        <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_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 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_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 id="fptt_recargo_buy_7" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_recargo"  />
+            <field name="tax_src_id" ref="iva_sop_7" />
+            <field name="tax_dest_id" ref="iva_sop_7" />
         </record>
 
+        <record id="fptt_recargo_buy_7_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_recargo"  />
+            <field name="tax_src_id" ref="iva_sop_7" />
+            <field name="tax_dest_id" ref="re_buy_1" />
+        </record>
+
+        <record id="fptt_recargo_buy_8" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_recargo"  />
+            <field name="tax_src_id" ref="iva_sop_8" />
+            <field name="tax_dest_id" ref="iva_sop_8" />
+        </record>
+
+        <record id="fptt_recargo_buy_8_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_recargo"  />
+            <field name="tax_src_id" ref="iva_sop_8" />
+            <field name="tax_dest_id" ref="re_buy_1" />
+        </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_7_inv" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_recargo"  />
+            <field name="tax_src_id" ref="iva_sop_7_inv" />
+            <field name="tax_dest_id" ref="iva_sop_7_inv" />
+        </record>
+
+        <record id="fptt_recargo_buy_7_2_inv" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_recargo"  />
+            <field name="tax_src_id" ref="iva_sop_7_inv" />
+            <field name="tax_dest_id" ref="re_buy_1" />
+        </record>
+
+        <record id="fptt_recargo_buy_8_inv" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_recargo"  />
+            <field name="tax_src_id" ref="iva_sop_8_inv" />
+            <field name="tax_dest_id" ref="iva_sop_8_inv" />
+        </record>
+
+        <record id="fptt_recargo_buy_8_2_inv" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_recargo"  />
+            <field name="tax_src_id" ref="iva_sop_8_inv" />
+            <field name="tax_dest_id" ref="re_buy_1" />
+        </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_16" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_recargo"  />
+            <field name="tax_src_id" ref="iva_sop_16" />
+            <field name="tax_dest_id" ref="iva_sop_16" />
+        </record>
+
+        <record id="fptt_recargo_buy_16_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_recargo"  />
+            <field name="tax_src_id" ref="iva_sop_16" />
+            <field name="tax_dest_id" ref="re_buy_4" />
+        </record>
+
+        <record id="fptt_recargo_buy_18" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_recargo"  />
+            <field name="tax_src_id" ref="iva_sop_18" />
+            <field name="tax_dest_id" ref="iva_sop_18" />
+        </record>
+
+        <record id="fptt_recargo_buy_18_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_recargo"  />
+            <field name="tax_src_id" ref="iva_sop_18" />
+            <field name="tax_dest_id" ref="re_buy_4" />
+        </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_16_inv" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_recargo"  />
+            <field name="tax_src_id" ref="iva_sop_16_inv" />
+            <field name="tax_dest_id" ref="iva_sop_16_inv" />
+        </record>
+
+        <record id="fptt_recargo_buy_16_2_inv" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_recargo"  />
+            <field name="tax_src_id" ref="iva_sop_16_inv" />
+            <field name="tax_dest_id" ref="re_buy_4" />
+        </record>
+
+        <record id="fptt_recargo_buy_18_inv" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_recargo"  />
+            <field name="tax_src_id" ref="iva_sop_18_inv" />
+            <field name="tax_dest_id" ref="iva_sop_18_inv" />
+        </record>
+
+        <record id="fptt_recargo_buy_18_2_inv" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_recargo"  />
+            <field name="tax_src_id" ref="iva_sop_18_inv" />
+            <field name="tax_dest_id" ref="re_buy_4" />
+        </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>
+
+
     <!-- Extracomunitarios fiscal.position.account.template-->
 
         <record id="fpat_extra_acc_1" model="account.fiscal.position.account.template">
@@ -372,7 +667,310 @@
             <field name="account_dest_id" ref="pgc_7051" />
         </record>
 
-    <!-- Retenciones IRPF 19% fiscal.position.tax.template-->
+        <!-- Retenciones IRPF 20% fiscal.position.tax.template-->
+        <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_18" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf20" />
+            <field name="tax_src_id" ref="iva_rep_18" />
+            <field name="tax_dest_id" ref="iva_rep_18" />
+        </record>
+
+        <record id="fptt_irpf20sale_18_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf20" />
+            <field name="tax_src_id" ref="iva_rep_18" />
+            <field name="tax_dest_id" ref="irpf_sale_20" />
+        </record>
+
+        <record id="fptt_irpf20sale_16" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf20" />
+            <field name="tax_src_id" ref="iva_rep_16" />
+            <field name="tax_dest_id" ref="iva_rep_16" />
+        </record>
+
+        <record id="fptt_irpf20sale_16_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf20" />
+            <field name="tax_src_id" ref="iva_rep_16" />
+            <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_8" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf20" />
+            <field name="tax_src_id" ref="iva_rep_8" />
+            <field name="tax_dest_id" ref="iva_rep_8" />
+        </record>
+
+        <record id="fptt_irpf20sale_8_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf20" />
+            <field name="tax_src_id" ref="iva_rep_8" />
+            <field name="tax_dest_id" ref="irpf_sale_20" />
+        </record>
+
+        <record id="fptt_irpf20sale_7" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf20" />
+            <field name="tax_src_id" ref="iva_rep_7" />
+            <field name="tax_dest_id" ref="iva_rep_7" />
+        </record>
+
+        <record id="fptt_irpf20sale_7_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf20" />
+            <field name="tax_src_id" ref="iva_rep_7" />
+            <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_18" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf20" />
+            <field name="tax_src_id" ref="iva_sop_18" />
+            <field name="tax_dest_id" ref="iva_sop_18" />
+        </record>
+
+        <record id="fptt_irpf20_18_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf20" />
+            <field name="tax_src_id" ref="iva_sop_18" />
+            <field name="tax_dest_id" ref="irpf_20" />
+        </record>
+
+        <record id="fptt_irpf20_16" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf20" />
+            <field name="tax_src_id" ref="iva_sop_16" />
+            <field name="tax_dest_id" ref="iva_sop_16" />
+        </record>
+
+        <record id="fptt_irpf20_16_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf20" />
+            <field name="tax_src_id" ref="iva_sop_16" />
+            <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_8" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf20" />
+            <field name="tax_src_id" ref="iva_sop_8" />
+            <field name="tax_dest_id" ref="iva_sop_8" />
+        </record>
+
+        <record id="fptt_irpf20_8_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf20" />
+            <field name="tax_src_id" ref="iva_sop_8" />
+            <field name="tax_dest_id" ref="irpf_20" />
+        </record>
+
+        <record id="fptt_irpf20_7" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf20" />
+            <field name="tax_src_id" ref="iva_sop_7" />
+            <field name="tax_dest_id" ref="iva_sop_7" />
+        </record>
+
+        <record id="fptt_irpf20_7_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf20" />
+            <field name="tax_src_id" ref="iva_sop_7" />
+            <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 21% fiscal.position.tax.template-->
+
+        <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_18" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf21" />
+            <field name="tax_src_id" ref="iva_rep_18" />
+            <field name="tax_dest_id" ref="iva_rep_18" />
+        </record>
+
+        <record id="fptt_irpf21sale_18_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf21" />
+            <field name="tax_src_id" ref="iva_rep_18" />
+            <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_8" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf21" />
+            <field name="tax_src_id" ref="iva_rep_8" />
+            <field name="tax_dest_id" ref="iva_rep_8" />
+        </record>
+
+        <record id="fptt_irpf21sale_8_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf21" />
+            <field name="tax_src_id" ref="iva_rep_8" />
+            <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_18" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf21" />
+            <field name="tax_src_id" ref="iva_sop_18" />
+            <field name="tax_dest_id" ref="iva_sop_18" />
+        </record>
+
+        <record id="fptt_irpf21_18_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf21" />
+            <field name="tax_src_id" ref="iva_sop_18" />
+            <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_8" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf21" />
+            <field name="tax_src_id" ref="iva_sop_8" />
+            <field name="tax_dest_id" ref="iva_sop_8" />
+        </record>
+
+        <record id="fptt_irpf21_8_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf21" />
+            <field name="tax_src_id" ref="iva_sop_8" />
+            <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>
+
+        <!-- Retenciones IRPF 19% fiscal.position.tax.template-->
+
+        <record id="fptt_irpf19sale_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf19" />
+            <field name="tax_src_id" ref="iva_rep_21" />
+            <field name="tax_dest_id" ref="iva_rep_21" />
+        </record>
+
+        <record id="fptt_irpf19sale_21_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf19" />
+            <field name="tax_src_id" ref="iva_rep_21" />
+            <field name="tax_dest_id" ref="irpf_sale_19" />
+        </record>
+
 
         <record id="fptt_irpf19sale_18" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_irpf19" />
@@ -386,18 +984,6 @@
             <field name="tax_dest_id" ref="irpf_sale_19" />
         </record>
 
-        <record id="fptt_irpf19sale_8" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_irpf19" />
-            <field name="tax_src_id" ref="iva_rep_8" />
-            <field name="tax_dest_id" ref="iva_rep_8" />
-        </record>
-
-        <record id="fptt_irpf19sale_8_2" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_irpf19" />
-            <field name="tax_src_id" ref="iva_rep_8" />
-            <field name="tax_dest_id" ref="irpf_sale_19" />
-        </record>
-
         <record id="fptt_irpf19sale_16" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_irpf19" />
             <field name="tax_src_id" ref="iva_rep_16" />
@@ -410,6 +996,30 @@
             <field name="tax_dest_id" ref="irpf_sale_19" />
         </record>
 
+        <record id="fptt_irpf19sale_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf19" />
+            <field name="tax_src_id" ref="iva_rep_10" />
+            <field name="tax_dest_id" ref="iva_rep_10" />
+        </record>
+
+        <record id="fptt_irpf19sale_10_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf19" />
+            <field name="tax_src_id" ref="iva_rep_10" />
+            <field name="tax_dest_id" ref="irpf_sale_19" />
+        </record>
+
+        <record id="fptt_irpf19sale_8" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf19" />
+            <field name="tax_src_id" ref="iva_rep_8" />
+            <field name="tax_dest_id" ref="iva_rep_8" />
+        </record>
+
+        <record id="fptt_irpf19sale_8_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf19" />
+            <field name="tax_src_id" ref="iva_rep_8" />
+            <field name="tax_dest_id" ref="irpf_sale_19" />
+        </record>
+
         <record id="fptt_irpf19sale_7" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_irpf19" />
             <field name="tax_src_id" ref="iva_rep_7" />
@@ -434,6 +1044,18 @@
             <field name="tax_dest_id" ref="irpf_sale_19" />
         </record>
 
+        <record id="fptt_irpf19_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf19" />
+            <field name="tax_src_id" ref="iva_sop_21" />
+            <field name="tax_dest_id" ref="iva_sop_21" />
+        </record>
+
+        <record id="fptt_irpf19_21_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf19" />
+            <field name="tax_src_id" ref="iva_sop_21" />
+            <field name="tax_dest_id" ref="irpf_19" />
+        </record>
+
         <record id="fptt_irpf19_18" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_irpf19" />
             <field name="tax_src_id" ref="iva_sop_18" />
@@ -446,18 +1068,6 @@
             <field name="tax_dest_id" ref="irpf_19" />
         </record>
 
-        <record id="fptt_irpf19_8" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_irpf19" />
-            <field name="tax_src_id" ref="iva_sop_8" />
-            <field name="tax_dest_id" ref="iva_sop_8" />
-        </record>
-
-        <record id="fptt_irpf19_8_2" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_irpf19" />
-            <field name="tax_src_id" ref="iva_sop_8" />
-            <field name="tax_dest_id" ref="irpf_19" />
-        </record>
-
         <record id="fptt_irpf19_16" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_irpf19" />
             <field name="tax_src_id" ref="iva_sop_16" />
@@ -470,6 +1080,30 @@
             <field name="tax_dest_id" ref="irpf_19" />
         </record>
 
+         <record id="fptt_irpf19_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf19" />
+            <field name="tax_src_id" ref="iva_sop_10" />
+            <field name="tax_dest_id" ref="iva_sop_10" />
+        </record>
+
+        <record id="fptt_irpf19_10_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf19" />
+            <field name="tax_src_id" ref="iva_sop_10" />
+            <field name="tax_dest_id" ref="irpf_19" />
+        </record>
+
+        <record id="fptt_irpf19_8" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf19" />
+            <field name="tax_src_id" ref="iva_sop_8" />
+            <field name="tax_dest_id" ref="iva_sop_8" />
+        </record>
+
+        <record id="fptt_irpf19_8_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf19" />
+            <field name="tax_src_id" ref="iva_sop_8" />
+            <field name="tax_dest_id" ref="irpf_19" />
+        </record>
+
         <record id="fptt_irpf19_7" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_irpf19" />
             <field name="tax_src_id" ref="iva_sop_7" />
@@ -495,6 +1129,18 @@
         </record>
 
     <!-- Retenciones IRPF 18% fiscal.position.tax.template-->
+        <record id="fptt_irpf18sale_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf18" />
+            <field name="tax_src_id" ref="iva_rep_21" />
+            <field name="tax_dest_id" ref="iva_rep_21" />
+        </record>
+
+        <record id="fptt_irpf18sale_21_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf18" />
+            <field name="tax_src_id" ref="iva_rep_21" />
+            <field name="tax_dest_id" ref="irpf_sale_18" />
+        </record>
+
 
         <record id="fptt_irpf18sale_18" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_irpf18" />
@@ -508,6 +1154,30 @@
             <field name="tax_dest_id" ref="irpf_sale_18" />
         </record>
 
+         <record id="fptt_irpf18sale_16" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf18" />
+            <field name="tax_src_id" ref="iva_rep_16" />
+            <field name="tax_dest_id" ref="iva_rep_16" />
+        </record>
+
+        <record id="fptt_irpf18sale_16_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf18" />
+            <field name="tax_src_id" ref="iva_rep_16" />
+            <field name="tax_dest_id" ref="irpf_sale_18" />
+        </record>
+
+        <record id="fptt_irpf18sale_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf18" />
+            <field name="tax_src_id" ref="iva_rep_10" />
+            <field name="tax_dest_id" ref="iva_rep_10" />
+        </record>
+
+        <record id="fptt_irpf18sale_10_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf18" />
+            <field name="tax_src_id" ref="iva_rep_10" />
+            <field name="tax_dest_id" ref="irpf_sale_18" />
+        </record>
+
         <record id="fptt_irpf18sale_8" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_irpf18" />
             <field name="tax_src_id" ref="iva_rep_8" />
@@ -520,18 +1190,6 @@
             <field name="tax_dest_id" ref="irpf_sale_18" />
         </record>
 
-        <record id="fptt_irpf18sale_16" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_irpf18" />
-            <field name="tax_src_id" ref="iva_rep_16" />
-            <field name="tax_dest_id" ref="iva_rep_16" />
-        </record>
-
-        <record id="fptt_irpf18sale_16_2" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_irpf18" />
-            <field name="tax_src_id" ref="iva_rep_16" />
-            <field name="tax_dest_id" ref="irpf_sale_18" />
-        </record>
-
         <record id="fptt_irpf18sale_7" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_irpf18" />
             <field name="tax_src_id" ref="iva_rep_7" />
@@ -556,6 +1214,18 @@
             <field name="tax_dest_id" ref="irpf_sale_18" />
         </record>
 
+        <record id="fptt_irpf18_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf18" />
+            <field name="tax_src_id" ref="iva_sop_21" />
+            <field name="tax_dest_id" ref="iva_sop_21" />
+        </record>
+
+        <record id="fptt_irpf18_21_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf18" />
+            <field name="tax_src_id" ref="iva_sop_21" />
+            <field name="tax_dest_id" ref="irpf_18" />
+        </record>
+
         <record id="fptt_irpf18_18" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_irpf18" />
             <field name="tax_src_id" ref="iva_sop_18" />
@@ -568,6 +1238,30 @@
             <field name="tax_dest_id" ref="irpf_18" />
         </record>
 
+         <record id="fptt_irpf18_16" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf18" />
+            <field name="tax_src_id" ref="iva_sop_16" />
+            <field name="tax_dest_id" ref="iva_sop_16" />
+        </record>
+
+        <record id="fptt_irpf18_16_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf18" />
+            <field name="tax_src_id" ref="iva_sop_16" />
+            <field name="tax_dest_id" ref="irpf_18" />
+        </record>
+
+        <record id="fptt_irpf18_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf18" />
+            <field name="tax_src_id" ref="iva_sop_10" />
+            <field name="tax_dest_id" ref="iva_sop_10" />
+        </record>
+
+        <record id="fptt_irpf18_10_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf18" />
+            <field name="tax_src_id" ref="iva_sop_10" />
+            <field name="tax_dest_id" ref="irpf_18" />
+        </record>
+
         <record id="fptt_irpf18_8" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_irpf18" />
             <field name="tax_src_id" ref="iva_sop_8" />
@@ -580,18 +1274,6 @@
             <field name="tax_dest_id" ref="irpf_18" />
         </record>
 
-        <record id="fptt_irpf18_16" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_irpf18" />
-            <field name="tax_src_id" ref="iva_sop_16" />
-            <field name="tax_dest_id" ref="iva_sop_16" />
-        </record>
-
-        <record id="fptt_irpf18_16_2" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_irpf18" />
-            <field name="tax_src_id" ref="iva_sop_16" />
-            <field name="tax_dest_id" ref="irpf_18" />
-        </record>
-
         <record id="fptt_irpf18_7" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_irpf18" />
             <field name="tax_src_id" ref="iva_sop_7" />
@@ -616,7 +1298,19 @@
             <field name="tax_dest_id" ref="irpf_18" />
         </record>
 
-    <!-- Retenciones IRPF 15% fiscal.position.tax.template-->
+        <!-- Retenciones IRPF 15% fiscal.position.tax.template-->
+
+        <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_18" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_irpf15" />
@@ -630,18 +1324,6 @@
             <field name="tax_dest_id" ref="irpf_sale_15" />
         </record>
 
-        <record id="fptt_irpf15sale_8" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_irpf15" />
-            <field name="tax_src_id" ref="iva_rep_8" />
-            <field name="tax_dest_id" ref="iva_rep_8" />
-        </record>
-
-        <record id="fptt_irpf15sale_8_2" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_irpf15" />
-            <field name="tax_src_id" ref="iva_rep_8" />
-            <field name="tax_dest_id" ref="irpf_sale_15" />
-        </record>
-
         <record id="fptt_irpf15sale_16" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_irpf15" />
             <field name="tax_src_id" ref="iva_rep_16" />
@@ -654,6 +1336,30 @@
             <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_8" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf15" />
+            <field name="tax_src_id" ref="iva_rep_8" />
+            <field name="tax_dest_id" ref="iva_rep_8" />
+        </record>
+
+        <record id="fptt_irpf15sale_8_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf15" />
+            <field name="tax_src_id" ref="iva_rep_8" />
+            <field name="tax_dest_id" ref="irpf_sale_15" />
+        </record>
+
         <record id="fptt_irpf15sale_7" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_irpf15" />
             <field name="tax_src_id" ref="iva_rep_7" />
@@ -678,6 +1384,18 @@
             <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_18" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_irpf15" />
             <field name="tax_src_id" ref="iva_sop_18" />
@@ -690,18 +1408,6 @@
             <field name="tax_dest_id" ref="irpf_15" />
         </record>
 
-        <record id="fptt_irpf15_8" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_irpf15" />
-            <field name="tax_src_id" ref="iva_sop_8" />
-            <field name="tax_dest_id" ref="iva_sop_8" />
-        </record>
-
-        <record id="fptt_irpf15_8_2" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_irpf15" />
-            <field name="tax_src_id" ref="iva_sop_8" />
-            <field name="tax_dest_id" ref="irpf_15" />
-        </record>
-
         <record id="fptt_irpf15_16" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_irpf15" />
             <field name="tax_src_id" ref="iva_sop_16" />
@@ -714,6 +1420,30 @@
             <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_8" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf15" />
+            <field name="tax_src_id" ref="iva_sop_8" />
+            <field name="tax_dest_id" ref="iva_sop_8" />
+        </record>
+
+        <record id="fptt_irpf15_8_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf15" />
+            <field name="tax_src_id" ref="iva_sop_8" />
+            <field name="tax_dest_id" ref="irpf_15" />
+        </record>
+
         <record id="fptt_irpf15_7" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_irpf15" />
             <field name="tax_src_id" ref="iva_sop_7" />
@@ -738,7 +1468,142 @@
             <field name="tax_dest_id" ref="irpf_15" />
         </record>
 
-    <!-- Retenciones IRPF 7% fiscal.position.tax.template-->
+        <!-- Retenciones IRPF 9% fiscal.position.tax.template-->
+
+        <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_18" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf9" />
+            <field name="tax_src_id" ref="iva_rep_18" />
+            <field name="tax_dest_id" ref="iva_rep_18" />
+        </record>
+
+        <record id="fptt_irpf9sale_18_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf9" />
+            <field name="tax_src_id" ref="iva_rep_18" />
+            <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_8" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf9" />
+            <field name="tax_src_id" ref="iva_rep_8" />
+            <field name="tax_dest_id" ref="iva_rep_8" />
+        </record>
+
+        <record id="fptt_irpf9sale_8_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf9" />
+            <field name="tax_src_id" ref="iva_rep_8" />
+            <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_18" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf9" />
+            <field name="tax_src_id" ref="iva_sop_18" />
+            <field name="tax_dest_id" ref="iva_sop_18" />
+        </record>
+
+        <record id="fptt_irpf9_18_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf9" />
+            <field name="tax_src_id" ref="iva_sop_18" />
+            <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_8" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf9" />
+            <field name="tax_src_id" ref="iva_sop_8" />
+            <field name="tax_dest_id" ref="iva_sop_8" />
+        </record>
+
+        <record id="fptt_irpf9_8_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf9" />
+            <field name="tax_src_id" ref="iva_sop_8" />
+            <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>
+
+        <!-- Retenciones IRPF 7% fiscal.position.tax.template-->
+
+        <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_18" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_irpf7" />
@@ -752,18 +1617,6 @@
             <field name="tax_dest_id" ref="irpf_sale_7" />
         </record>
 
-        <record id="fptt_irpf7sale_8" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_irpf7" />
-            <field name="tax_src_id" ref="iva_rep_8" />
-            <field name="tax_dest_id" ref="iva_rep_8" />
-        </record>
-
-        <record id="fptt_irpf7sale_8_2" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_irpf7" />
-            <field name="tax_src_id" ref="iva_rep_8" />
-            <field name="tax_dest_id" ref="irpf_sale_7" />
-        </record>
-
         <record id="fptt_irpf7sale_16" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_irpf7" />
             <field name="tax_src_id" ref="iva_rep_16" />
@@ -776,6 +1629,30 @@
             <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_8" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf7" />
+            <field name="tax_src_id" ref="iva_rep_8" />
+            <field name="tax_dest_id" ref="iva_rep_8" />
+        </record>
+
+        <record id="fptt_irpf7sale_8_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf7" />
+            <field name="tax_src_id" ref="iva_rep_8" />
+            <field name="tax_dest_id" ref="irpf_sale_7" />
+        </record>
+
         <record id="fptt_irpf7sale_7" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_irpf7" />
             <field name="tax_src_id" ref="iva_rep_7" />
@@ -800,6 +1677,18 @@
             <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_18" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_irpf7" />
             <field name="tax_src_id" ref="iva_sop_18" />
@@ -812,6 +1701,30 @@
             <field name="tax_dest_id" ref="irpf_7" />
         </record>
 
+         <record id="fptt_irpf7_16" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf7" />
+            <field name="tax_src_id" ref="iva_sop_16" />
+            <field name="tax_dest_id" ref="iva_sop_16" />
+        </record>
+
+        <record id="fptt_irpf7_16_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf7" />
+            <field name="tax_src_id" ref="iva_sop_16" />
+            <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_8" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_irpf7" />
             <field name="tax_src_id" ref="iva_sop_8" />
@@ -824,18 +1737,6 @@
             <field name="tax_dest_id" ref="irpf_7" />
         </record>
 
-        <record id="fptt_irpf7_16" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_irpf7" />
-            <field name="tax_src_id" ref="iva_sop_16" />
-            <field name="tax_dest_id" ref="iva_sop_16" />
-        </record>
-
-        <record id="fptt_irpf7_16_2" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_irpf7" />
-            <field name="tax_src_id" ref="iva_sop_16" />
-            <field name="tax_dest_id" ref="irpf_7" />
-        </record>
-
         <record id="fptt_irpf7_7" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_irpf7" />
             <field name="tax_src_id" ref="iva_sop_7" />
@@ -862,6 +1763,18 @@
 
     <!-- Retenciones IRPF 2% fiscal.position.tax.template-->
 
+        <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_18" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_irpf2" />
             <field name="tax_src_id" ref="iva_rep_18" />
@@ -874,18 +1787,6 @@
             <field name="tax_dest_id" ref="irpf_sale_2" />
         </record>
 
-        <record id="fptt_irpf2sale_8" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_irpf2" />
-            <field name="tax_src_id" ref="iva_rep_8" />
-            <field name="tax_dest_id" ref="iva_rep_8" />
-        </record>
-
-        <record id="fptt_irpf2sale_8_2" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_irpf2" />
-            <field name="tax_src_id" ref="iva_rep_8" />
-            <field name="tax_dest_id" ref="irpf_sale_2" />
-        </record>
-
         <record id="fptt_irpf2sale_16" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_irpf2" />
             <field name="tax_src_id" ref="iva_rep_16" />
@@ -898,6 +1799,30 @@
             <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_8" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf2" />
+            <field name="tax_src_id" ref="iva_rep_8" />
+            <field name="tax_dest_id" ref="iva_rep_8" />
+        </record>
+
+        <record id="fptt_irpf2sale_8_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf2" />
+            <field name="tax_src_id" ref="iva_rep_8" />
+            <field name="tax_dest_id" ref="irpf_sale_2" />
+        </record>
+
         <record id="fptt_irpf2sale_7" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_irpf2" />
             <field name="tax_src_id" ref="iva_rep_7" />
@@ -922,6 +1847,18 @@
             <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_18" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_irpf2" />
             <field name="tax_src_id" ref="iva_sop_18" />
@@ -934,18 +1871,6 @@
             <field name="tax_dest_id" ref="irpf_2" />
         </record>
 
-        <record id="fptt_irpf2_8" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_irpf2" />
-            <field name="tax_src_id" ref="iva_sop_8" />
-            <field name="tax_dest_id" ref="iva_sop_8" />
-        </record>
-
-        <record id="fptt_irpf2_8_2" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_irpf2" />
-            <field name="tax_src_id" ref="iva_sop_8" />
-            <field name="tax_dest_id" ref="irpf_2" />
-        </record>
-
         <record id="fptt_irpf2_16" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_irpf2" />
             <field name="tax_src_id" ref="iva_sop_16" />
@@ -958,6 +1883,30 @@
             <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_8" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf2" />
+            <field name="tax_src_id" ref="iva_sop_8" />
+            <field name="tax_dest_id" ref="iva_sop_8" />
+        </record>
+
+        <record id="fptt_irpf2_8_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf2" />
+            <field name="tax_src_id" ref="iva_sop_8" />
+            <field name="tax_dest_id" ref="irpf_2" />
+        </record>
+
         <record id="fptt_irpf2_7" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_irpf2" />
             <field name="tax_src_id" ref="iva_sop_7" />
@@ -984,6 +1933,19 @@
 
     <!-- Retenciones IRPF 1% fiscal.position.tax.template-->
 
+        <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_18" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_irpf1" />
             <field name="tax_src_id" ref="iva_rep_18" />
@@ -996,18 +1958,6 @@
             <field name="tax_dest_id" ref="irpf_sale_1" />
         </record>
 
-        <record id="fptt_irpf1sale_8" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_irpf1" />
-            <field name="tax_src_id" ref="iva_rep_8" />
-            <field name="tax_dest_id" ref="iva_rep_8" />
-        </record>
-
-        <record id="fptt_irpf1sale_8_2" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_irpf1" />
-            <field name="tax_src_id" ref="iva_rep_8" />
-            <field name="tax_dest_id" ref="irpf_sale_1" />
-        </record>
-
         <record id="fptt_irpf1sale_16" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_irpf1" />
             <field name="tax_src_id" ref="iva_rep_16" />
@@ -1020,6 +1970,30 @@
             <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_8" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf1" />
+            <field name="tax_src_id" ref="iva_rep_8" />
+            <field name="tax_dest_id" ref="iva_rep_8" />
+        </record>
+
+        <record id="fptt_irpf1sale_8_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf1" />
+            <field name="tax_src_id" ref="iva_rep_8" />
+            <field name="tax_dest_id" ref="irpf_sale_1" />
+        </record>
+
         <record id="fptt_irpf1sale_7" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_irpf1" />
             <field name="tax_src_id" ref="iva_rep_7" />
@@ -1044,6 +2018,18 @@
             <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_18" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_irpf1" />
             <field name="tax_src_id" ref="iva_sop_18" />
@@ -1056,18 +2042,6 @@
             <field name="tax_dest_id" ref="irpf_1" />
         </record>
 
-        <record id="fptt_irpf1_8" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_irpf1" />
-            <field name="tax_src_id" ref="iva_sop_8" />
-            <field name="tax_dest_id" ref="iva_sop_8" />
-        </record>
-
-        <record id="fptt_irpf1_8_2" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_irpf1" />
-            <field name="tax_src_id" ref="iva_sop_8" />
-            <field name="tax_dest_id" ref="irpf_1" />
-        </record>
-
         <record id="fptt_irpf1_16" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_irpf1" />
             <field name="tax_src_id" ref="iva_sop_16" />
@@ -1080,6 +2054,30 @@
             <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_8" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf1" />
+            <field name="tax_src_id" ref="iva_sop_8" />
+            <field name="tax_dest_id" ref="iva_sop_8" />
+        </record>
+
+        <record id="fptt_irpf1_8_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf1" />
+            <field name="tax_src_id" ref="iva_sop_8" />
+            <field name="tax_dest_id" ref="irpf_1" />
+        </record>
+
         <record id="fptt_irpf1_7" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_irpf1" />
             <field name="tax_src_id" ref="iva_sop_7" />
@@ -1104,5 +2102,222 @@
             <field name="tax_dest_id" ref="irpf_1" />
         </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_irpf20sale_ex" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf20" />
+            <field name="tax_src_id" ref="iva_rep_ex" />
+            <field name="tax_dest_id" ref="iva_rep_ex" />
+        </record>
+
+        <record id="fptt_irpf20sale_ex_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf20" />
+            <field name="tax_src_id" ref="iva_rep_ex" />
+            <field name="tax_dest_id" ref="irpf_sale_20" />
+        </record> 
+
+        <record id="fptt_irpf19sale_ex" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf19" />
+            <field name="tax_src_id" ref="iva_rep_ex" />
+            <field name="tax_dest_id" ref="iva_rep_ex" />
+        </record>
+
+        <record id="fptt_irpf19sale_ex_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf19" />
+            <field name="tax_src_id" ref="iva_rep_ex" />
+            <field name="tax_dest_id" ref="irpf_sale_19" />
+        </record>        
+
+        <record id="fptt_irpf18sale_ex" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf18" />
+            <field name="tax_src_id" ref="iva_rep_ex" />
+            <field name="tax_dest_id" ref="iva_rep_ex" />
+        </record>
+
+        <record id="fptt_irpf18sale_ex_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf18"/>
+            <field name="tax_src_id" ref="iva_rep_ex" />
+            <field name="tax_dest_id" ref="irpf_sale_18" />
+        </record>        
+
+        <record id="fptt_irpf15sale_ex" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf15" />
+            <field name="tax_src_id" ref="iva_rep_ex" />
+            <field name="tax_dest_id" ref="iva_rep_ex" />
+        </record>
+
+        <record id="fptt_irpf15sale_ex_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf15" />
+            <field name="tax_src_id" ref="iva_rep_ex" />
+            <field name="tax_dest_id" ref="irpf_sale_15" />
+        </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_irpf7sale_ex" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf7" />            
+            <field name="tax_src_id" ref="iva_rep_ex" />
+            <field name="tax_dest_id" ref="iva_rep_ex" />
+        </record>
+
+        <record id="fptt_irpf7sale_ex_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf7" />
+            <field name="tax_src_id" ref="iva_rep_ex" />
+            <field name="tax_dest_id" ref="irpf_sale_7" />
+        </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_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>
+
+        <!-- IVA SOPORTADO -->
+
+        <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>
+        
+        <record id="fptt_irpf20_0" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf20"/>
+            <field name="tax_src_id" ref="iva_sop_ex" />
+            <field name="tax_dest_id" ref="iva_sop_ex" />
+        </record>
+
+        <record id="fptt_irpf20_0_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf20"/>
+            <field name="tax_src_id" ref="iva_sop_ex" />
+            <field name="tax_dest_id" ref="irpf_20" />
+        </record>
+        
+        <record id="fptt_irpf19_0" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf19"/>
+            <field name="tax_src_id" ref="iva_sop_ex" />
+            <field name="tax_dest_id" ref="iva_sop_ex" />
+        </record>
+
+        <record id="fptt_irpf19_0_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf19"/>
+            <field name="tax_src_id" ref="iva_sop_ex" />
+            <field name="tax_dest_id" ref="irpf_19" />
+        </record>
+        
+        <record id="fptt_irpf18_0" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf18" />
+            <field name="tax_src_id" ref="iva_sop_ex" />
+            <field name="tax_dest_id" ref="iva_sop_ex" />
+        </record>
+
+        <record id="fptt_irpf18_0_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf18" />
+            <field name="tax_src_id" ref="iva_sop_ex" />
+            <field name="tax_dest_id" ref="irpf_18" />
+        </record>
+        
+        <record id="fptt_irpf15_0" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf15" />
+            <field name="tax_src_id" ref="iva_sop_ex" />
+            <field name="tax_dest_id" ref="iva_sop_ex" />
+        </record>
+
+        <record id="fptt_irpf15_0_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf15"/>
+            <field name="tax_src_id" ref="iva_sop_ex" />
+            <field name="tax_dest_id" ref="irpf_15" />
+        </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>        
+
+        <record id="fptt_irpf7_0" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf7" />
+            <field name="tax_src_id" ref="iva_sop_ex" />
+            <field name="tax_dest_id" ref="iva_sop_ex" />
+        </record>
+
+        <record id="fptt_irpf7_0_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf7" />
+            <field name="tax_src_id" ref="iva_sop_ex" />
+            <field name="tax_dest_id" ref="irpf_7" />
+        </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>
+        
+        <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>
     </data>
 </openerp>
diff --git a/addons/l10n_es/fiscal_templates_assoc.xml b/addons/l10n_es/fiscal_templates_assoc.xml
new file mode 100644
index 00000000000..42c7ab464ee
--- /dev/null
+++ b/addons/l10n_es/fiscal_templates_assoc.xml
@@ -0,0 +1,2047 @@
+<?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 IRPF 18%, 15%, 7%, 1%
+
+      Basado en fiscal_templates.xml, con los siguientes cambios:
+
+      - Se sustituyen los códigos:
+            vat_code_chart_root => vat_code_chart_assoc_root
+            l10nES_chart_template => l10nES_chart_template_assoc
+            pgc_* => pgc_assoc_*
+            iva_* => iva_assoc_*
+            re_* => re_assoc_*
+            irpf_* => irpf_assoc__*
+            fp_* => fp_assoc_*
+            fptt_* => fptt_assoc_*
+            fpat_* => fpat_assoc_*
+            irpf_sale => irpf_assoc_sale_*
+
+      Borja López Soilán (Pexego) - borjals@pexego.es (2009-09-09)
+
+        Corrección: El mapeo de cuentas de las posiciones fiscales Régimen Extracomunitario y Intracomunitario
+        no se diferenciaban entre el plan general y el plan pyme (fpat_* => fpat_assoc_*)
+
+        Añadidas posiciones fiscales Retención de IRPF 18%, 15%, 7%, 1% :
+
+       Corrección: Las nuevas posiciones fiscales de retención IRPF tenían
+        referencias incorrectas:
+            iva_* => iva_assoc_*
+            irpf_* => irpf_assoc_*
+
+        -->
+    <!-- Fiscal Position Templates -->
+        <record id="fp_assoc_nacional" model="account.fiscal.position.template">
+            <field name="name">Régimen Nacional</field>
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+        </record>
+
+        <record id="fp_assoc_recargo" model="account.fiscal.position.template">
+            <field name="name">Recargo de Equivalencia</field>
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+        </record>
+
+        <record id="fp_assoc_extra" model="account.fiscal.position.template">
+            <field name="name">Régimen Extracomunitario</field>
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+        </record>
+
+        <record id="fp_assoc_intra" model="account.fiscal.position.template">
+            <field name="name">Régimen Intracomunitario</field>
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+        </record>
+
+        <record id="fp_assoc_irpf21" model="account.fiscal.position.template">
+            <field name="name">Retención IRPF 21%</field>
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+        </record>
+
+        <record id="fp_assoc_irpf20" model="account.fiscal.position.template">
+            <field name="name">Retención IRPF 20%</field>
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+        </record>
+
+        <record id="fp_assoc_irpf19" model="account.fiscal.position.template">
+            <field name="name">Retención IRPF 19%</field>
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+        </record>
+
+        <record id="fp_assoc_irpf18" model="account.fiscal.position.template">
+            <field name="name">Retención IRPF 18%</field>
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+        </record>
+
+        <record id="fp_assoc_irpf15" model="account.fiscal.position.template">
+            <field name="name">Retención IRPF 15%</field>
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+        </record>
+
+        <record id="fp_assoc_irpf9" model="account.fiscal.position.template">
+            <field name="name">Retención IRPF 9%</field>
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+        </record>
+
+        <record id="fp_assoc_irpf7" model="account.fiscal.position.template">
+            <field name="name">Retención IRPF 7%</field>
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+        </record>
+
+        <record id="fp_assoc_irpf2" model="account.fiscal.position.template">
+            <field name="name">Retención IRPF 2%</field>
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+        </record>
+
+        <record id="fp_assoc_irpf1" model="account.fiscal.position.template">
+            <field name="name">Retención IRPF 1%</field>
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+        </record>
+
+
+    <!-- Fiscal Position Tax Templates -->
+    <!-- ************************************************************* -->
+
+    <!-- Extracomunitarios fiscal.position.tax.template-->
+
+        <record id="fptt_assoc_extra_16" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_extra"  />
+            <field name="tax_src_id" ref="iva_assoc_sop_16" />
+            <field name="tax_dest_id" ref="iva_assoc_X16_compras_bc" />
+        </record>
+        <record id="fptt_assoc_extra_16_inv" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_extra"  />
+            <field name="tax_src_id" ref="iva_assoc_sop_16_inv" />
+            <field name="tax_dest_id" ref="iva_assoc_X16_compras_bi" />
+        </record>
+        <record id="fptt_assoc_extra_18" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_extra"  />
+            <field name="tax_src_id" ref="iva_assoc_sop_18" />
+            <field name="tax_dest_id" ref="iva_assoc_X18_compras_bc" />
+        </record>
+        <record id="fptt_assoc_extra_18_inv" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_extra"  />
+            <field name="tax_src_id" ref="iva_assoc_sop_18_inv" />
+            <field name="tax_dest_id" ref="iva_assoc_X18_compras_bi" />
+        </record>
+
+        <record id="fptt_assoc_extra_7" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_extra"  />
+            <field name="tax_src_id" ref="iva_assoc_sop_7" />
+            <field name="tax_dest_id" ref="iva_assoc_X7_compras_bc" />
+        </record>
+        <record id="fptt_assoc_extra_7_inv" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_extra"  />
+            <field name="tax_src_id" ref="iva_assoc_sop_7_inv" />
+            <field name="tax_dest_id" ref="iva_assoc_X7_compras_bi" />
+        </record>
+        <record id="fptt_assoc_extra_8" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_extra"  />
+            <field name="tax_src_id" ref="iva_assoc_sop_8" />
+            <field name="tax_dest_id" ref="iva_assoc_X8_compras_bc" />
+        </record>
+        <record id="fptt_assoc_extra_8_inv" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_extra"  />
+            <field name="tax_src_id" ref="iva_assoc_sop_8_inv" />
+            <field name="tax_dest_id" ref="iva_assoc_X8_compras_bi" />
+        </record>
+
+        <record id="fptt_assoc_extra_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_extra"  />
+            <field name="tax_src_id" ref="iva_assoc_sop_10" />
+            <field name="tax_dest_id" ref="iva_assoc_X10_compras_bc" />
+        </record>
+        <record id="fptt_assoc_extra_10_inv" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_extra"  />
+            <field name="tax_src_id" ref="iva_assoc_sop_10_inv" />
+            <field name="tax_dest_id" ref="iva_assoc_X10_compras_bi" />
+        </record>
+
+         <record id="fptt_assoc_extra_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_extra"  />
+            <field name="tax_src_id" ref="iva_assoc_sop_21" />
+            <field name="tax_dest_id" ref="iva_assoc_X21_compras_bc" />
+        </record>
+        <record id="fptt_assoc_extra_21_inv" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_extra"  />
+            <field name="tax_src_id" ref="iva_assoc_sop_21_inv" />
+            <field name="tax_dest_id" ref="iva_assoc_X21_compras_bi" />
+        </record>
+        <record id="fptt_assoc_extra_4" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_extra"  />
+            <field name="tax_src_id" ref="iva_assoc_sop_4" />
+            <field name="tax_dest_id" ref="iva_assoc_X4_compras_bc" />
+        </record>
+        <record id="fptt_assoc_extra_4_inv" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_extra"  />
+            <field name="tax_src_id" ref="iva_assoc_sop_4_inv" />
+            <field name="tax_dest_id" ref="iva_assoc_X4_compras_bi" />
+        </record>
+
+        <record id="fptt_assoc_extra_ventas_4" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_extra"  />
+            <field name="tax_src_id" ref="iva_assoc_rep_4" />
+            <field name="tax_dest_id" ref="iva_assoc_X0" />
+        </record>
+
+        <record id="fptt_assoc_extra_ventas_7" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_extra"  />
+            <field name="tax_src_id" ref="iva_assoc_rep_7" />
+            <field name="tax_dest_id" ref="iva_assoc_X0" />
+        </record>
+        <record id="fptt_assoc_extra_ventas_8" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_extra"  />
+            <field name="tax_src_id" ref="iva_assoc_rep_8" />
+            <field name="tax_dest_id" ref="iva_assoc_X0" />
+        </record>
+
+        <record id="fptt_assoc_extra_ventas_16" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_extra"  />
+            <field name="tax_src_id" ref="iva_assoc_rep_16" />
+            <field name="tax_dest_id" ref="iva_assoc_X0" />
+        </record>
+        <record id="fptt_assoc_extra_ventas_18" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_extra"  />
+            <field name="tax_src_id" ref="iva_assoc_rep_18" />
+            <field name="tax_dest_id" ref="iva_assoc_X0" />
+        </record>
+
+        <record id="fptt_assoc_extra_ventas_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_extra"  />
+            <field name="tax_src_id" ref="iva_assoc_rep_10" />
+            <field name="tax_dest_id" ref="iva_assoc_X0" />
+        </record>
+
+<record id="fptt_assoc_extra_ventas_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_extra"  />
+            <field name="tax_src_id" ref="iva_assoc_rep_21" />
+            <field name="tax_dest_id" ref="iva_assoc_X0" />
+        </record>
+
+    <!-- Intracomunitarios fiscal.position.tax.template-->
+
+        <record id="fptt_assoc_intra_16" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_intra"  />
+            <field name="tax_src_id" ref="iva_assoc_sop_16" />
+            <field name="tax_dest_id" ref="iva_assoc_IC_compras_16_bc" />
+        </record>
+        <record id="fptt_assoc_intra_16_inv" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_intra"  />
+            <field name="tax_src_id" ref="iva_assoc_sop_16_inv" />
+            <field name="tax_dest_id" ref="iva_assoc_IC_compras_16_bi" />
+        </record>
+        <record id="fptt_assoc_intra_18" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_intra"  />
+            <field name="tax_src_id" ref="iva_assoc_sop_18" />
+            <field name="tax_dest_id" ref="iva_assoc_IC_compras_18_bc" />
+        </record>
+        <record id="fptt_assoc_intra_18_inv" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_intra"  />
+            <field name="tax_src_id" ref="iva_assoc_sop_18_inv" />
+            <field name="tax_dest_id" ref="iva_assoc_IC_compras_18_bi" />
+        </record>
+
+        <record id="fptt_assoc_intra_7" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_intra"  />
+            <field name="tax_src_id" ref="iva_assoc_sop_7" />
+            <field name="tax_dest_id" ref="iva_assoc_IC_compras_7_bc" />
+        </record>
+        <record id="fptt_assoc_intra_7_inv" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_intra"  />
+            <field name="tax_src_id" ref="iva_assoc_sop_7_inv" />
+            <field name="tax_dest_id" ref="iva_assoc_IC_compras_7_bi" />
+        </record>
+        <record id="fptt_assoc_intra_8" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_intra"  />
+            <field name="tax_src_id" ref="iva_assoc_sop_8" />
+            <field name="tax_dest_id" ref="iva_assoc_IC_compras_8_bc" />
+        </record>
+        <record id="fptt_assoc_intra_8_inv" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_intra"  />
+            <field name="tax_src_id" ref="iva_assoc_sop_8_inv" />
+            <field name="tax_dest_id" ref="iva_assoc_IC_compras_8_bi" />
+        </record>
+        <record id="fptt_assoc_intra_4" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_intra"  />
+            <field name="tax_src_id" ref="iva_assoc_sop_4" />
+            <field name="tax_dest_id" ref="iva_assoc_IC_compras_4_bc" />
+        </record>
+        <record id="fptt_assoc_intra_4_inv" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_intra"  />
+            <field name="tax_src_id" ref="iva_assoc_sop_4_inv" />
+            <field name="tax_dest_id" ref="iva_assoc_IC_compras_4_bi" />
+        </record>
+
+        <record id="fptt_assoc_intra_ventas_4" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_intra"  />
+            <field name="tax_src_id" ref="iva_assoc_rep_4" />
+            <field name="tax_dest_id" ref="iva_assoc_IO" />
+        </record>
+
+        <record id="fptt_assoc_intra_ventas_7" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_intra"  />
+            <field name="tax_src_id" ref="iva_assoc_rep_7" />
+            <field name="tax_dest_id" ref="iva_assoc_IO" />
+        </record>
+        <record id="fptt_assoc_intra_ventas_8" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_intra"  />
+            <field name="tax_src_id" ref="iva_assoc_rep_8" />
+            <field name="tax_dest_id" ref="iva_assoc_IO" />
+        </record>
+
+         <record id="fptt_assoc_intra_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_intra"  />
+            <field name="tax_src_id" ref="iva_assoc_sop_10" />
+            <field name="tax_dest_id" ref="iva_assoc_IC_compras_10_bc" />
+        </record>
+
+        <record id="fptt_assoc_intra_10_inv" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_intra"  />
+            <field name="tax_src_id" ref="iva_assoc_sop_10_inv" />
+            <field name="tax_dest_id" ref="iva_assoc_IC_compras_10_bi" />
+        </record>
+
+        <record id="fptt_assoc_intra_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_intra"  />
+            <field name="tax_src_id" ref="iva_assoc_sop_21" />
+            <field name="tax_dest_id" ref="iva_assoc_IC_compras_21_bc" />
+        </record>
+        <record id="fptt_assoc_intra_21_inv" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_intra"  />
+            <field name="tax_src_id" ref="iva_assoc_sop_21_inv" />
+            <field name="tax_dest_id" ref="iva_assoc_IC_compras_21_bi" />
+        </record>
+
+        <record id="fptt_assoc_intra_ventas_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_intra"  />
+            <field name="tax_src_id" ref="iva_assoc_rep_10" />
+            <field name="tax_dest_id" ref="iva_assoc_IO" />
+        </record>
+
+
+        <record id="fptt_assoc_intra_ventas_16" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_intra"  />
+            <field name="tax_src_id" ref="iva_assoc_rep_16" />
+            <field name="tax_dest_id" ref="iva_assoc_IO" />
+        </record>
+        <record id="fptt_assoc_intra_ventas_18" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_intra"  />
+            <field name="tax_src_id" ref="iva_assoc_rep_18" />
+            <field name="tax_dest_id" ref="iva_assoc_IO" />
+        </record>
+
+        <record id="fptt_assoc_intra_ventas_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_intra"  />
+            <field name="tax_src_id" ref="iva_assoc_rep_21" />
+            <field name="tax_dest_id" ref="iva_assoc_IO" />
+        </record>
+
+    <!-- Recargo de equivalencia fiscal.position.tax.template-->
+
+        <record id="fptt_assoc_recargo_16" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_recargo"  />
+            <field name="tax_src_id" ref="iva_assoc_rep_16" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_16" />
+        </record>
+
+        <record id="fptt_assoc_recargo_16_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_recargo"  />
+            <field name="tax_src_id" ref="iva_assoc_rep_16" />
+            <field name="tax_dest_id" ref="re_assoc_4" />
+        </record>
+
+        <record id="fptt_assoc_recargo_18" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_recargo"  />
+            <field name="tax_src_id" ref="iva_assoc_rep_18" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_18" />
+        </record>
+
+        <record id="fptt_assoc_recargo_18_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_recargo"  />
+            <field name="tax_src_id" ref="iva_assoc_rep_18" />
+            <field name="tax_dest_id" ref="re_assoc_4" />
+        </record>
+
+        <record id="fptt_assoc_recargo_7" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_recargo"  />
+            <field name="tax_src_id" ref="iva_assoc_rep_7" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_7" />
+        </record>
+
+        <record id="fptt_assoc_recargo_7_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_recargo"  />
+            <field name="tax_src_id" ref="iva_assoc_rep_7" />
+            <field name="tax_dest_id" ref="re_assoc_1" />
+        </record>
+
+        <record id="fptt_assoc_recargo_8" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_recargo"  />
+            <field name="tax_src_id" ref="iva_assoc_rep_8" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_8" />
+        </record>
+
+        <record id="fptt_assoc_recargo_8_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_recargo"  />
+            <field name="tax_src_id" ref="iva_assoc_rep_8" />
+            <field name="tax_dest_id" ref="re_assoc_1" />
+        </record>
+
+        <record id="fptt_assoc_recargo_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_recargo"  />
+            <field name="tax_src_id" ref="iva_assoc_rep_10" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_10" />
+        </record>
+
+        <record id="fptt_assoc_recargo_10_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_recargo"  />
+            <field name="tax_src_id" ref="iva_assoc_rep_10" />
+            <field name="tax_dest_id" ref="re_assoc_14" />
+        </record>
+
+        <record id="fptt_assoc_recargo_4" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_recargo"  />
+            <field name="tax_src_id" ref="iva_assoc_rep_4" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_4" />
+        </record>
+
+        <record id="fptt_assoc_recargo_4_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_recargo"  />
+            <field name="tax_src_id" ref="iva_assoc_rep_4" />
+            <field name="tax_dest_id" ref="re_assoc_05" />
+        </record>
+
+        <record id="fptt_assoc_recargo_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_recargo"  />
+            <field name="tax_src_id" ref="iva_assoc_rep_21" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_21" />
+        </record>
+
+        <record id="fptt_assoc_recargo_21_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_recargo"  />
+            <field name="tax_src_id" ref="iva_assoc_rep_21" />
+            <field name="tax_dest_id" ref="re_assoc_52" />
+        </record>
+
+    <!-- Extracomunitarios fiscal.position.account.template-->
+
+        <record id="fpat_assoc_extra_acc_1" model="account.fiscal.position.account.template">
+            <field name="position_id" ref="fp_assoc_extra"  />
+            <field name="account_src_id" ref="pgc_assoc_7000" />
+            <field name="account_dest_id" ref="pgc_assoc_7002" />
+        </record>
+
+        <record id="fpat_assoc_extra_acc_2" model="account.fiscal.position.account.template">
+            <field name="position_id" ref="fp_assoc_extra"  />
+            <field name="account_src_id" ref="pgc_assoc_7010" />
+            <field name="account_dest_id" ref="pgc_assoc_7012" />
+        </record>
+
+        <record id="fpat_assoc_extra_acc_3" model="account.fiscal.position.account.template">
+            <field name="position_id" ref="fp_assoc_extra"  />
+            <field name="account_src_id" ref="pgc_assoc_7020" />
+            <field name="account_dest_id" ref="pgc_assoc_7022" />
+        </record>
+
+        <record id="fpat_assoc_extra_acc_4" model="account.fiscal.position.account.template">
+            <field name="position_id" ref="fp_assoc_extra"  />
+            <field name="account_src_id" ref="pgc_assoc_7030" />
+            <field name="account_dest_id" ref="pgc_assoc_7032" />
+        </record>
+
+        <record id="fpat_assoc_extra_acc_5" model="account.fiscal.position.account.template">
+            <field name="position_id" ref="fp_assoc_extra"  />
+            <field name="account_src_id" ref="pgc_assoc_7040" />
+            <field name="account_dest_id" ref="pgc_assoc_7042" />
+        </record>
+
+        <record id="fpat_assoc_extra_acc_6" model="account.fiscal.position.account.template">
+            <field name="position_id" ref="fp_assoc_extra"  />
+            <field name="account_src_id" ref="pgc_assoc_7050" />
+            <field name="account_dest_id" ref="pgc_assoc_7052" />
+        </record>
+
+    <!-- Intracomunitarios fiscal.position.account.template-->
+
+        <record id="fpat_assoc_intra_acc_1" model="account.fiscal.position.account.template">
+            <field name="position_id" ref="fp_assoc_intra"  />
+            <field name="account_src_id" ref="pgc_assoc_7000" />
+            <field name="account_dest_id" ref="pgc_assoc_7001" />
+        </record>
+
+        <record id="fpat_assoc_intra_acc_2" model="account.fiscal.position.account.template">
+            <field name="position_id" ref="fp_assoc_intra"  />
+            <field name="account_src_id" ref="pgc_assoc_7010" />
+            <field name="account_dest_id" ref="pgc_assoc_7011" />
+        </record>
+
+        <record id="fpat_assoc_intra_acc_3" model="account.fiscal.position.account.template">
+            <field name="position_id" ref="fp_assoc_intra"  />
+            <field name="account_src_id" ref="pgc_assoc_7020" />
+            <field name="account_dest_id" ref="pgc_assoc_7021" />
+        </record>
+
+        <record id="fpat_assoc_intra_acc_4" model="account.fiscal.position.account.template">
+            <field name="position_id" ref="fp_assoc_intra"  />
+            <field name="account_src_id" ref="pgc_assoc_7030" />
+            <field name="account_dest_id" ref="pgc_assoc_7031" />
+        </record>
+
+        <record id="fpat_assoc_intra_acc_5" model="account.fiscal.position.account.template">
+            <field name="position_id" ref="fp_assoc_intra"  />
+            <field name="account_src_id" ref="pgc_assoc_7040" />
+            <field name="account_dest_id" ref="pgc_assoc_7041" />
+        </record>
+
+        <record id="fpat_assoc_intra_acc_6" model="account.fiscal.position.account.template">
+            <field name="position_id" ref="fp_assoc_intra"  />
+            <field name="account_src_id" ref="pgc_assoc_7050" />
+            <field name="account_dest_id" ref="pgc_assoc_7051" />
+        </record>
+
+<!-- Retenciones IRPF 21% fiscal.position.tax.template-->
+
+        <record id="fptt_assoc_irpf21sale_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf21" />
+            <field name="tax_src_id" ref="iva_assoc_rep_21" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_21" />
+        </record>
+
+        <record id="fptt_assoc_irpf21sale_21_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf21" />
+            <field name="tax_src_id" ref="iva_assoc_rep_21" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_21" />
+        </record>
+
+        <record id="fptt_assoc_irpf21sale_18" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf21" />
+            <field name="tax_src_id" ref="iva_assoc_rep_18" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_18" />
+        </record>
+
+        <record id="fptt_assoc_irpf21sale_18_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf21" />
+            <field name="tax_src_id" ref="iva_assoc_rep_18" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_21" />
+        </record>
+
+        <record id="fptt_assoc_irpf21sale_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf21" />
+            <field name="tax_src_id" ref="iva_assoc_rep_10" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_10" />
+        </record>
+
+        <record id="fptt_assoc_irpf21sale_10_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf21" />
+            <field name="tax_src_id" ref="iva_assoc_rep_10" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_21" />
+        </record>
+
+        <record id="fptt_assoc_irpf21sale_8" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf21" />
+            <field name="tax_src_id" ref="iva_assoc_rep_8" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_8" />
+        </record>
+
+        <record id="fptt_assoc_irpf21sale_8_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf21" />
+            <field name="tax_src_id" ref="iva_assoc_rep_8" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_21" />
+        </record>
+
+        <record id="fptt_assoc_irpf21sale_4" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf21" />
+            <field name="tax_src_id" ref="iva_assoc_rep_4" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_4" />
+        </record>
+
+        <record id="fptt_assoc_irpf21sale_4_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf21" />
+            <field name="tax_src_id" ref="iva_assoc_rep_4" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_21" />
+        </record>
+
+        <record id="fptt_assoc_irpf21_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf21" />
+            <field name="tax_src_id" ref="iva_assoc_sop_21" />
+            <field name="tax_dest_id" ref="iva_assoc_sop_21" />
+        </record>
+
+        <record id="fptt_assoc_irpf21_21_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf21" />
+            <field name="tax_src_id" ref="iva_assoc_sop_21" />
+            <field name="tax_dest_id" ref="irpf_assoc_21" />
+        </record>
+
+        <record id="fptt_assoc_irpf21_18" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf21" />
+            <field name="tax_src_id" ref="iva_assoc_sop_18" />
+            <field name="tax_dest_id" ref="iva_assoc_sop_18" />
+        </record>
+
+        <record id="fptt_assoc_irpf21_18_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf21" />
+            <field name="tax_src_id" ref="iva_assoc_sop_18" />
+            <field name="tax_dest_id" ref="irpf_assoc_21" />
+        </record>
+
+        <record id="fptt_assoc_irpf21_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf21" />
+            <field name="tax_src_id" ref="iva_assoc_sop_10" />
+            <field name="tax_dest_id" ref="iva_assoc_sop_10" />
+        </record>
+
+        <record id="fptt_assoc_irpf21_10_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf21" />
+            <field name="tax_src_id" ref="iva_assoc_sop_10" />
+            <field name="tax_dest_id" ref="irpf_assoc_21" />
+        </record>
+
+        <record id="fptt_assoc_irpf21_8" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf21" />
+            <field name="tax_src_id" ref="iva_assoc_sop_8" />
+            <field name="tax_dest_id" ref="iva_assoc_sop_8" />
+        </record>
+
+        <record id="fptt_assoc_irpf21_8_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf21" />
+            <field name="tax_src_id" ref="iva_assoc_sop_8" />
+            <field name="tax_dest_id" ref="irpf_assoc_21" />
+        </record>
+
+        <record id="fptt_assoc_irpf21_4" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf21" />
+            <field name="tax_src_id" ref="iva_assoc_sop_4" />
+            <field name="tax_dest_id" ref="iva_assoc_sop_4" />
+        </record>
+
+        <record id="fptt_assoc_irpf21_4_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf21" />
+            <field name="tax_src_id" ref="iva_assoc_sop_4" />
+            <field name="tax_dest_id" ref="irpf_assoc_21" />
+        </record>
+
+        <!-- Retenciones IRPF 20% fiscal.position.tax.template-->
+
+        <record id="fptt_assoc_irpf20sale_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf20" />
+            <field name="tax_src_id" ref="iva_assoc_rep_21" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_21" />
+        </record>
+
+        <record id="fptt_assoc_irpf20sale_21_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf20" />
+            <field name="tax_src_id" ref="iva_assoc_rep_21" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_20" />
+        </record>
+
+         <record id="fptt_assoc_irpf20sale_18" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf20" />
+            <field name="tax_src_id" ref="iva_assoc_rep_18" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_18" />
+        </record>
+
+        <record id="fptt_assoc_irpf20sale_18_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf20" />
+            <field name="tax_src_id" ref="iva_assoc_rep_18" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_20" />
+        </record>
+
+        <record id="fptt_assoc_irpf20sale_16" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf20" />
+            <field name="tax_src_id" ref="iva_assoc_rep_16" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_16" />
+        </record>
+
+        <record id="fptt_assoc_irpf20sale_16_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf20" />
+            <field name="tax_src_id" ref="iva_assoc_rep_16" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_20" />
+        </record>
+
+        <record id="fptt_assoc_irpf20sale_8" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf20" />
+            <field name="tax_src_id" ref="iva_assoc_rep_8" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_8" />
+        </record>
+
+        <record id="fptt_assoc_irpf20sale_8_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf20" />
+            <field name="tax_src_id" ref="iva_assoc_rep_8" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_20" />
+        </record>
+
+        <record id="fptt_assoc_irpf20sale_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf20" />
+            <field name="tax_src_id" ref="iva_assoc_rep_10" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_10" />
+        </record>
+
+        <record id="fptt_assoc_irpf20sale_10_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf20" />
+            <field name="tax_src_id" ref="iva_assoc_rep_10" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_20" />
+        </record>
+
+        <record id="fptt_assoc_irpf20sale_7" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf20" />
+            <field name="tax_src_id" ref="iva_assoc_rep_7" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_7" />
+        </record>
+
+        <record id="fptt_assoc_irpf20sale_7_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf20" />
+            <field name="tax_src_id" ref="iva_assoc_rep_7" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_20" />
+        </record>
+
+        <record id="fptt_assoc_irpf20sale_4" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf20" />
+            <field name="tax_src_id" ref="iva_assoc_rep_4" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_4" />
+        </record>
+
+        <record id="fptt_assoc_irpf20sale_4_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf20" />
+            <field name="tax_src_id" ref="iva_assoc_rep_4" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_20" />
+        </record>
+
+        <record id="fptt_assoc_irpf20_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf20" />
+            <field name="tax_src_id" ref="iva_assoc_sop_21" />
+            <field name="tax_dest_id" ref="iva_assoc_sop_21" />
+        </record>
+
+        <record id="fptt_assoc_irpf20_21_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf20" />
+            <field name="tax_src_id" ref="iva_assoc_sop_21" />
+            <field name="tax_dest_id" ref="irpf_assoc_20" />
+        </record>
+
+        <record id="fptt_assoc_irpf20_18" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf20" />
+            <field name="tax_src_id" ref="iva_assoc_sop_18" />
+            <field name="tax_dest_id" ref="iva_assoc_sop_18" />
+        </record>
+
+        <record id="fptt_assoc_irpf20_18_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf20" />
+            <field name="tax_src_id" ref="iva_assoc_sop_18" />
+            <field name="tax_dest_id" ref="irpf_assoc_20" />
+        </record>
+
+        <record id="fptt_assoc_irpf20_16" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf20" />
+            <field name="tax_src_id" ref="iva_assoc_sop_16" />
+            <field name="tax_dest_id" ref="iva_assoc_sop_16" />
+        </record>
+
+        <record id="fptt_assoc_irpf20_16_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf20" />
+            <field name="tax_src_id" ref="iva_assoc_sop_16" />
+            <field name="tax_dest_id" ref="irpf_assoc_20" />
+        </record>
+
+        <record id="fptt_assoc_irpf20_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf20" />
+            <field name="tax_src_id" ref="iva_assoc_sop_10" />
+            <field name="tax_dest_id" ref="iva_assoc_sop_10" />
+        </record>
+
+        <record id="fptt_assoc_irpf20_10_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf20" />
+            <field name="tax_src_id" ref="iva_assoc_sop_10" />
+            <field name="tax_dest_id" ref="irpf_assoc_20" />
+        </record>
+
+        <record id="fptt_assoc_irpf20_8" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf20" />
+            <field name="tax_src_id" ref="iva_assoc_sop_8" />
+            <field name="tax_dest_id" ref="iva_assoc_sop_8" />
+        </record>
+
+        <record id="fptt_assoc_irpf20_8_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf20" />
+            <field name="tax_src_id" ref="iva_assoc_sop_8" />
+            <field name="tax_dest_id" ref="irpf_assoc_20" />
+        </record>
+
+        <record id="fptt_assoc_irpf20_7" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf20" />
+            <field name="tax_src_id" ref="iva_assoc_sop_7" />
+            <field name="tax_dest_id" ref="iva_assoc_sop_7" />
+        </record>
+
+        <record id="fptt_assoc_irpf20_7_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf20" />
+            <field name="tax_src_id" ref="iva_assoc_sop_7" />
+            <field name="tax_dest_id" ref="irpf_assoc_20" />
+        </record>
+
+        <record id="fptt_assoc_irpf20_4" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf20" />
+            <field name="tax_src_id" ref="iva_assoc_sop_4" />
+            <field name="tax_dest_id" ref="iva_assoc_sop_4" />
+        </record>
+
+        <record id="fptt_assoc_irpf20_4_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf20" />
+            <field name="tax_src_id" ref="iva_assoc_sop_4" />
+            <field name="tax_dest_id" ref="irpf_assoc_20" />
+        </record>
+
+
+        <!-- Retenciones IRPF 19% fiscal.position.tax.template-->
+
+        <record id="fptt_assoc_irpf19sale_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf19" />
+            <field name="tax_src_id" ref="iva_assoc_rep_21" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_21" />
+        </record>
+
+        <record id="fptt_assoc_irpf19sale_21_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf19" />
+            <field name="tax_src_id" ref="iva_assoc_rep_21" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_19" />
+        </record>
+
+        <record id="fptt_assoc_irpf19sale_18" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf19" />
+            <field name="tax_src_id" ref="iva_assoc_rep_18" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_18" />
+        </record>
+
+        <record id="fptt_assoc_irpf19sale_18_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf19" />
+            <field name="tax_src_id" ref="iva_assoc_rep_18" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_19" />
+        </record>
+
+        <record id="fptt_assoc_irpf19sale_16" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf19" />
+            <field name="tax_src_id" ref="iva_assoc_rep_16" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_16" />
+        </record>
+
+        <record id="fptt_assoc_irpf19sale_16_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf19" />
+            <field name="tax_src_id" ref="iva_assoc_rep_16" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_19" />
+        </record>
+
+         <record id="fptt_assoc_irpf19sale_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf19" />
+            <field name="tax_src_id" ref="iva_assoc_rep_10" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_10" />
+        </record>
+
+        <record id="fptt_assoc_irpf19sale_10_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf19" />
+            <field name="tax_src_id" ref="iva_assoc_rep_10" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_19" />
+        </record>
+
+        <record id="fptt_assoc_irpf19sale_8" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf19" />
+            <field name="tax_src_id" ref="iva_assoc_rep_8" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_8" />
+        </record>
+
+        <record id="fptt_assoc_irpf19sale_8_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf19" />
+            <field name="tax_src_id" ref="iva_assoc_rep_8" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_19" />
+        </record>
+
+        <record id="fptt_assoc_irpf19sale_7" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf19" />
+            <field name="tax_src_id" ref="iva_assoc_rep_7" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_7" />
+        </record>
+
+        <record id="fptt_assoc_irpf19sale_7_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf19" />
+            <field name="tax_src_id" ref="iva_assoc_rep_7" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_19" />
+        </record>
+
+        <record id="fptt_assoc_irpf19sale_4" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf19" />
+            <field name="tax_src_id" ref="iva_assoc_rep_4" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_4" />
+        </record>
+
+        <record id="fptt_assoc_irpf19sale_4_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf19" />
+            <field name="tax_src_id" ref="iva_assoc_rep_4" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_19" />
+        </record>
+
+        <record id="fptt_assoc_irpf19_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf19" />
+            <field name="tax_src_id" ref="iva_assoc_sop_21" />
+            <field name="tax_dest_id" ref="iva_assoc_sop_21" />
+        </record>
+
+        <record id="fptt_assoc_irpf19_21_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf19" />
+            <field name="tax_src_id" ref="iva_assoc_sop_21" />
+            <field name="tax_dest_id" ref="irpf_assoc_19" />
+        </record>
+
+        <record id="fptt_assoc_irpf19_18" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf19" />
+            <field name="tax_src_id" ref="iva_assoc_sop_18" />
+            <field name="tax_dest_id" ref="iva_assoc_sop_18" />
+        </record>
+
+        <record id="fptt_assoc_irpf19_18_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf19" />
+            <field name="tax_src_id" ref="iva_assoc_sop_18" />
+            <field name="tax_dest_id" ref="irpf_assoc_19" />
+        </record>
+
+         <record id="fptt_assoc_irpf19_16" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf19" />
+            <field name="tax_src_id" ref="iva_assoc_sop_16" />
+            <field name="tax_dest_id" ref="iva_assoc_sop_16" />
+        </record>
+
+        <record id="fptt_assoc_irpf19_16_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf19" />
+            <field name="tax_src_id" ref="iva_assoc_sop_16" />
+            <field name="tax_dest_id" ref="irpf_assoc_19" />
+        </record>
+
+        <record id="fptt_assoc_irpf19_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf19" />
+            <field name="tax_src_id" ref="iva_assoc_sop_10" />
+            <field name="tax_dest_id" ref="iva_assoc_sop_10" />
+        </record>
+
+        <record id="fptt_assoc_irpf19_10_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf19" />
+            <field name="tax_src_id" ref="iva_assoc_sop_10" />
+            <field name="tax_dest_id" ref="irpf_assoc_19" />
+        </record>
+
+        <record id="fptt_assoc_irpf19_8" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf19" />
+            <field name="tax_src_id" ref="iva_assoc_sop_8" />
+            <field name="tax_dest_id" ref="iva_assoc_sop_8" />
+        </record>
+
+        <record id="fptt_assoc_irpf19_8_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf19" />
+            <field name="tax_src_id" ref="iva_assoc_sop_8" />
+            <field name="tax_dest_id" ref="irpf_assoc_19" />
+        </record>
+
+        <record id="fptt_assoc_irpf19_7" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf19" />
+            <field name="tax_src_id" ref="iva_assoc_sop_7" />
+            <field name="tax_dest_id" ref="iva_assoc_sop_7" />
+        </record>
+
+        <record id="fptt_assoc_irpf19_7_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf19" />
+            <field name="tax_src_id" ref="iva_assoc_sop_7" />
+            <field name="tax_dest_id" ref="irpf_assoc_19" />
+        </record>
+
+        <record id="fptt_assoc_irpf19_4" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf19" />
+            <field name="tax_src_id" ref="iva_assoc_sop_4" />
+            <field name="tax_dest_id" ref="iva_assoc_sop_4" />
+        </record>
+
+        <record id="fptt_assoc_irpf19_4_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf19" />
+            <field name="tax_src_id" ref="iva_assoc_sop_4" />
+            <field name="tax_dest_id" ref="irpf_assoc_19" />
+        </record>
+
+    <!-- Retenciones IRPF 18% fiscal.position.tax.template-->
+
+        <record id="fptt_assoc_irpf18sale_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf18" />
+            <field name="tax_src_id" ref="iva_assoc_rep_21" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_21" />
+        </record>
+
+        <record id="fptt_assoc_irpf18sale_21_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf18" />
+            <field name="tax_src_id" ref="iva_assoc_rep_21" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_18" />
+        </record>
+
+        <record id="fptt_assoc_irpf18sale_18" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf18" />
+            <field name="tax_src_id" ref="iva_assoc_rep_18" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_18" />
+        </record>
+
+        <record id="fptt_assoc_irpf18sale_18_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf18" />
+            <field name="tax_src_id" ref="iva_assoc_rep_18" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_18" />
+        </record>
+
+        <record id="fptt_assoc_irpf18sale_16" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf18" />
+            <field name="tax_src_id" ref="iva_assoc_rep_16" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_16" />
+        </record>
+
+        <record id="fptt_assoc_irpf18sale_16_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf18" />
+            <field name="tax_src_id" ref="iva_assoc_rep_16" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_18" />
+        </record>
+
+        <record id="fptt_assoc_irpf18sale_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf18" />
+            <field name="tax_src_id" ref="iva_assoc_rep_10" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_10" />
+        </record>
+
+        <record id="fptt_assoc_irpf18sale_10_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf18" />
+            <field name="tax_src_id" ref="iva_assoc_rep_10" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_18" />
+        </record>
+
+        <record id="fptt_assoc_irpf18sale_8" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf18" />
+            <field name="tax_src_id" ref="iva_assoc_rep_8" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_8" />
+        </record>
+
+        <record id="fptt_assoc_irpf18sale_8_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf18" />
+            <field name="tax_src_id" ref="iva_assoc_rep_8" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_18" />
+        </record>
+
+        <record id="fptt_assoc_irpf18sale_7" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf18" />
+            <field name="tax_src_id" ref="iva_assoc_rep_7" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_7" />
+        </record>
+
+        <record id="fptt_assoc_irpf18sale_7_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf18" />
+            <field name="tax_src_id" ref="iva_assoc_rep_7" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_18" />
+        </record>
+
+        <record id="fptt_assoc_irpf18sale_4" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf18" />
+            <field name="tax_src_id" ref="iva_assoc_rep_4" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_4" />
+        </record>
+
+        <record id="fptt_assoc_irpf18sale_4_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf18" />
+            <field name="tax_src_id" ref="iva_assoc_rep_4" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_18" />
+        </record>
+
+         <record id="fptt_assoc_irpf18_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf18" />
+            <field name="tax_src_id" ref="iva_assoc_sop_21" />
+            <field name="tax_dest_id" ref="iva_assoc_sop_21" />
+        </record>
+
+        <record id="fptt_assoc_irpf18_21_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf18" />
+            <field name="tax_src_id" ref="iva_assoc_sop_21" />
+            <field name="tax_dest_id" ref="irpf_assoc_18" />
+        </record>
+
+        <record id="fptt_assoc_irpf18_18" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf18" />
+            <field name="tax_src_id" ref="iva_assoc_sop_18" />
+            <field name="tax_dest_id" ref="iva_assoc_sop_18" />
+        </record>
+
+        <record id="fptt_assoc_irpf18_18_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf18" />
+            <field name="tax_src_id" ref="iva_assoc_sop_18" />
+            <field name="tax_dest_id" ref="irpf_assoc_18" />
+        </record>
+
+        <record id="fptt_assoc_irpf18_16" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf18" />
+            <field name="tax_src_id" ref="iva_assoc_sop_16" />
+            <field name="tax_dest_id" ref="iva_assoc_sop_16" />
+        </record>
+
+        <record id="fptt_assoc_irpf18_16_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf18" />
+            <field name="tax_src_id" ref="iva_assoc_sop_16" />
+            <field name="tax_dest_id" ref="irpf_assoc_18" />
+        </record>
+
+        <record id="fptt_assoc_irpf18_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf18" />
+            <field name="tax_src_id" ref="iva_assoc_sop_10" />
+            <field name="tax_dest_id" ref="iva_assoc_sop_10" />
+        </record>
+
+        <record id="fptt_assoc_irpf18_8_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf18" />
+            <field name="tax_src_id" ref="iva_assoc_sop_10" />
+            <field name="tax_dest_id" ref="irpf_assoc_18" />
+        </record>
+
+        <record id="fptt_assoc_irpf18_8" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf18" />
+            <field name="tax_src_id" ref="iva_assoc_sop_8" />
+            <field name="tax_dest_id" ref="iva_assoc_sop_8" />
+        </record>
+
+        <record id="fptt_assoc_irpf18_8_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf18" />
+            <field name="tax_src_id" ref="iva_assoc_sop_8" />
+            <field name="tax_dest_id" ref="irpf_assoc_18" />
+        </record>
+
+        <record id="fptt_assoc_irpf18_7" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf18" />
+            <field name="tax_src_id" ref="iva_assoc_sop_7" />
+            <field name="tax_dest_id" ref="iva_assoc_sop_7" />
+        </record>
+
+        <record id="fptt_assoc_irpf18_7_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf18" />
+            <field name="tax_src_id" ref="iva_assoc_sop_7" />
+            <field name="tax_dest_id" ref="irpf_assoc_18" />
+        </record>
+
+        <record id="fptt_assoc_irpf18_4" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf18" />
+            <field name="tax_src_id" ref="iva_assoc_sop_4" />
+            <field name="tax_dest_id" ref="iva_assoc_sop_4" />
+        </record>
+
+        <record id="fptt_assoc_irpf18_4_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf18" />
+            <field name="tax_src_id" ref="iva_assoc_sop_4" />
+            <field name="tax_dest_id" ref="irpf_assoc_18" />
+        </record>
+
+    <!-- Retenciones IRPF 15% fiscal.position.tax.template-->
+
+        <record id="fptt_assoc_irpf15sale_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf15" />
+            <field name="tax_src_id" ref="iva_assoc_rep_21" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_21" />
+        </record>
+
+        <record id="fptt_assoc_irpf15sale_21_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf15" />
+            <field name="tax_src_id" ref="iva_assoc_rep_21" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_15" />
+        </record>
+
+        <record id="fptt_assoc_irpf15sale_18" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf15" />
+            <field name="tax_src_id" ref="iva_assoc_rep_18" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_18" />
+        </record>
+
+        <record id="fptt_assoc_irpf15sale_18_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf15" />
+            <field name="tax_src_id" ref="iva_assoc_rep_18" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_15" />
+        </record>
+
+        <record id="fptt_assoc_irpf15sale_16" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf15" />
+            <field name="tax_src_id" ref="iva_assoc_rep_16" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_16" />
+        </record>
+
+        <record id="fptt_assoc_irpf15sale_16_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf15" />
+            <field name="tax_src_id" ref="iva_assoc_rep_16" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_15" />
+        </record>
+
+        <record id="fptt_assoc_irpf15sale_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf15" />
+            <field name="tax_src_id" ref="iva_assoc_rep_10" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_10" />
+        </record>
+
+        <record id="fptt_assoc_irpf15sale_10_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf15" />
+            <field name="tax_src_id" ref="iva_assoc_rep_10" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_15" />
+        </record>
+
+        <record id="fptt_assoc_irpf15sale_8" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf15" />
+            <field name="tax_src_id" ref="iva_assoc_rep_8" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_8" />
+        </record>
+
+        <record id="fptt_assoc_irpf15sale_8_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf15" />
+            <field name="tax_src_id" ref="iva_assoc_rep_8" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_15" />
+        </record>
+
+        <record id="fptt_assoc_irpf15sale_7" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf15" />
+            <field name="tax_src_id" ref="iva_assoc_rep_7" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_7" />
+        </record>
+
+        <record id="fptt_assoc_irpf15sale_7_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf15" />
+            <field name="tax_src_id" ref="iva_assoc_rep_7" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_15" />
+        </record>
+
+        <record id="fptt_assoc_irpf15sale_4" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf15" />
+            <field name="tax_src_id" ref="iva_assoc_rep_4" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_4" />
+        </record>
+
+        <record id="fptt_assoc_irpf15sale_4_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf15" />
+            <field name="tax_src_id" ref="iva_assoc_rep_4" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_15" />
+        </record>
+
+        <record id="fptt_assoc_irpf15_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf15" />
+            <field name="tax_src_id" ref="iva_assoc_sop_21" />
+            <field name="tax_dest_id" ref="iva_assoc_sop_21" />
+        </record>
+
+        <record id="fptt_assoc_irpf15_21_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf15" />
+            <field name="tax_src_id" ref="iva_assoc_sop_21" />
+            <field name="tax_dest_id" ref="irpf_assoc_15" />
+        </record>
+
+        <record id="fptt_assoc_irpf15_18" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf15" />
+            <field name="tax_src_id" ref="iva_assoc_sop_18" />
+            <field name="tax_dest_id" ref="iva_assoc_sop_18" />
+        </record>
+
+        <record id="fptt_assoc_irpf15_18_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf15" />
+            <field name="tax_src_id" ref="iva_assoc_sop_18" />
+            <field name="tax_dest_id" ref="irpf_assoc_15" />
+        </record>
+
+        <record id="fptt_assoc_irpf15_16" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf15" />
+            <field name="tax_src_id" ref="iva_assoc_sop_16" />
+            <field name="tax_dest_id" ref="iva_assoc_sop_16" />
+        </record>
+
+        <record id="fptt_assoc_irpf15_16_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf15" />
+            <field name="tax_src_id" ref="iva_assoc_sop_16" />
+            <field name="tax_dest_id" ref="irpf_assoc_15" />
+        </record>
+
+        <record id="fptt_assoc_irpf15_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf15" />
+            <field name="tax_src_id" ref="iva_assoc_sop_10" />
+            <field name="tax_dest_id" ref="iva_assoc_sop_10" />
+        </record>
+
+        <record id="fptt_assoc_irpf15_10_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf15" />
+            <field name="tax_src_id" ref="iva_assoc_sop_10" />
+            <field name="tax_dest_id" ref="irpf_assoc_15" />
+        </record>
+
+        <record id="fptt_assoc_irpf15_8" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf15" />
+            <field name="tax_src_id" ref="iva_assoc_sop_8" />
+            <field name="tax_dest_id" ref="iva_assoc_sop_8" />
+        </record>
+
+        <record id="fptt_assoc_irpf15_8_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf15" />
+            <field name="tax_src_id" ref="iva_assoc_sop_8" />
+            <field name="tax_dest_id" ref="irpf_assoc_15" />
+        </record>
+
+        <record id="fptt_assoc_irpf15_7" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf15" />
+            <field name="tax_src_id" ref="iva_assoc_sop_7" />
+            <field name="tax_dest_id" ref="iva_assoc_sop_7" />
+        </record>
+
+        <record id="fptt_assoc_irpf15_7_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf15" />
+            <field name="tax_src_id" ref="iva_assoc_sop_7" />
+            <field name="tax_dest_id" ref="irpf_assoc_15" />
+        </record>
+
+        <record id="fptt_assoc_irpf15_4" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf15" />
+            <field name="tax_src_id" ref="iva_assoc_sop_4" />
+            <field name="tax_dest_id" ref="iva_assoc_sop_4" />
+        </record>
+
+        <record id="fptt_assoc_irpf15_4_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf15" />
+            <field name="tax_src_id" ref="iva_assoc_sop_4" />
+            <field name="tax_dest_id" ref="irpf_assoc_15" />
+        </record>
+
+    <!-- Retenciones IRPF 9% fiscal.position.tax.template-->
+
+        <record id="fptt_assoc_irpf9sale_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf9" />
+            <field name="tax_src_id" ref="iva_assoc_rep_21" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_21" />
+        </record>
+
+        <record id="fptt_assoc_irpf9sale_21_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf9" />
+            <field name="tax_src_id" ref="iva_assoc_rep_21" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_9" />
+        </record>
+
+        <record id="fptt_assoc_irpf9sale_18" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf9" />
+            <field name="tax_src_id" ref="iva_assoc_rep_18" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_18" />
+        </record>
+
+        <record id="fptt_assoc_irpf9sale_18_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf9" />
+            <field name="tax_src_id" ref="iva_assoc_rep_18" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_9" />
+        </record>
+
+        <record id="fptt_assoc_irpf9sale_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf9" />
+            <field name="tax_src_id" ref="iva_assoc_rep_10" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_10" />
+        </record>
+
+        <record id="fptt_assoc_irpf9sale_10_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf9" />
+            <field name="tax_src_id" ref="iva_assoc_rep_10" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_9" />
+        </record>
+
+        <record id="fptt_assoc_irpf9sale_8" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf9" />
+            <field name="tax_src_id" ref="iva_assoc_rep_8" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_8" />
+        </record>
+
+        <record id="fptt_assoc_irpf9sale_8_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf9" />
+            <field name="tax_src_id" ref="iva_assoc_rep_8" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_9" />
+        </record>
+
+        <record id="fptt_assoc_irpf9sale_4" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf9" />
+            <field name="tax_src_id" ref="iva_assoc_rep_4" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_4" />
+        </record>
+
+        <record id="fptt_assoc_irpf9sale_4_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf9" />
+            <field name="tax_src_id" ref="iva_assoc_rep_4" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_9" />
+        </record>
+
+        <record id="fptt_assoc_irpf9_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf9" />
+            <field name="tax_src_id" ref="iva_assoc_sop_21" />
+            <field name="tax_dest_id" ref="iva_assoc_sop_21" />
+        </record>
+
+        <record id="fptt_assoc_irpf9_21_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf9" />
+            <field name="tax_src_id" ref="iva_assoc_sop_21" />
+            <field name="tax_dest_id" ref="irpf_assoc_9" />
+        </record>
+
+        <record id="fptt_assoc_irpf9_18" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf9" />
+            <field name="tax_src_id" ref="iva_assoc_sop_18" />
+            <field name="tax_dest_id" ref="iva_assoc_sop_18" />
+        </record>
+
+        <record id="fptt_assoc_irpf9_18_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf9" />
+            <field name="tax_src_id" ref="iva_assoc_sop_18" />
+            <field name="tax_dest_id" ref="irpf_assoc_9" />
+        </record>
+
+         <record id="fptt_assoc_irpf9_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf9" />
+            <field name="tax_src_id" ref="iva_assoc_sop_10" />
+            <field name="tax_dest_id" ref="iva_assoc_sop_10" />
+        </record>
+
+        <record id="fptt_assoc_irpf9_10_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf9" />
+            <field name="tax_src_id" ref="iva_assoc_sop_10" />
+            <field name="tax_dest_id" ref="irpf_assoc_9" />
+        </record>
+
+        <record id="fptt_assoc_irpf9_8" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf9" />
+            <field name="tax_src_id" ref="iva_assoc_sop_8" />
+            <field name="tax_dest_id" ref="iva_assoc_sop_8" />
+        </record>
+
+        <record id="fptt_assoc_irpf9_8_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf9" />
+            <field name="tax_src_id" ref="iva_assoc_sop_8" />
+            <field name="tax_dest_id" ref="irpf_assoc_9" />
+        </record>
+
+        <record id="fptt_assoc_irpf9_4" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf9" />
+            <field name="tax_src_id" ref="iva_assoc_sop_4" />
+            <field name="tax_dest_id" ref="iva_assoc_sop_4" />
+        </record>
+
+        <record id="fptt_assoc_irpf9_4_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf9" />
+            <field name="tax_src_id" ref="iva_assoc_sop_4" />
+            <field name="tax_dest_id" ref="irpf_assoc_9" />
+        </record>
+
+    <!-- Retenciones IRPF 7% fiscal.position.tax.template-->
+
+        <record id="fptt_assoc_irpf7sale_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf7" />
+            <field name="tax_src_id" ref="iva_assoc_rep_21" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_21" />
+        </record>
+
+        <record id="fptt_assoc_irpf7sale_21_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf7" />
+            <field name="tax_src_id" ref="iva_assoc_rep_21" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_7" />
+        </record>
+
+        <record id="fptt_assoc_irpf7sale_18" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf7" />
+            <field name="tax_src_id" ref="iva_assoc_rep_18" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_18" />
+        </record>
+
+        <record id="fptt_assoc_irpf7sale_18_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf7" />
+            <field name="tax_src_id" ref="iva_assoc_rep_18" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_7" />
+        </record>
+
+        <record id="fptt_assoc_irpf7sale_16" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf7" />
+            <field name="tax_src_id" ref="iva_assoc_rep_16" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_16" />
+        </record>
+
+        <record id="fptt_assoc_irpf7sale_16_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf7" />
+            <field name="tax_src_id" ref="iva_assoc_rep_16" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_7" />
+        </record>
+
+        <record id="fptt_assoc_irpf7sale_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf7" />
+            <field name="tax_src_id" ref="iva_assoc_rep_10" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_10" />
+        </record>
+
+        <record id="fptt_assoc_irpf7sale_10_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf7" />
+            <field name="tax_src_id" ref="iva_assoc_rep_10" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_7" />
+        </record>
+
+        <record id="fptt_assoc_irpf7sale_8" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf7" />
+            <field name="tax_src_id" ref="iva_assoc_rep_8" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_8" />
+        </record>
+
+        <record id="fptt_assoc_irpf7sale_8_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf7" />
+            <field name="tax_src_id" ref="iva_assoc_rep_8" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_7" />
+        </record>
+
+        <record id="fptt_assoc_irpf7sale_7" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf7" />
+            <field name="tax_src_id" ref="iva_assoc_rep_7" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_7" />
+        </record>
+
+        <record id="fptt_assoc_irpf7sale_7_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf7" />
+            <field name="tax_src_id" ref="iva_assoc_rep_7" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_7" />
+        </record>
+
+        <record id="fptt_assoc_irpf7sale_4" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf7" />
+            <field name="tax_src_id" ref="iva_assoc_rep_4" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_4" />
+        </record>
+
+        <record id="fptt_assoc_irpf7sale_4_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf7" />
+            <field name="tax_src_id" ref="iva_assoc_rep_4" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_7" />
+        </record>
+
+        <record id="fptt_assoc_irpf7_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf7" />
+            <field name="tax_src_id" ref="iva_assoc_sop_21" />
+            <field name="tax_dest_id" ref="iva_assoc_sop_21" />
+        </record>
+
+        <record id="fptt_assoc_irpf7_21_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf7" />
+            <field name="tax_src_id" ref="iva_assoc_sop_21" />
+            <field name="tax_dest_id" ref="irpf_assoc_7" />
+        </record>
+
+        <record id="fptt_assoc_irpf7_18" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf7" />
+            <field name="tax_src_id" ref="iva_assoc_sop_18" />
+            <field name="tax_dest_id" ref="iva_assoc_sop_18" />
+        </record>
+
+        <record id="fptt_assoc_irpf7_18_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf7" />
+            <field name="tax_src_id" ref="iva_assoc_sop_18" />
+            <field name="tax_dest_id" ref="irpf_assoc_7" />
+        </record>
+
+        <record id="fptt_assoc_irpf7_16" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf7" />
+            <field name="tax_src_id" ref="iva_assoc_sop_16" />
+            <field name="tax_dest_id" ref="iva_assoc_sop_16" />
+        </record>
+
+        <record id="fptt_assoc_irpf7_16_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf7" />
+            <field name="tax_src_id" ref="iva_assoc_sop_16" />
+            <field name="tax_dest_id" ref="irpf_assoc_7" />
+        </record>
+
+         <record id="fptt_assoc_irpf7_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf7" />
+            <field name="tax_src_id" ref="iva_assoc_sop_10" />
+            <field name="tax_dest_id" ref="iva_assoc_sop_10" />
+        </record>
+
+        <record id="fptt_assoc_irpf7_10_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf7" />
+            <field name="tax_src_id" ref="iva_assoc_sop_10" />
+            <field name="tax_dest_id" ref="irpf_assoc_7" />
+        </record>
+
+        <record id="fptt_assoc_irpf7_8" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf7" />
+            <field name="tax_src_id" ref="iva_assoc_sop_8" />
+            <field name="tax_dest_id" ref="iva_assoc_sop_8" />
+        </record>
+
+        <record id="fptt_assoc_irpf7_8_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf7" />
+            <field name="tax_src_id" ref="iva_assoc_sop_8" />
+            <field name="tax_dest_id" ref="irpf_assoc_7" />
+        </record>
+
+
+        <record id="fptt_assoc_irpf7_7" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf7" />
+            <field name="tax_src_id" ref="iva_assoc_sop_7" />
+            <field name="tax_dest_id" ref="iva_assoc_sop_7" />
+        </record>
+
+        <record id="fptt_assoc_irpf7_7_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf7" />
+            <field name="tax_src_id" ref="iva_assoc_sop_7" />
+            <field name="tax_dest_id" ref="irpf_assoc_7" />
+        </record>
+
+        <record id="fptt_assoc_irpf7_4" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf7" />
+            <field name="tax_src_id" ref="iva_assoc_sop_4" />
+            <field name="tax_dest_id" ref="iva_assoc_sop_4" />
+        </record>
+
+        <record id="fptt_assoc_irpf7_4_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf7" />
+            <field name="tax_src_id" ref="iva_assoc_sop_4" />
+            <field name="tax_dest_id" ref="irpf_assoc_7" />
+        </record>
+
+    <!-- Retenciones IRPF 2% fiscal.position.tax.template-->
+
+        <record id="fptt_assoc_irpf2sale_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf2" />
+            <field name="tax_src_id" ref="iva_assoc_rep_21" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_21" />
+        </record>
+
+        <record id="fptt_assoc_irpf2sale_21_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf2" />
+            <field name="tax_src_id" ref="iva_assoc_rep_21" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_2" />
+        </record>
+
+        <record id="fptt_assoc_irpf2sale_18" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf2" />
+            <field name="tax_src_id" ref="iva_assoc_rep_18" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_18" />
+        </record>
+
+        <record id="fptt_assoc_irpf2sale_18_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf2" />
+            <field name="tax_src_id" ref="iva_assoc_rep_18" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_2" />
+        </record>
+
+        <record id="fptt_assoc_irpf2sale_16" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf2" />
+            <field name="tax_src_id" ref="iva_assoc_rep_16" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_16" />
+        </record>
+
+        <record id="fptt_assoc_irpf2sale_16_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf2" />
+            <field name="tax_src_id" ref="iva_assoc_rep_16" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_2" />
+        </record>
+
+        <record id="fptt_assoc_irpf2sale_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf2" />
+            <field name="tax_src_id" ref="iva_assoc_rep_10" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_10" />
+        </record>
+
+        <record id="fptt_assoc_irpf2sale_10_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf2" />
+            <field name="tax_src_id" ref="iva_assoc_rep_10" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_2" />
+        </record>
+
+        <record id="fptt_assoc_irpf2sale_8" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf2" />
+            <field name="tax_src_id" ref="iva_assoc_rep_8" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_8" />
+        </record>
+
+        <record id="fptt_assoc_irpf2sale_8_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf2" />
+            <field name="tax_src_id" ref="iva_assoc_rep_8" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_2" />
+        </record>
+
+        <record id="fptt_assoc_irpf2sale_7" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf2" />
+            <field name="tax_src_id" ref="iva_assoc_rep_7" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_7" />
+        </record>
+
+        <record id="fptt_assoc_irpf2sale_7_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf2" />
+            <field name="tax_src_id" ref="iva_assoc_rep_7" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_2" />
+        </record>
+
+        <record id="fptt_assoc_irpf2sale_4" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf2" />
+            <field name="tax_src_id" ref="iva_assoc_rep_4" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_4" />
+        </record>
+
+        <record id="fptt_assoc_irpf2sale_4_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf2" />
+            <field name="tax_src_id" ref="iva_assoc_rep_4" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_2" />
+        </record>
+
+        <record id="fptt_assoc_irpf2_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf2" />
+            <field name="tax_src_id" ref="iva_assoc_sop_21" />
+            <field name="tax_dest_id" ref="iva_assoc_sop_21" />
+        </record>
+
+        <record id="fptt_assoc_irpf2_21_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf2" />
+            <field name="tax_src_id" ref="iva_assoc_sop_21" />
+            <field name="tax_dest_id" ref="irpf_assoc_2" />
+        </record>
+
+        <record id="fptt_assoc_irpf2_18" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf2" />
+            <field name="tax_src_id" ref="iva_assoc_sop_18" />
+            <field name="tax_dest_id" ref="iva_assoc_sop_18" />
+        </record>
+
+        <record id="fptt_assoc_irpf2_18_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf2" />
+            <field name="tax_src_id" ref="iva_assoc_sop_18" />
+            <field name="tax_dest_id" ref="irpf_assoc_2" />
+        </record>
+
+        <record id="fptt_assoc_irpf2_16" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf2" />
+            <field name="tax_src_id" ref="iva_assoc_sop_16" />
+            <field name="tax_dest_id" ref="iva_assoc_sop_16" />
+        </record>
+
+        <record id="fptt_assoc_irpf2_16_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf2" />
+            <field name="tax_src_id" ref="iva_assoc_sop_16" />
+            <field name="tax_dest_id" ref="irpf_assoc_2" />
+        </record>
+
+        <record id="fptt_assoc_irpf2_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf2" />
+            <field name="tax_src_id" ref="iva_assoc_sop_10" />
+            <field name="tax_dest_id" ref="iva_assoc_sop_10" />
+        </record>
+
+        <record id="fptt_assoc_irpf2_10_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf2" />
+            <field name="tax_src_id" ref="iva_assoc_sop_10" />
+            <field name="tax_dest_id" ref="irpf_assoc_2" />
+        </record>
+
+        <record id="fptt_assoc_irpf2_8" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf2" />
+            <field name="tax_src_id" ref="iva_assoc_sop_8" />
+            <field name="tax_dest_id" ref="iva_assoc_sop_8" />
+        </record>
+
+        <record id="fptt_assoc_irpf2_8_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf2" />
+            <field name="tax_src_id" ref="iva_assoc_sop_8" />
+            <field name="tax_dest_id" ref="irpf_assoc_2" />
+        </record>
+
+        <record id="fptt_assoc_irpf2_7" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf2" />
+            <field name="tax_src_id" ref="iva_assoc_sop_7" />
+            <field name="tax_dest_id" ref="iva_assoc_sop_7" />
+        </record>
+
+        <record id="fptt_assoc_irpf2_7_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf2" />
+            <field name="tax_src_id" ref="iva_assoc_sop_7" />
+            <field name="tax_dest_id" ref="irpf_assoc_2" />
+        </record>
+
+        <record id="fptt_assoc_irpf2_4" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf2" />
+            <field name="tax_src_id" ref="iva_assoc_sop_4" />
+            <field name="tax_dest_id" ref="iva_assoc_sop_4" />
+        </record>
+
+        <record id="fptt_assoc_irpf2_4_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf2" />
+            <field name="tax_src_id" ref="iva_assoc_sop_4" />
+            <field name="tax_dest_id" ref="irpf_assoc_2" />
+        </record>
+
+    <!-- Retenciones IRPF 1% fiscal.position.tax.template-->
+
+        <record id="fptt_assoc_irpf1sale_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf1" />
+            <field name="tax_src_id" ref="iva_assoc_rep_21" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_21" />
+        </record>
+
+        <record id="fptt_assoc_irpf1sale_21_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf1" />
+            <field name="tax_src_id" ref="iva_assoc_rep_21" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_1" />
+        </record>
+
+        <record id="fptt_assoc_irpf1sale_18" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf1" />
+            <field name="tax_src_id" ref="iva_assoc_rep_18" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_18" />
+        </record>
+
+        <record id="fptt_assoc_irpf1sale_18_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf1" />
+            <field name="tax_src_id" ref="iva_assoc_rep_18" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_1" />
+        </record>
+
+        <record id="fptt_assoc_irpf1sale_16" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf1" />
+            <field name="tax_src_id" ref="iva_assoc_rep_16" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_16" />
+        </record>
+
+        <record id="fptt_assoc_irpf1sale_16_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf1" />
+            <field name="tax_src_id" ref="iva_assoc_rep_16" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_1" />
+        </record>
+
+        <record id="fptt_assoc_irpf1sale_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf1" />
+            <field name="tax_src_id" ref="iva_assoc_rep_10" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_10" />
+        </record>
+
+        <record id="fptt_assoc_irpf1sale_10_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf1" />
+            <field name="tax_src_id" ref="iva_assoc_rep_10" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_1" />
+        </record>
+
+        <record id="fptt_assoc_irpf1sale_8" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf1" />
+            <field name="tax_src_id" ref="iva_assoc_rep_8" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_8" />
+        </record>
+
+        <record id="fptt_assoc_irpf1sale_8_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf1" />
+            <field name="tax_src_id" ref="iva_assoc_rep_8" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_1" />
+        </record>
+
+        <record id="fptt_assoc_irpf1sale_7" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf1" />
+            <field name="tax_src_id" ref="iva_assoc_rep_7" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_7" />
+        </record>
+
+        <record id="fptt_assoc_irpf1sale_7_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf1" />
+            <field name="tax_src_id" ref="iva_assoc_rep_7" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_1" />
+        </record>
+
+        <record id="fptt_assoc_irpf1sale_4" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf1" />
+            <field name="tax_src_id" ref="iva_assoc_rep_4" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_4" />
+        </record>
+
+        <record id="fptt_assoc_irpf1sale_4_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf1" />
+            <field name="tax_src_id" ref="iva_assoc_rep_4" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_1" />
+        </record>
+
+        <record id="fptt_assoc_irpf1_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf1" />
+            <field name="tax_src_id" ref="iva_assoc_sop_21" />
+            <field name="tax_dest_id" ref="iva_assoc_sop_21" />
+        </record>
+
+        <record id="fptt_assoc_irpf1_21_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf1" />
+            <field name="tax_src_id" ref="iva_assoc_sop_21" />
+            <field name="tax_dest_id" ref="irpf_assoc_1" />
+        </record>
+
+        <record id="fptt_assoc_irpf1_18" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf1" />
+            <field name="tax_src_id" ref="iva_assoc_sop_18" />
+            <field name="tax_dest_id" ref="iva_assoc_sop_18" />
+        </record>
+
+        <record id="fptt_assoc_irpf1_18_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf1" />
+            <field name="tax_src_id" ref="iva_assoc_sop_18" />
+            <field name="tax_dest_id" ref="irpf_assoc_1" />
+        </record>
+
+         <record id="fptt_assoc_irpf1_16" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf1" />
+            <field name="tax_src_id" ref="iva_assoc_sop_16" />
+            <field name="tax_dest_id" ref="iva_assoc_sop_16" />
+        </record>
+
+        <record id="fptt_assoc_irpf1_16_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf1" />
+            <field name="tax_src_id" ref="iva_assoc_sop_16" />
+            <field name="tax_dest_id" ref="irpf_assoc_1" />
+        </record>
+
+        <record id="fptt_assoc_irpf1_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf1" />
+            <field name="tax_src_id" ref="iva_assoc_sop_10" />
+            <field name="tax_dest_id" ref="iva_assoc_sop_10" />
+        </record>
+
+        <record id="fptt_assoc_irpf1_10_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf1" />
+            <field name="tax_src_id" ref="iva_assoc_sop_10" />
+            <field name="tax_dest_id" ref="irpf_assoc_1" />
+        </record>
+
+        <record id="fptt_assoc_irpf1_8" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf1" />
+            <field name="tax_src_id" ref="iva_assoc_sop_8" />
+            <field name="tax_dest_id" ref="iva_assoc_sop_8" />
+        </record>
+
+        <record id="fptt_assoc_irpf1_8_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf1" />
+            <field name="tax_src_id" ref="iva_assoc_sop_8" />
+            <field name="tax_dest_id" ref="irpf_assoc_1" />
+        </record>
+
+        <record id="fptt_assoc_irpf1_7" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf1" />
+            <field name="tax_src_id" ref="iva_assoc_sop_7" />
+            <field name="tax_dest_id" ref="iva_assoc_sop_7" />
+        </record>
+
+        <record id="fptt_assoc_irpf1_7_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf1" />
+            <field name="tax_src_id" ref="iva_assoc_sop_7" />
+            <field name="tax_dest_id" ref="irpf_assoc_1" />
+        </record>
+
+        <record id="fptt_assoc_irpf1_4" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf1" />
+            <field name="tax_src_id" ref="iva_assoc_sop_4" />
+            <field name="tax_dest_id" ref="iva_assoc_sop_4" />
+        </record>
+
+        <record id="fptt_assoc_irpf1_4_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf1" />
+            <field name="tax_src_id" ref="iva_assoc_sop_4" />
+            <field name="tax_dest_id" ref="irpf_assoc_1" />
+        </record>
+
+        <record id="fptt_assoc_irpf21sale_ex" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf21" />
+            <field name="tax_src_id" ref="iva_assoc_rep_ex" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_ex" />
+        </record>
+
+        <record id="fptt_assoc_irpf21sale_ex_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf21" />
+            <field name="tax_src_id" ref="iva_assoc_rep_ex" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_21" />
+        </record>
+
+        <record id="fptt_assoc_irpf20sale_ex" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf20" />
+            <field name="tax_src_id" ref="iva_assoc_rep_ex" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_ex" />
+        </record>
+
+        <record id="fptt_assoc_irpf20sale_ex_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf20" />
+            <field name="tax_src_id" ref="iva_assoc_rep_ex" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_20" />
+        </record> 
+
+        <record id="fptt_assoc_irpf19sale_ex" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf19" />
+            <field name="tax_src_id" ref="iva_assoc_rep_ex" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_ex" />
+        </record>
+
+        <record id="fptt_assoc_irpf19sale_ex_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf19" />
+            <field name="tax_src_id" ref="iva_assoc_rep_ex" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_19" />
+        </record>        
+
+        <record id="fptt_assoc_irpf18sale_ex" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf18" />
+            <field name="tax_src_id" ref="iva_assoc_rep_ex" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_ex" />
+        </record>
+
+        <record id="fptt_assoc_irpf18sale_ex_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf18"/>
+            <field name="tax_src_id" ref="iva_assoc_rep_ex" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_18" />
+        </record>        
+
+        <record id="fptt_assoc_irpf15sale_ex" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf15" />
+            <field name="tax_src_id" ref="iva_assoc_rep_ex" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_ex" />
+        </record>
+
+        <record id="fptt_assoc_irpf15sale_ex_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf15" />
+            <field name="tax_src_id" ref="iva_assoc_rep_ex" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_15" />
+        </record>        
+
+        <record id="fptt_assoc_irpf9sale_ex" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf9" />            
+            <field name="tax_src_id" ref="iva_assoc_rep_ex" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_ex" />
+        </record>
+
+        <record id="fptt_assoc_irpf9sale_ex_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf9" />
+            <field name="tax_src_id" ref="iva_assoc_rep_ex" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_9" />
+        </record>
+        
+        <record id="fptt_assoc_irpf7sale_ex" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf7" />            
+            <field name="tax_src_id" ref="iva_assoc_rep_ex" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_ex" />
+        </record>
+
+        <record id="fptt_assoc_irpf7sale_ex_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf7" />
+            <field name="tax_src_id" ref="iva_assoc_rep_ex" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_7" />
+        </record>
+
+        <record id="fptt_assoc_irpf2sale_ex" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf2" />            
+            <field name="tax_src_id" ref="iva_assoc_rep_ex" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_ex" />
+        </record>
+
+        <record id="fptt_assoc_irpf2sale_ex_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf2" />
+            <field name="tax_src_id" ref="iva_assoc_rep_ex" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_2" />
+        </record>
+
+        <record id="fptt_assoc_irpf1sale_ex" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf1" />
+            <field name="tax_src_id" ref="iva_assoc_rep_ex" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_ex" />
+        </record>
+
+        <record id="fptt_assoc_irpf1sale_ex_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf1" />
+            <field name="tax_src_id" ref="iva_assoc_rep_ex" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_1" />
+        </record>
+
+    </data>
+</openerp>
diff --git a/addons/l10n_es/fiscal_templates_pymes.xml b/addons/l10n_es/fiscal_templates_pymes.xml
index 05871fad842..2e84e63bc34 100644
--- a/addons/l10n_es/fiscal_templates_pymes.xml
+++ b/addons/l10n_es/fiscal_templates_pymes.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data noupdate="1">
+    <data noupdate="0">
 
       <!--
       Definición de posiciones fiscales Régimen Nacional, Recargo de Equivalencia,
-      Extracomunitario, Intracomunitario y Retención de IRPF 18%, 15%, 7%, 1%
+      Extracomunitario, Intracomunitario y Retención de IRPFs
 
       Basado en fiscal_templates.xml, con los siguientes cambios:
 
@@ -18,7 +18,7 @@
             fp_* => fp_pymes_*
             fptt_* => fptt_pymes_*
             fpat_* => fpat_pymes_*
-            irpf_sale => irpf_pymes_sale_*
+            irpf_pymes_sale => irpf_pymes_sale_*
 
       Borja López Soilán (Pexego) - borjals@pexego.es (2009-09-09)
 
@@ -35,10 +35,14 @@
             iva_* => iva_pymes_*
             irpf_* => irpf_pymes_*
 
-         Añadidas posiciones fiscales Retención de IRPF 19%, 2% :
-           Jordi Esteve (Zikzakmedia) - jesteve@zikzakmedia.com 2010-02-18 -->
+      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 -->
+
+        <!-- Fiscal Position Templates -->
 
-    <!-- Fiscal Position Templates -->
         <record id="fp_pymes_nacional" model="account.fiscal.position.template">
             <field name="name">Régimen Nacional</field>
             <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
@@ -59,6 +63,16 @@
             <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
         </record>
 
+        <record id="fp_pymes_irpf21" model="account.fiscal.position.template">
+            <field name="name">Retención IRPF 21%</field>
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+        </record>
+
+        <record id="fp_pymes_irpf20" model="account.fiscal.position.template">
+            <field name="name">Retención IRPF 20%</field>
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+        </record>
+
         <record id="fp_pymes_irpf19" model="account.fiscal.position.template">
             <field name="name">Retención IRPF 19%</field>
             <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
@@ -74,6 +88,11 @@
             <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
         </record>
 
+        <record id="fp_pymes_irpf9" model="account.fiscal.position.template">
+            <field name="name">Retención IRPF 9%</field>
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+        </record>
+
         <record id="fp_pymes_irpf7" model="account.fiscal.position.template">
             <field name="name">Retención IRPF 7%</field>
             <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
@@ -94,26 +113,16 @@
     <!-- ************************************************************* -->
 
     <!-- Extracomunitarios fiscal.position.tax.template-->
+        <record id="fptt_pymes_extra_4" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_extra"  />
+            <field name="tax_src_id" ref="iva_pymes_sop_4" />
+            <field name="tax_dest_id" ref="iva_pymes_X4_compras_bc" />
+        </record>
 
-        <record id="fptt_pymes_extra_16" model="account.fiscal.position.tax.template">
+        <record id="fptt_pymes_extra_4_inv" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_pymes_extra"  />
-            <field name="tax_src_id" ref="iva_pymes_sop_16" />
-            <field name="tax_dest_id" ref="iva_pymes_X16_compras_bc" />
-        </record>
-        <record id="fptt_pymes_extra_16_inv" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_pymes_extra"  />
-            <field name="tax_src_id" ref="iva_pymes_sop_16_inv" />
-            <field name="tax_dest_id" ref="iva_pymes_X16_compras_bi" />
-        </record>
-        <record id="fptt_pymes_extra_18" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_pymes_extra"  />
-            <field name="tax_src_id" ref="iva_pymes_sop_18" />
-            <field name="tax_dest_id" ref="iva_pymes_X18_compras_bc" />
-        </record>
-        <record id="fptt_pymes_extra_18_inv" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_pymes_extra"  />
-            <field name="tax_src_id" ref="iva_pymes_sop_18_inv" />
-            <field name="tax_dest_id" ref="iva_pymes_X18_compras_bi" />
+            <field name="tax_src_id" ref="iva_pymes_sop_4_inv" />
+            <field name="tax_dest_id" ref="iva_pymes_X4_compras_bi" />
         </record>
 
         <record id="fptt_pymes_extra_7" model="account.fiscal.position.tax.template">
@@ -121,30 +130,69 @@
             <field name="tax_src_id" ref="iva_pymes_sop_7" />
             <field name="tax_dest_id" ref="iva_pymes_X7_compras_bc" />
         </record>
+
         <record id="fptt_pymes_extra_7_inv" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_pymes_extra"  />
             <field name="tax_src_id" ref="iva_pymes_sop_7_inv" />
             <field name="tax_dest_id" ref="iva_pymes_X7_compras_bi" />
         </record>
+
         <record id="fptt_pymes_extra_8" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_pymes_extra"  />
             <field name="tax_src_id" ref="iva_pymes_sop_8" />
             <field name="tax_dest_id" ref="iva_pymes_X8_compras_bc" />
         </record>
+
         <record id="fptt_pymes_extra_8_inv" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_pymes_extra"  />
             <field name="tax_src_id" ref="iva_pymes_sop_8_inv" />
             <field name="tax_dest_id" ref="iva_pymes_X8_compras_bi" />
         </record>
-        <record id="fptt_pymes_extra_4" model="account.fiscal.position.tax.template">
+
+        <record id="fptt_pymes_extra_10" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_pymes_extra"  />
-            <field name="tax_src_id" ref="iva_pymes_sop_4" />
-            <field name="tax_dest_id" ref="iva_pymes_X4_compras_bc" />
+            <field name="tax_src_id" ref="iva_pymes_sop_10" />
+            <field name="tax_dest_id" ref="iva_pymes_X10_compras_bc" />
         </record>
-        <record id="fptt_pymes_extra_4_inv" model="account.fiscal.position.tax.template">
+        <record id="fptt_pymes_extra_10_inv" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_pymes_extra"  />
-            <field name="tax_src_id" ref="iva_pymes_sop_4_inv" />
-            <field name="tax_dest_id" ref="iva_pymes_X4_compras_bi" />
+            <field name="tax_src_id" ref="iva_pymes_sop_10_inv" />
+            <field name="tax_dest_id" ref="iva_pymes_X10_compras_bi" />
+        </record>
+
+        <record id="fptt_pymes_extra_16" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_extra"  />
+            <field name="tax_src_id" ref="iva_pymes_sop_16" />
+            <field name="tax_dest_id" ref="iva_pymes_X16_compras_bc" />
+        </record>
+
+        <record id="fptt_pymes_extra_16_inv" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_extra"  />
+            <field name="tax_src_id" ref="iva_pymes_sop_16_inv" />
+            <field name="tax_dest_id" ref="iva_pymes_X16_compras_bi" />
+        </record>
+
+        <record id="fptt_pymes_extra_18" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_extra"  />
+            <field name="tax_src_id" ref="iva_pymes_sop_18" />
+            <field name="tax_dest_id" ref="iva_pymes_X18_compras_bc" />
+        </record>
+
+        <record id="fptt_pymes_extra_18_inv" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_extra"  />
+            <field name="tax_src_id" ref="iva_pymes_sop_18_inv" />
+            <field name="tax_dest_id" ref="iva_pymes_X18_compras_bi" />
+        </record>
+
+        <record id="fptt_pymes_extra_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_extra"  />
+            <field name="tax_src_id" ref="iva_pymes_sop_21" />
+            <field name="tax_dest_id" ref="iva_pymes_X21_compras_bc" />
+        </record>
+        <record id="fptt_pymes_extra_21_inv" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_extra"  />
+            <field name="tax_src_id" ref="iva_pymes_sop_21_inv" />
+            <field name="tax_dest_id" ref="iva_pymes_X21_compras_bi" />
         </record>
 
         <record id="fptt_pymes_extra_ventas_4" model="account.fiscal.position.tax.template">
@@ -164,6 +212,12 @@
             <field name="tax_dest_id" ref="iva_pymes_X0" />
         </record>
 
+        <record id="fptt_pymes_extra_ventas_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_extra"  />
+            <field name="tax_src_id" ref="iva_pymes_rep_10" />
+            <field name="tax_dest_id" ref="iva_pymes_X0" />
+        </record>
+
         <record id="fptt_pymes_extra_ventas_16" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_pymes_extra"  />
             <field name="tax_src_id" ref="iva_pymes_rep_16" />
@@ -175,8 +229,62 @@
             <field name="tax_dest_id" ref="iva_pymes_X0" />
         </record>
 
+        <record id="fptt_pymes_extra_ventas_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_extra"  />
+            <field name="tax_src_id" ref="iva_pymes_rep_21" />
+            <field name="tax_dest_id" ref="iva_pymes_X0" />
+        </record>
+
     <!-- Intracomunitarios fiscal.position.tax.template-->
 
+        <record id="fptt_pymes_intra_4" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_intra"  />
+            <field name="tax_src_id" ref="iva_pymes_sop_4" />
+            <field name="tax_dest_id" ref="iva_pymes_IC_compras_4_bc" />
+        </record>
+
+        <record id="fptt_pymes_intra_4_inv" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_intra"  />
+            <field name="tax_src_id" ref="iva_pymes_sop_4_inv" />
+            <field name="tax_dest_id" ref="iva_pymes_IC_compras_4_bi" />
+        </record>
+
+        <record id="fptt_pymes_intra_7" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_intra"  />
+            <field name="tax_src_id" ref="iva_pymes_sop_7" />
+            <field name="tax_dest_id" ref="iva_pymes_IC_compras_7_bc" />
+        </record>
+
+        <record id="fptt_pymes_intra_7_inv" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_intra"  />
+            <field name="tax_src_id" ref="iva_pymes_sop_7_inv" />
+            <field name="tax_dest_id" ref="iva_pymes_IC_compras_7_bi" />
+        </record>
+
+        <record id="fptt_pymes_intra_8" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_intra"  />
+            <field name="tax_src_id" ref="iva_pymes_sop_8" />
+            <field name="tax_dest_id" ref="iva_pymes_IC_compras_8_bc" />
+        </record>
+
+        <record id="fptt_pymes_intra_8_inv" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_intra"  />
+            <field name="tax_src_id" ref="iva_pymes_sop_8_inv" />
+            <field name="tax_dest_id" ref="iva_pymes_IC_compras_8_bi" />
+        </record>
+
+        <record id="fptt_pymes_intra_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_intra"  />
+            <field name="tax_src_id" ref="iva_pymes_sop_10" />
+            <field name="tax_dest_id" ref="iva_pymes_IC_compras_10_bc" />
+        </record>
+
+        <record id="fptt_pymes_intra_10_inv" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_intra"  />
+            <field name="tax_src_id" ref="iva_pymes_sop_10_inv" />
+            <field name="tax_dest_id" ref="iva_pymes_IC_compras_10_bi" />
+        </record>
+
         <record id="fptt_pymes_intra_16" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_pymes_intra"  />
             <field name="tax_src_id" ref="iva_pymes_sop_16" />
@@ -198,35 +306,15 @@
             <field name="tax_dest_id" ref="iva_pymes_IC_compras_18_bi" />
         </record>
 
-        <record id="fptt_pymes_intra_7" model="account.fiscal.position.tax.template">
+        <record id="fptt_pymes_intra_21" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_pymes_intra"  />
-            <field name="tax_src_id" ref="iva_pymes_sop_7" />
-            <field name="tax_dest_id" ref="iva_pymes_IC_compras_7_bc" />
+            <field name="tax_src_id" ref="iva_pymes_sop_21" />
+            <field name="tax_dest_id" ref="iva_pymes_IC_compras_21_bc" />
         </record>
-        <record id="fptt_pymes_intra_7_inv" model="account.fiscal.position.tax.template">
+        <record id="fptt_pymes_intra_21_inv" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_pymes_intra"  />
-            <field name="tax_src_id" ref="iva_pymes_sop_7_inv" />
-            <field name="tax_dest_id" ref="iva_pymes_IC_compras_7_bi" />
-        </record>
-        <record id="fptt_pymes_intra_8" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_pymes_intra"  />
-            <field name="tax_src_id" ref="iva_pymes_sop_8" />
-            <field name="tax_dest_id" ref="iva_pymes_IC_compras_8_bc" />
-        </record>
-        <record id="fptt_pymes_intra_8_inv" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_pymes_intra"  />
-            <field name="tax_src_id" ref="iva_pymes_sop_8_inv" />
-            <field name="tax_dest_id" ref="iva_pymes_IC_compras_8_bi" />
-        </record>
-        <record id="fptt_pymes_intra_4" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_pymes_intra"  />
-            <field name="tax_src_id" ref="iva_pymes_sop_4" />
-            <field name="tax_dest_id" ref="iva_pymes_IC_compras_4_bc" />
-        </record>
-        <record id="fptt_pymes_intra_4_inv" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_pymes_intra"  />
-            <field name="tax_src_id" ref="iva_pymes_sop_4_inv" />
-            <field name="tax_dest_id" ref="iva_pymes_IC_compras_4_bi" />
+            <field name="tax_src_id" ref="iva_pymes_sop_21_inv" />
+            <field name="tax_dest_id" ref="iva_pymes_IC_compras_21_bi" />
         </record>
 
         <record id="fptt_pymes_intra_ventas_4" model="account.fiscal.position.tax.template">
@@ -246,6 +334,12 @@
             <field name="tax_dest_id" ref="iva_pymes_IO" />
         </record>
 
+        <record id="fptt_pymes_intra_ventas_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_intra"  />
+            <field name="tax_src_id" ref="iva_pymes_rep_10" />
+            <field name="tax_dest_id" ref="iva_pymes_IO" />
+        </record>
+
         <record id="fptt_pymes_intra_ventas_16" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_pymes_intra"  />
             <field name="tax_src_id" ref="iva_pymes_rep_16" />
@@ -257,30 +351,24 @@
             <field name="tax_dest_id" ref="iva_pymes_IO" />
         </record>
 
+         <record id="fptt_pymes_intra_ventas_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_intra"  />
+            <field name="tax_src_id" ref="iva_pymes_rep_21" />
+            <field name="tax_dest_id" ref="iva_pymes_IO" />
+        </record>
+
     <!-- Recargo de equivalencia fiscal.position.tax.template-->
 
-        <record id="fptt_pymes_recargo_16" model="account.fiscal.position.tax.template">
+        <record id="fptt_pymes_recargo_4" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_pymes_recargo"  />
-            <field name="tax_src_id" ref="iva_pymes_rep_16" />
-            <field name="tax_dest_id" ref="iva_pymes_rep_16" />
+            <field name="tax_src_id" ref="iva_pymes_rep_4" />
+            <field name="tax_dest_id" ref="iva_pymes_rep_4" />
         </record>
 
-        <record id="fptt_pymes_recargo_16_2" model="account.fiscal.position.tax.template">
+        <record id="fptt_pymes_recargo_4_2" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_pymes_recargo"  />
-            <field name="tax_src_id" ref="iva_pymes_rep_16" />
-            <field name="tax_dest_id" ref="re_pymes_4" />
-        </record>
-    
-        <record id="fptt_pymes_recargo_18" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_pymes_recargo"  />
-            <field name="tax_src_id" ref="iva_pymes_rep_18" />
-            <field name="tax_dest_id" ref="iva_pymes_rep_18" />
-        </record>
-
-        <record id="fptt_pymes_recargo_18_2" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_pymes_recargo"  />
-            <field name="tax_src_id" ref="iva_pymes_rep_18" />
-            <field name="tax_dest_id" ref="re_pymes_4" />
+            <field name="tax_src_id" ref="iva_pymes_rep_4" />
+            <field name="tax_dest_id" ref="re_pymes_05" />
         </record>
 
         <record id="fptt_pymes_recargo_7" model="account.fiscal.position.tax.template">
@@ -294,7 +382,7 @@
             <field name="tax_src_id" ref="iva_pymes_rep_7" />
             <field name="tax_dest_id" ref="re_pymes_1" />
         </record>
-    
+
         <record id="fptt_pymes_recargo_8" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_pymes_recargo"  />
             <field name="tax_src_id" ref="iva_pymes_rep_8" />
@@ -307,16 +395,220 @@
             <field name="tax_dest_id" ref="re_pymes_1" />
         </record>
 
-        <record id="fptt_pymes_recargo_4" model="account.fiscal.position.tax.template">
+        <record id="fptt_pymes_recargo_10" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_pymes_recargo"  />
-            <field name="tax_src_id" ref="iva_pymes_rep_4" />
-            <field name="tax_dest_id" ref="iva_pymes_rep_4" />
+            <field name="tax_src_id" ref="iva_pymes_rep_10" />
+            <field name="tax_dest_id" ref="iva_pymes_rep_10" />
         </record>
 
-        <record id="fptt_pymes_recargo_4_2" model="account.fiscal.position.tax.template">
+        <record id="fptt_pymes_recargo_10_2" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_pymes_recargo"  />
-            <field name="tax_src_id" ref="iva_pymes_rep_4" />
-            <field name="tax_dest_id" ref="re_pymes_05" />
+            <field name="tax_src_id" ref="iva_pymes_rep_10" />
+            <field name="tax_dest_id" ref="re_pymes_14" />
+        </record>
+
+        <record id="fptt_pymes_recargo_16" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_recargo"  />
+            <field name="tax_src_id" ref="iva_pymes_rep_16" />
+            <field name="tax_dest_id" ref="iva_pymes_rep_16" />
+        </record>
+
+        <record id="fptt_pymes_recargo_16_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_recargo"  />
+            <field name="tax_src_id" ref="iva_pymes_rep_16" />
+            <field name="tax_dest_id" ref="re_pymes_4" />
+        </record>
+
+        <record id="fptt_pymes_recargo_18" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_recargo"  />
+            <field name="tax_src_id" ref="iva_pymes_rep_18" />
+            <field name="tax_dest_id" ref="iva_pymes_rep_18" />
+        </record>
+
+        <record id="fptt_pymes_recargo_18_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_recargo"  />
+            <field name="tax_src_id" ref="iva_pymes_rep_18" />
+            <field name="tax_dest_id" ref="re_pymes_4" />
+        </record>
+
+        <record id="fptt_pymes_recargo_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_recargo"  />
+            <field name="tax_src_id" ref="iva_pymes_rep_21" />
+            <field name="tax_dest_id" ref="iva_pymes_rep_21" />
+        </record>
+
+        <record id="fptt_pymes_recargo_21_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_recargo"  />
+            <field name="tax_src_id" ref="iva_pymes_rep_21" />
+            <field name="tax_dest_id" ref="re_pymes_52" />
+        </record>
+
+        <record id="fptt_pymes_recargo_buy_4" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_recargo"  />
+            <field name="tax_src_id" ref="iva_pymes_sop_4" />
+            <field name="tax_dest_id" ref="iva_pymes_sop_4" />
+        </record>
+
+        <record id="fptt_pymes_recargo_buy_4_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_recargo"  />
+            <field name="tax_src_id" ref="iva_pymes_sop_4" />
+            <field name="tax_dest_id" ref="re_pymes_buy_05" />
+        </record>
+
+        <record id="fptt_pymes_recargo_buy_7" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_recargo"  />
+            <field name="tax_src_id" ref="iva_pymes_sop_7" />
+            <field name="tax_dest_id" ref="iva_pymes_sop_7" />
+        </record>
+
+        <record id="fptt_pymes_recargo_buy_7_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_recargo"  />
+            <field name="tax_src_id" ref="iva_pymes_sop_7" />
+            <field name="tax_dest_id" ref="re_pymes_buy_1" />
+        </record>
+
+        <record id="fptt_pymes_recargo_buy_8" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_recargo"  />
+            <field name="tax_src_id" ref="iva_pymes_sop_8" />
+            <field name="tax_dest_id" ref="iva_pymes_sop_8" />
+        </record>
+
+        <record id="fptt_pymes_recargo_buy_8_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_recargo"  />
+            <field name="tax_src_id" ref="iva_pymes_sop_8" />
+            <field name="tax_dest_id" ref="re_pymes_buy_1" />
+        </record>
+
+        <record id="fptt_pymes_recargo_buy_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_recargo"  />
+            <field name="tax_src_id" ref="iva_pymes_sop_10" />
+            <field name="tax_dest_id" ref="iva_pymes_sop_10" />
+        </record>
+
+        <record id="fptt_pymes_recargo_buy_10_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_recargo"  />
+            <field name="tax_src_id" ref="iva_pymes_sop_10" />
+            <field name="tax_dest_id" ref="re_pymes_buy_14" />
+        </record>
+
+        <record id="fptt_pymes_recargo_buy_16" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_recargo"  />
+            <field name="tax_src_id" ref="iva_pymes_sop_16" />
+            <field name="tax_dest_id" ref="iva_pymes_sop_16" />
+        </record>
+
+        <record id="fptt_pymes_recargo_buy_16_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_recargo"  />
+            <field name="tax_src_id" ref="iva_pymes_sop_16" />
+            <field name="tax_dest_id" ref="re_pymes_buy_4" />
+        </record>
+
+        <record id="fptt_pymes_recargo_buy_18" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_recargo"  />
+            <field name="tax_src_id" ref="iva_pymes_sop_18" />
+            <field name="tax_dest_id" ref="iva_pymes_sop_18" />
+        </record>
+
+        <record id="fptt_pymes_recargo_buy_18_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_recargo"  />
+            <field name="tax_src_id" ref="iva_pymes_sop_18" />
+            <field name="tax_dest_id" ref="re_pymes_buy_4" />
+        </record>
+
+        <record id="fptt_pymes_recargo_buy_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_recargo"  />
+            <field name="tax_src_id" ref="iva_pymes_sop_21" />
+            <field name="tax_dest_id" ref="iva_pymes_sop_21" />
+        </record>
+
+        <record id="fptt_pymes_recargo_buy_21_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_recargo"  />
+            <field name="tax_src_id" ref="iva_pymes_sop_21" />
+            <field name="tax_dest_id" ref="re_pymes_buy_52" />
+        </record>
+
+         <record id="fptt_pymes_recargo_buy_4_inv" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_recargo"  />
+            <field name="tax_src_id" ref="iva_pymes_sop_4_inv" />
+            <field name="tax_dest_id" ref="iva_pymes_sop_4_inv" />
+        </record>
+
+        <record id="fptt_pymes_recargo_buy_4_2_inv" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_recargo"  />
+            <field name="tax_src_id" ref="iva_pymes_sop_4_inv" />
+            <field name="tax_dest_id" ref="re_pymes_buy_05" />
+        </record>
+
+        <record id="fptt_pymes_recargo_buy_7_inv" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_recargo"  />
+            <field name="tax_src_id" ref="iva_pymes_sop_7_inv" />
+            <field name="tax_dest_id" ref="iva_pymes_sop_7_inv" />
+        </record>
+
+        <record id="fptt_pymes_recargo_buy_7_2_inv" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_recargo"  />
+            <field name="tax_src_id" ref="iva_pymes_sop_7_inv" />
+            <field name="tax_dest_id" ref="re_pymes_buy_1" />
+        </record>
+
+        <record id="fptt_pymes_recargo_buy_8_inv" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_recargo"  />
+            <field name="tax_src_id" ref="iva_pymes_sop_8_inv" />
+            <field name="tax_dest_id" ref="iva_pymes_sop_8_inv" />
+        </record>
+
+        <record id="fptt_pymes_recargo_buy_8_2_inv" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_recargo"  />
+            <field name="tax_src_id" ref="iva_pymes_sop_8_inv" />
+            <field name="tax_dest_id" ref="re_pymes_buy_1" />
+        </record>
+
+         <record id="fptt_pymes_recargo_buy_10_inv" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_recargo"  />
+            <field name="tax_src_id" ref="iva_pymes_sop_10_inv" />
+            <field name="tax_dest_id" ref="iva_pymes_sop_10_inv" />
+        </record>
+
+        <record id="fptt_pymes_recargo_buy_10_2_inv" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_recargo"  />
+            <field name="tax_src_id" ref="iva_pymes_sop_10_inv" />
+            <field name="tax_dest_id" ref="re_pymes_buy_14" />
+        </record>
+
+        <record id="fptt_pymes_recargo_buy_16_inv" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_recargo"  />
+            <field name="tax_src_id" ref="iva_pymes_sop_16_inv" />
+            <field name="tax_dest_id" ref="iva_pymes_sop_16_inv" />
+        </record>
+
+        <record id="fptt_pymes_recargo_buy_16_2_inv" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_recargo"  />
+            <field name="tax_src_id" ref="iva_pymes_sop_16_inv" />
+            <field name="tax_dest_id" ref="re_pymes_buy_4" />
+        </record>
+
+        <record id="fptt_pymes_recargo_buy_18_inv" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_recargo"  />
+            <field name="tax_src_id" ref="iva_pymes_sop_18_inv" />
+            <field name="tax_dest_id" ref="iva_pymes_sop_18_inv" />
+        </record>
+
+        <record id="fptt_pymes_recargo_buy_18_2_inv" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_recargo"  />
+            <field name="tax_src_id" ref="iva_pymes_sop_18_inv" />
+            <field name="tax_dest_id" ref="re_pymes_buy_4" />
+        </record>
+
+        <record id="fptt_pymes_recargo_buy_21_inv" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_recargo"  />
+            <field name="tax_src_id" ref="iva_pymes_sop_21_inv" />
+            <field name="tax_dest_id" ref="iva_pymes_sop_21_inv" />
+        </record>
+
+        <record id="fptt_pymes_recargo_buy_21_2_inv" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_recargo"  />
+            <field name="tax_src_id" ref="iva_pymes_sop_21_inv" />
+            <field name="tax_dest_id" ref="re_pymes_buy_52" />
         </record>
 
     <!-- Extracomunitarios fiscal.position.account.template-->
@@ -395,9 +687,312 @@
             <field name="account_dest_id" ref="pgc_pymes_7051" />
         </record>
 
+    <!-- Retenciones IRPF 21% fiscal.position.tax.template-->
+
+        <record id="fptt_pymes_irpf21sale_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf21" />
+            <field name="tax_src_id" ref="iva_pymes_rep_21" />
+            <field name="tax_dest_id" ref="iva_pymes_rep_21" />
+        </record>
+
+        <record id="fptt_pymes_irpf21sale_21_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf21" />
+            <field name="tax_src_id" ref="iva_pymes_rep_21" />
+            <field name="tax_dest_id" ref="irpf_pymes_sale_21" />
+        </record>
+
+        <record id="fptt_pymes_irpf21sale_18" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf21" />
+            <field name="tax_src_id" ref="iva_pymes_rep_18" />
+            <field name="tax_dest_id" ref="iva_pymes_rep_18" />
+        </record>
+
+        <record id="fptt_pymes_irpf21sale_18_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf21" />
+            <field name="tax_src_id" ref="iva_pymes_rep_18" />
+            <field name="tax_dest_id" ref="irpf_pymes_sale_21" />
+        </record>
+
+        <record id="fptt_pymes_irpf21sale_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf21" />
+            <field name="tax_src_id" ref="iva_pymes_rep_10" />
+            <field name="tax_dest_id" ref="iva_pymes_rep_10" />
+        </record>
+
+        <record id="fptt_pymes_irpf21sale_10_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf21" />
+            <field name="tax_src_id" ref="iva_pymes_rep_10" />
+            <field name="tax_dest_id" ref="irpf_pymes_sale_21" />
+        </record>
+
+        <record id="fptt_pymes_irpf21sale_8" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf21" />
+            <field name="tax_src_id" ref="iva_pymes_rep_8" />
+            <field name="tax_dest_id" ref="iva_pymes_rep_8" />
+        </record>
+
+        <record id="fptt_pymes_irpf21sale_8_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf21" />
+            <field name="tax_src_id" ref="iva_pymes_rep_8" />
+            <field name="tax_dest_id" ref="irpf_pymes_sale_21" />
+        </record>
+
+        <record id="fptt_pymes_irpf21sale_4" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf21" />
+            <field name="tax_src_id" ref="iva_pymes_rep_4" />
+            <field name="tax_dest_id" ref="iva_pymes_rep_4" />
+        </record>
+
+        <record id="fptt_pymes_irpf21sale_4_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf21" />
+            <field name="tax_src_id" ref="iva_pymes_rep_4" />
+            <field name="tax_dest_id" ref="irpf_pymes_sale_21" />
+        </record>
+
+        <record id="fptt_pymes_irpf21_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf21" />
+            <field name="tax_src_id" ref="iva_pymes_sop_21" />
+            <field name="tax_dest_id" ref="iva_pymes_sop_21" />
+        </record>
+
+        <record id="fptt_pymes_irpf21_21_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf21" />
+            <field name="tax_src_id" ref="iva_pymes_sop_21" />
+            <field name="tax_dest_id" ref="irpf_pymes_21" />
+        </record>
+
+        <record id="fptt_pymes_irpf21_18" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf21" />
+            <field name="tax_src_id" ref="iva_pymes_sop_18" />
+            <field name="tax_dest_id" ref="iva_pymes_sop_18" />
+        </record>
+
+        <record id="fptt_pymes_irpf21_18_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf21" />
+            <field name="tax_src_id" ref="iva_pymes_sop_18" />
+            <field name="tax_dest_id" ref="irpf_pymes_21" />
+        </record>
+
+        <record id="fptt_pymes_irpf21_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf21" />
+            <field name="tax_src_id" ref="iva_pymes_sop_10" />
+            <field name="tax_dest_id" ref="iva_pymes_sop_10" />
+        </record>
+
+        <record id="fptt_pymes_irpf21_10_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf21" />
+            <field name="tax_src_id" ref="iva_pymes_sop_10" />
+            <field name="tax_dest_id" ref="irpf_pymes_21" />
+        </record>
+
+        <record id="fptt_pymes_irpf21_8" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf21" />
+            <field name="tax_src_id" ref="iva_pymes_sop_8" />
+            <field name="tax_dest_id" ref="iva_pymes_sop_8" />
+        </record>
+
+        <record id="fptt_pymes_irpf21_8_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf21" />
+            <field name="tax_src_id" ref="iva_pymes_sop_8" />
+            <field name="tax_dest_id" ref="irpf_pymes_21" />
+        </record>
+
+        <record id="fptt_pymes_irpf21_4" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf21" />
+            <field name="tax_src_id" ref="iva_pymes_sop_4" />
+            <field name="tax_dest_id" ref="iva_pymes_sop_4" />
+        </record>
+
+        <record id="fptt_pymes_irpf21_4_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf21" />
+            <field name="tax_src_id" ref="iva_pymes_sop_4" />
+            <field name="tax_dest_id" ref="irpf_pymes_21" />
+        </record>
+
+        <!-- Retenciones IRPF 20% fiscal.position.tax.template-->
+
+        <record id="fptt_pymes_irpf20sale_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf20" />
+            <field name="tax_src_id" ref="iva_pymes_rep_21" />
+            <field name="tax_dest_id" ref="iva_pymes_rep_21" />
+        </record>
+
+        <record id="fptt_pymes_irpf20sale_21_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf20" />
+            <field name="tax_src_id" ref="iva_pymes_rep_21" />
+            <field name="tax_dest_id" ref="irpf_pymes_sale_20" />
+        </record>
+
+         <record id="fptt_pymes_irpf20sale_18" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf20" />
+            <field name="tax_src_id" ref="iva_pymes_rep_18" />
+            <field name="tax_dest_id" ref="iva_pymes_rep_18" />
+        </record>
+
+        <record id="fptt_pymes_irpf20sale_18_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf20" />
+            <field name="tax_src_id" ref="iva_pymes_rep_18" />
+            <field name="tax_dest_id" ref="irpf_pymes_sale_20" />
+        </record>
+
+        <record id="fptt_pymes_irpf20sale_16" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf20" />
+            <field name="tax_src_id" ref="iva_pymes_rep_16" />
+            <field name="tax_dest_id" ref="iva_pymes_rep_16" />
+        </record>
+
+        <record id="fptt_pymes_irpf20sale_16_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf20" />
+            <field name="tax_src_id" ref="iva_pymes_rep_16" />
+            <field name="tax_dest_id" ref="irpf_pymes_sale_20" />
+        </record>
+
+        <record id="fptt_pymes_irpf20sale_8" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf20" />
+            <field name="tax_src_id" ref="iva_pymes_rep_8" />
+            <field name="tax_dest_id" ref="iva_pymes_rep_8" />
+        </record>
+
+        <record id="fptt_pymes_irpf20sale_8_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf20" />
+            <field name="tax_src_id" ref="iva_pymes_rep_8" />
+            <field name="tax_dest_id" ref="irpf_pymes_sale_20" />
+        </record>
+
+        <record id="fptt_pymes_irpf20sale_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf20" />
+            <field name="tax_src_id" ref="iva_pymes_rep_10" />
+            <field name="tax_dest_id" ref="iva_pymes_rep_10" />
+        </record>
+
+        <record id="fptt_pymes_irpf20sale_10_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf20" />
+            <field name="tax_src_id" ref="iva_pymes_rep_10" />
+            <field name="tax_dest_id" ref="irpf_pymes_sale_20" />
+        </record>
+
+        <record id="fptt_pymes_irpf20sale_7" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf20" />
+            <field name="tax_src_id" ref="iva_pymes_rep_7" />
+            <field name="tax_dest_id" ref="iva_pymes_rep_7" />
+        </record>
+
+        <record id="fptt_pymes_irpf20sale_7_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf20" />
+            <field name="tax_src_id" ref="iva_pymes_rep_7" />
+            <field name="tax_dest_id" ref="irpf_pymes_sale_20" />
+        </record>
+
+        <record id="fptt_pymes_irpf20sale_4" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf20" />
+            <field name="tax_src_id" ref="iva_pymes_rep_4" />
+            <field name="tax_dest_id" ref="iva_pymes_rep_4" />
+        </record>
+
+        <record id="fptt_pymes_irpf20sale_4_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf20" />
+            <field name="tax_src_id" ref="iva_pymes_rep_4" />
+            <field name="tax_dest_id" ref="irpf_pymes_sale_20" />
+        </record>
+
+        <record id="fptt_pymes_irpf20_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf20" />
+            <field name="tax_src_id" ref="iva_pymes_sop_21" />
+            <field name="tax_dest_id" ref="iva_pymes_sop_21" />
+        </record>
+
+        <record id="fptt_pymes_irpf20_21_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf20" />
+            <field name="tax_src_id" ref="iva_pymes_sop_21" />
+            <field name="tax_dest_id" ref="irpf_pymes_20" />
+        </record>
+
+        <record id="fptt_pymes_irpf20_18" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf20" />
+            <field name="tax_src_id" ref="iva_pymes_sop_18" />
+            <field name="tax_dest_id" ref="iva_pymes_sop_18" />
+        </record>
+
+        <record id="fptt_pymes_irpf20_18_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf20" />
+            <field name="tax_src_id" ref="iva_pymes_sop_18" />
+            <field name="tax_dest_id" ref="irpf_pymes_20" />
+        </record>
+
+        <record id="fptt_pymes_irpf20_16" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf20" />
+            <field name="tax_src_id" ref="iva_pymes_sop_16" />
+            <field name="tax_dest_id" ref="iva_pymes_sop_16" />
+        </record>
+
+        <record id="fptt_pymes_irpf20_16_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf20" />
+            <field name="tax_src_id" ref="iva_pymes_sop_16" />
+            <field name="tax_dest_id" ref="irpf_pymes_20" />
+        </record>
+
+        <record id="fptt_pymes_irpf20_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf20" />
+            <field name="tax_src_id" ref="iva_pymes_sop_10" />
+            <field name="tax_dest_id" ref="iva_pymes_sop_10" />
+        </record>
+
+        <record id="fptt_pymes_irpf20_10_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf20" />
+            <field name="tax_src_id" ref="iva_pymes_sop_10" />
+            <field name="tax_dest_id" ref="irpf_pymes_20" />
+        </record>
+
+        <record id="fptt_pymes_irpf20_8" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf20" />
+            <field name="tax_src_id" ref="iva_pymes_sop_8" />
+            <field name="tax_dest_id" ref="iva_pymes_sop_8" />
+        </record>
+
+        <record id="fptt_pymes_irpf20_8_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf20" />
+            <field name="tax_src_id" ref="iva_pymes_sop_8" />
+            <field name="tax_dest_id" ref="irpf_pymes_20" />
+        </record>
+
+        <record id="fptt_pymes_irpf20_7" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf20" />
+            <field name="tax_src_id" ref="iva_pymes_sop_7" />
+            <field name="tax_dest_id" ref="iva_pymes_sop_7" />
+        </record>
+
+        <record id="fptt_pymes_irpf20_7_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf20" />
+            <field name="tax_src_id" ref="iva_pymes_sop_7" />
+            <field name="tax_dest_id" ref="irpf_pymes_20" />
+        </record>
+
+        <record id="fptt_pymes_irpf20_4" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf20" />
+            <field name="tax_src_id" ref="iva_pymes_sop_4" />
+            <field name="tax_dest_id" ref="iva_pymes_sop_4" />
+        </record>
+
+        <record id="fptt_pymes_irpf20_4_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf20" />
+            <field name="tax_src_id" ref="iva_pymes_sop_4" />
+            <field name="tax_dest_id" ref="irpf_pymes_20" />
+        </record>
 
     <!-- Retenciones IRPF 19% fiscal.position.tax.template-->
 
+        <record id="fptt_pymes_irpf19sale_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf19" />
+            <field name="tax_src_id" ref="iva_pymes_rep_21" />
+            <field name="tax_dest_id" ref="iva_pymes_rep_21" />
+        </record>
+
+        <record id="fptt_pymes_irpf19sale_21_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf19" />
+            <field name="tax_src_id" ref="iva_pymes_rep_21" />
+            <field name="tax_dest_id" ref="irpf_pymes_sale_19" />
+        </record>
+
         <record id="fptt_pymes_irpf19sale_18" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_pymes_irpf19" />
             <field name="tax_src_id" ref="iva_pymes_rep_18" />
@@ -410,18 +1005,6 @@
             <field name="tax_dest_id" ref="irpf_pymes_sale_19" />
         </record>
 
-        <record id="fptt_pymes_irpf19sale_8" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_pymes_irpf19" />
-            <field name="tax_src_id" ref="iva_pymes_rep_8" />
-            <field name="tax_dest_id" ref="iva_pymes_rep_8" />
-        </record>
-
-        <record id="fptt_pymes_irpf19sale_8_2" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_pymes_irpf19" />
-            <field name="tax_src_id" ref="iva_pymes_rep_8" />
-            <field name="tax_dest_id" ref="irpf_pymes_sale_19" />
-        </record>
-
         <record id="fptt_pymes_irpf19sale_16" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_pymes_irpf19" />
             <field name="tax_src_id" ref="iva_pymes_rep_16" />
@@ -434,6 +1017,30 @@
             <field name="tax_dest_id" ref="irpf_pymes_sale_19" />
         </record>
 
+         <record id="fptt_pymes_irpf19sale_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf19" />
+            <field name="tax_src_id" ref="iva_pymes_rep_10" />
+            <field name="tax_dest_id" ref="iva_pymes_rep_10" />
+        </record>
+
+        <record id="fptt_pymes_irpf19sale_10_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf19" />
+            <field name="tax_src_id" ref="iva_pymes_rep_10" />
+            <field name="tax_dest_id" ref="irpf_pymes_sale_19" />
+        </record>
+
+        <record id="fptt_pymes_irpf19sale_8" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf19" />
+            <field name="tax_src_id" ref="iva_pymes_rep_8" />
+            <field name="tax_dest_id" ref="iva_pymes_rep_8" />
+        </record>
+
+        <record id="fptt_pymes_irpf19sale_8_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf19" />
+            <field name="tax_src_id" ref="iva_pymes_rep_8" />
+            <field name="tax_dest_id" ref="irpf_pymes_sale_19" />
+        </record>
+
         <record id="fptt_pymes_irpf19sale_7" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_pymes_irpf19" />
             <field name="tax_src_id" ref="iva_pymes_rep_7" />
@@ -458,6 +1065,18 @@
             <field name="tax_dest_id" ref="irpf_pymes_sale_19" />
         </record>
 
+        <record id="fptt_pymes_irpf19_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf19" />
+            <field name="tax_src_id" ref="iva_pymes_sop_21" />
+            <field name="tax_dest_id" ref="iva_pymes_sop_21" />
+        </record>
+
+        <record id="fptt_pymes_irpf19_21_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf19" />
+            <field name="tax_src_id" ref="iva_pymes_sop_21" />
+            <field name="tax_dest_id" ref="irpf_pymes_19" />
+        </record>
+
         <record id="fptt_pymes_irpf19_18" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_pymes_irpf19" />
             <field name="tax_src_id" ref="iva_pymes_sop_18" />
@@ -470,6 +1089,30 @@
             <field name="tax_dest_id" ref="irpf_pymes_19" />
         </record>
 
+         <record id="fptt_pymes_irpf19_16" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf19" />
+            <field name="tax_src_id" ref="iva_pymes_sop_16" />
+            <field name="tax_dest_id" ref="iva_pymes_sop_16" />
+        </record>
+
+        <record id="fptt_pymes_irpf19_16_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf19" />
+            <field name="tax_src_id" ref="iva_pymes_sop_16" />
+            <field name="tax_dest_id" ref="irpf_pymes_19" />
+        </record>
+
+        <record id="fptt_pymes_irpf19_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf19" />
+            <field name="tax_src_id" ref="iva_pymes_sop_10" />
+            <field name="tax_dest_id" ref="iva_pymes_sop_10" />
+        </record>
+
+        <record id="fptt_pymes_irpf19_10_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf19" />
+            <field name="tax_src_id" ref="iva_pymes_sop_10" />
+            <field name="tax_dest_id" ref="irpf_pymes_19" />
+        </record>
+
         <record id="fptt_pymes_irpf19_8" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_pymes_irpf19" />
             <field name="tax_src_id" ref="iva_pymes_sop_8" />
@@ -482,18 +1125,6 @@
             <field name="tax_dest_id" ref="irpf_pymes_19" />
         </record>
 
-        <record id="fptt_pymes_irpf19_16" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_pymes_irpf19" />
-            <field name="tax_src_id" ref="iva_pymes_sop_16" />
-            <field name="tax_dest_id" ref="iva_pymes_sop_16" />
-        </record>
-
-        <record id="fptt_pymes_irpf19_16_2" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_pymes_irpf19" />
-            <field name="tax_src_id" ref="iva_pymes_sop_16" />
-            <field name="tax_dest_id" ref="irpf_pymes_19" />
-        </record>
-
         <record id="fptt_pymes_irpf19_7" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_pymes_irpf19" />
             <field name="tax_src_id" ref="iva_pymes_sop_7" />
@@ -520,6 +1151,18 @@
 
     <!-- Retenciones IRPF 18% fiscal.position.tax.template-->
 
+        <record id="fptt_pymes_irpf18sale_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf18" />
+            <field name="tax_src_id" ref="iva_pymes_rep_21" />
+            <field name="tax_dest_id" ref="iva_pymes_rep_21" />
+        </record>
+
+        <record id="fptt_pymes_irpf18sale_21_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf18" />
+            <field name="tax_src_id" ref="iva_pymes_rep_21" />
+            <field name="tax_dest_id" ref="irpf_pymes_sale_18" />
+        </record>
+
         <record id="fptt_pymes_irpf18sale_18" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_pymes_irpf18" />
             <field name="tax_src_id" ref="iva_pymes_rep_18" />
@@ -532,18 +1175,6 @@
             <field name="tax_dest_id" ref="irpf_pymes_sale_18" />
         </record>
 
-        <record id="fptt_pymes_irpf18sale_8" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_pymes_irpf18" />
-            <field name="tax_src_id" ref="iva_pymes_rep_8" />
-            <field name="tax_dest_id" ref="iva_pymes_rep_8" />
-        </record>
-
-        <record id="fptt_pymes_irpf18sale_8_2" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_pymes_irpf18" />
-            <field name="tax_src_id" ref="iva_pymes_rep_8" />
-            <field name="tax_dest_id" ref="irpf_pymes_sale_18" />
-        </record>
-
         <record id="fptt_pymes_irpf18sale_16" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_pymes_irpf18" />
             <field name="tax_src_id" ref="iva_pymes_rep_16" />
@@ -556,6 +1187,30 @@
             <field name="tax_dest_id" ref="irpf_pymes_sale_18" />
         </record>
 
+        <record id="fptt_pymes_irpf18sale_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf18" />
+            <field name="tax_src_id" ref="iva_pymes_rep_10" />
+            <field name="tax_dest_id" ref="iva_pymes_rep_10" />
+        </record>
+
+        <record id="fptt_pymes_irpf18sale_10_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf18" />
+            <field name="tax_src_id" ref="iva_pymes_rep_10" />
+            <field name="tax_dest_id" ref="irpf_pymes_sale_18" />
+        </record>
+
+        <record id="fptt_pymes_irpf18sale_8" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf18" />
+            <field name="tax_src_id" ref="iva_pymes_rep_8" />
+            <field name="tax_dest_id" ref="iva_pymes_rep_8" />
+        </record>
+
+        <record id="fptt_pymes_irpf18sale_8_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf18" />
+            <field name="tax_src_id" ref="iva_pymes_rep_8" />
+            <field name="tax_dest_id" ref="irpf_pymes_sale_18" />
+        </record>
+
         <record id="fptt_pymes_irpf18sale_7" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_pymes_irpf18" />
             <field name="tax_src_id" ref="iva_pymes_rep_7" />
@@ -580,6 +1235,18 @@
             <field name="tax_dest_id" ref="irpf_pymes_sale_18" />
         </record>
 
+         <record id="fptt_pymes_irpf18_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf18" />
+            <field name="tax_src_id" ref="iva_pymes_sop_21" />
+            <field name="tax_dest_id" ref="iva_pymes_sop_21" />
+        </record>
+
+        <record id="fptt_pymes_irpf18_21_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf18" />
+            <field name="tax_src_id" ref="iva_pymes_sop_21" />
+            <field name="tax_dest_id" ref="irpf_pymes_18" />
+        </record>
+
         <record id="fptt_pymes_irpf18_18" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_pymes_irpf18" />
             <field name="tax_src_id" ref="iva_pymes_sop_18" />
@@ -592,18 +1259,6 @@
             <field name="tax_dest_id" ref="irpf_pymes_18" />
         </record>
 
-        <record id="fptt_pymes_irpf18_8" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_pymes_irpf18" />
-            <field name="tax_src_id" ref="iva_pymes_sop_8" />
-            <field name="tax_dest_id" ref="iva_pymes_sop_8" />
-        </record>
-
-        <record id="fptt_pymes_irpf18_8_2" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_pymes_irpf18" />
-            <field name="tax_src_id" ref="iva_pymes_sop_8" />
-            <field name="tax_dest_id" ref="irpf_pymes_18" />
-        </record>
-
         <record id="fptt_pymes_irpf18_16" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_pymes_irpf18" />
             <field name="tax_src_id" ref="iva_pymes_sop_16" />
@@ -616,6 +1271,30 @@
             <field name="tax_dest_id" ref="irpf_pymes_18" />
         </record>
 
+        <record id="fptt_pymes_irpf18_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf18" />
+            <field name="tax_src_id" ref="iva_pymes_sop_10" />
+            <field name="tax_dest_id" ref="iva_pymes_sop_10" />
+        </record>
+
+        <record id="fptt_pymes_irpf18_8_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf18" />
+            <field name="tax_src_id" ref="iva_pymes_sop_10" />
+            <field name="tax_dest_id" ref="irpf_pymes_18" />
+        </record>
+
+        <record id="fptt_pymes_irpf18_8" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf18" />
+            <field name="tax_src_id" ref="iva_pymes_sop_8" />
+            <field name="tax_dest_id" ref="iva_pymes_sop_8" />
+        </record>
+
+        <record id="fptt_pymes_irpf18_8_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf18" />
+            <field name="tax_src_id" ref="iva_pymes_sop_8" />
+            <field name="tax_dest_id" ref="irpf_pymes_18" />
+        </record>
+
         <record id="fptt_pymes_irpf18_7" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_pymes_irpf18" />
             <field name="tax_src_id" ref="iva_pymes_sop_7" />
@@ -642,6 +1321,18 @@
 
     <!-- Retenciones IRPF 15% fiscal.position.tax.template-->
 
+        <record id="fptt_pymes_irpf15sale_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf15" />
+            <field name="tax_src_id" ref="iva_pymes_rep_21" />
+            <field name="tax_dest_id" ref="iva_pymes_rep_21" />
+        </record>
+
+        <record id="fptt_pymes_irpf15sale_21_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf15" />
+            <field name="tax_src_id" ref="iva_pymes_rep_21" />
+            <field name="tax_dest_id" ref="irpf_pymes_sale_15" />
+        </record>
+
         <record id="fptt_pymes_irpf15sale_18" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_pymes_irpf15" />
             <field name="tax_src_id" ref="iva_pymes_rep_18" />
@@ -654,18 +1345,6 @@
             <field name="tax_dest_id" ref="irpf_pymes_sale_15" />
         </record>
 
-        <record id="fptt_pymes_irpf15sale_8" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_pymes_irpf15" />
-            <field name="tax_src_id" ref="iva_pymes_rep_8" />
-            <field name="tax_dest_id" ref="iva_pymes_rep_8" />
-        </record>
-
-        <record id="fptt_pymes_irpf15sale_8_2" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_pymes_irpf15" />
-            <field name="tax_src_id" ref="iva_pymes_rep_8" />
-            <field name="tax_dest_id" ref="irpf_pymes_sale_15" />
-        </record>
-
         <record id="fptt_pymes_irpf15sale_16" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_pymes_irpf15" />
             <field name="tax_src_id" ref="iva_pymes_rep_16" />
@@ -678,6 +1357,30 @@
             <field name="tax_dest_id" ref="irpf_pymes_sale_15" />
         </record>
 
+        <record id="fptt_pymes_irpf15sale_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf15" />
+            <field name="tax_src_id" ref="iva_pymes_rep_10" />
+            <field name="tax_dest_id" ref="iva_pymes_rep_10" />
+        </record>
+
+        <record id="fptt_pymes_irpf15sale_10_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf15" />
+            <field name="tax_src_id" ref="iva_pymes_rep_10" />
+            <field name="tax_dest_id" ref="irpf_pymes_sale_15" />
+        </record>
+
+        <record id="fptt_pymes_irpf15sale_8" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf15" />
+            <field name="tax_src_id" ref="iva_pymes_rep_8" />
+            <field name="tax_dest_id" ref="iva_pymes_rep_8" />
+        </record>
+
+        <record id="fptt_pymes_irpf15sale_8_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf15" />
+            <field name="tax_src_id" ref="iva_pymes_rep_8" />
+            <field name="tax_dest_id" ref="irpf_pymes_sale_15" />
+        </record>
+
         <record id="fptt_pymes_irpf15sale_7" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_pymes_irpf15" />
             <field name="tax_src_id" ref="iva_pymes_rep_7" />
@@ -702,6 +1405,18 @@
             <field name="tax_dest_id" ref="irpf_pymes_sale_15" />
         </record>
 
+        <record id="fptt_pymes_irpf15_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf15" />
+            <field name="tax_src_id" ref="iva_pymes_sop_21" />
+            <field name="tax_dest_id" ref="iva_pymes_sop_21" />
+        </record>
+
+        <record id="fptt_pymes_irpf15_21_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf15" />
+            <field name="tax_src_id" ref="iva_pymes_sop_21" />
+            <field name="tax_dest_id" ref="irpf_pymes_15" />
+        </record>
+
         <record id="fptt_pymes_irpf15_18" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_pymes_irpf15" />
             <field name="tax_src_id" ref="iva_pymes_sop_18" />
@@ -714,18 +1429,6 @@
             <field name="tax_dest_id" ref="irpf_pymes_15" />
         </record>
 
-        <record id="fptt_pymes_irpf15_8" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_pymes_irpf15" />
-            <field name="tax_src_id" ref="iva_pymes_sop_8" />
-            <field name="tax_dest_id" ref="iva_pymes_sop_8" />
-        </record>
-
-        <record id="fptt_pymes_irpf15_8_2" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_pymes_irpf15" />
-            <field name="tax_src_id" ref="iva_pymes_sop_8" />
-            <field name="tax_dest_id" ref="irpf_pymes_15" />
-        </record>
-
         <record id="fptt_pymes_irpf15_16" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_pymes_irpf15" />
             <field name="tax_src_id" ref="iva_pymes_sop_16" />
@@ -738,6 +1441,30 @@
             <field name="tax_dest_id" ref="irpf_pymes_15" />
         </record>
 
+        <record id="fptt_pymes_irpf15_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf15" />
+            <field name="tax_src_id" ref="iva_pymes_sop_10" />
+            <field name="tax_dest_id" ref="iva_pymes_sop_10" />
+        </record>
+
+        <record id="fptt_pymes_irpf15_10_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf15" />
+            <field name="tax_src_id" ref="iva_pymes_sop_10" />
+            <field name="tax_dest_id" ref="irpf_pymes_15" />
+        </record>
+
+        <record id="fptt_pymes_irpf15_8" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf15" />
+            <field name="tax_src_id" ref="iva_pymes_sop_8" />
+            <field name="tax_dest_id" ref="iva_pymes_sop_8" />
+        </record>
+
+        <record id="fptt_pymes_irpf15_8_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf15" />
+            <field name="tax_src_id" ref="iva_pymes_sop_8" />
+            <field name="tax_dest_id" ref="irpf_pymes_15" />
+        </record>
+
         <record id="fptt_pymes_irpf15_7" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_pymes_irpf15" />
             <field name="tax_src_id" ref="iva_pymes_sop_7" />
@@ -762,8 +1489,142 @@
             <field name="tax_dest_id" ref="irpf_pymes_15" />
         </record>
 
+    <!-- Retenciones IRPF 9% fiscal.position.tax.template-->
+
+        <record id="fptt_pymes_irpf9sale_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf9" />
+            <field name="tax_src_id" ref="iva_pymes_rep_21" />
+            <field name="tax_dest_id" ref="iva_pymes_rep_21" />
+        </record>
+
+        <record id="fptt_pymes_irpf9sale_21_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf9" />
+            <field name="tax_src_id" ref="iva_pymes_rep_21" />
+            <field name="tax_dest_id" ref="irpf_pymes_sale_9" />
+        </record>
+
+        <record id="fptt_pymes_irpf9sale_18" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf9" />
+            <field name="tax_src_id" ref="iva_pymes_rep_18" />
+            <field name="tax_dest_id" ref="iva_pymes_rep_18" />
+        </record>
+
+        <record id="fptt_pymes_irpf9sale_18_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf9" />
+            <field name="tax_src_id" ref="iva_pymes_rep_18" />
+            <field name="tax_dest_id" ref="irpf_pymes_sale_9" />
+        </record>
+
+        <record id="fptt_pymes_irpf9sale_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf9" />
+            <field name="tax_src_id" ref="iva_pymes_rep_10" />
+            <field name="tax_dest_id" ref="iva_pymes_rep_10" />
+        </record>
+
+        <record id="fptt_pymes_irpf9sale_10_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf9" />
+            <field name="tax_src_id" ref="iva_pymes_rep_10" />
+            <field name="tax_dest_id" ref="irpf_pymes_sale_9" />
+        </record>
+
+        <record id="fptt_pymes_irpf9sale_8" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf9" />
+            <field name="tax_src_id" ref="iva_pymes_rep_8" />
+            <field name="tax_dest_id" ref="iva_pymes_rep_8" />
+        </record>
+
+        <record id="fptt_pymes_irpf9sale_8_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf9" />
+            <field name="tax_src_id" ref="iva_pymes_rep_8" />
+            <field name="tax_dest_id" ref="irpf_pymes_sale_9" />
+        </record>
+
+        <record id="fptt_pymes_irpf9sale_4" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf9" />
+            <field name="tax_src_id" ref="iva_pymes_rep_4" />
+            <field name="tax_dest_id" ref="iva_pymes_rep_4" />
+        </record>
+
+        <record id="fptt_pymes_irpf9sale_4_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf9" />
+            <field name="tax_src_id" ref="iva_pymes_rep_4" />
+            <field name="tax_dest_id" ref="irpf_pymes_sale_9" />
+        </record>
+
+        <record id="fptt_pymes_irpf9_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf9" />
+            <field name="tax_src_id" ref="iva_pymes_sop_21" />
+            <field name="tax_dest_id" ref="iva_pymes_sop_21" />
+        </record>
+
+        <record id="fptt_pymes_irpf9_21_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf9" />
+            <field name="tax_src_id" ref="iva_pymes_sop_21" />
+            <field name="tax_dest_id" ref="irpf_pymes_9" />
+        </record>
+
+        <record id="fptt_pymes_irpf9_18" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf9" />
+            <field name="tax_src_id" ref="iva_pymes_sop_18" />
+            <field name="tax_dest_id" ref="iva_pymes_sop_18" />
+        </record>
+
+        <record id="fptt_pymes_irpf9_18_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf9" />
+            <field name="tax_src_id" ref="iva_pymes_sop_18" />
+            <field name="tax_dest_id" ref="irpf_pymes_9" />
+        </record>
+
+         <record id="fptt_pymes_irpf9_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf9" />
+            <field name="tax_src_id" ref="iva_pymes_sop_10" />
+            <field name="tax_dest_id" ref="iva_pymes_sop_10" />
+        </record>
+
+        <record id="fptt_pymes_irpf9_10_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf9" />
+            <field name="tax_src_id" ref="iva_pymes_sop_10" />
+            <field name="tax_dest_id" ref="irpf_pymes_9" />
+        </record>
+
+        <record id="fptt_pymes_irpf9_8" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf9" />
+            <field name="tax_src_id" ref="iva_pymes_sop_8" />
+            <field name="tax_dest_id" ref="iva_pymes_sop_8" />
+        </record>
+
+        <record id="fptt_pymes_irpf9_8_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf9" />
+            <field name="tax_src_id" ref="iva_pymes_sop_8" />
+            <field name="tax_dest_id" ref="irpf_pymes_9" />
+        </record>
+
+        <record id="fptt_pymes_irpf9_4" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf9" />
+            <field name="tax_src_id" ref="iva_pymes_sop_4" />
+            <field name="tax_dest_id" ref="iva_pymes_sop_4" />
+        </record>
+
+        <record id="fptt_pymes_irpf9_4_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf9" />
+            <field name="tax_src_id" ref="iva_pymes_sop_4" />
+            <field name="tax_dest_id" ref="irpf_pymes_9" />
+        </record>
+
     <!-- Retenciones IRPF 7% fiscal.position.tax.template-->
 
+        <record id="fptt_pymes_irpf7sale_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf7" />
+            <field name="tax_src_id" ref="iva_pymes_rep_21" />
+            <field name="tax_dest_id" ref="iva_pymes_rep_21" />
+        </record>
+
+        <record id="fptt_pymes_irpf7sale_21_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf7" />
+            <field name="tax_src_id" ref="iva_pymes_rep_21" />
+            <field name="tax_dest_id" ref="irpf_pymes_sale_7" />
+        </record>
+
         <record id="fptt_pymes_irpf7sale_18" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_pymes_irpf7" />
             <field name="tax_src_id" ref="iva_pymes_rep_18" />
@@ -776,18 +1637,6 @@
             <field name="tax_dest_id" ref="irpf_pymes_sale_7" />
         </record>
 
-        <record id="fptt_pymes_irpf7sale_8" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_pymes_irpf7" />
-            <field name="tax_src_id" ref="iva_pymes_rep_8" />
-            <field name="tax_dest_id" ref="iva_pymes_rep_8" />
-        </record>
-
-        <record id="fptt_pymes_irpf7sale_8_2" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_pymes_irpf7" />
-            <field name="tax_src_id" ref="iva_pymes_rep_8" />
-            <field name="tax_dest_id" ref="irpf_pymes_sale_7" />
-        </record>
-
         <record id="fptt_pymes_irpf7sale_16" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_pymes_irpf7" />
             <field name="tax_src_id" ref="iva_pymes_rep_16" />
@@ -800,6 +1649,30 @@
             <field name="tax_dest_id" ref="irpf_pymes_sale_7" />
         </record>
 
+        <record id="fptt_pymes_irpf7sale_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf7" />
+            <field name="tax_src_id" ref="iva_pymes_rep_10" />
+            <field name="tax_dest_id" ref="iva_pymes_rep_10" />
+        </record>
+
+        <record id="fptt_pymes_irpf7sale_10_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf7" />
+            <field name="tax_src_id" ref="iva_pymes_rep_10" />
+            <field name="tax_dest_id" ref="irpf_pymes_sale_7" />
+        </record>
+
+        <record id="fptt_pymes_irpf7sale_8" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf7" />
+            <field name="tax_src_id" ref="iva_pymes_rep_8" />
+            <field name="tax_dest_id" ref="iva_pymes_rep_8" />
+        </record>
+
+        <record id="fptt_pymes_irpf7sale_8_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf7" />
+            <field name="tax_src_id" ref="iva_pymes_rep_8" />
+            <field name="tax_dest_id" ref="irpf_pymes_sale_7" />
+        </record>
+
         <record id="fptt_pymes_irpf7sale_7" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_pymes_irpf7" />
             <field name="tax_src_id" ref="iva_pymes_rep_7" />
@@ -824,6 +1697,18 @@
             <field name="tax_dest_id" ref="irpf_pymes_sale_7" />
         </record>
 
+        <record id="fptt_pymes_irpf7_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf7" />
+            <field name="tax_src_id" ref="iva_pymes_sop_21" />
+            <field name="tax_dest_id" ref="iva_pymes_sop_21" />
+        </record>
+
+        <record id="fptt_pymes_irpf7_21_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf7" />
+            <field name="tax_src_id" ref="iva_pymes_sop_21" />
+            <field name="tax_dest_id" ref="irpf_pymes_7" />
+        </record>
+
         <record id="fptt_pymes_irpf7_18" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_pymes_irpf7" />
             <field name="tax_src_id" ref="iva_pymes_sop_18" />
@@ -836,6 +1721,30 @@
             <field name="tax_dest_id" ref="irpf_pymes_7" />
         </record>
 
+        <record id="fptt_pymes_irpf7_16" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf7" />
+            <field name="tax_src_id" ref="iva_pymes_sop_16" />
+            <field name="tax_dest_id" ref="iva_pymes_sop_16" />
+        </record>
+
+        <record id="fptt_pymes_irpf7_16_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf7" />
+            <field name="tax_src_id" ref="iva_pymes_sop_16" />
+            <field name="tax_dest_id" ref="irpf_pymes_7" />
+        </record>
+
+         <record id="fptt_pymes_irpf7_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf7" />
+            <field name="tax_src_id" ref="iva_pymes_sop_10" />
+            <field name="tax_dest_id" ref="iva_pymes_sop_10" />
+        </record>
+
+        <record id="fptt_pymes_irpf7_10_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf7" />
+            <field name="tax_src_id" ref="iva_pymes_sop_10" />
+            <field name="tax_dest_id" ref="irpf_pymes_7" />
+        </record>
+
         <record id="fptt_pymes_irpf7_8" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_pymes_irpf7" />
             <field name="tax_src_id" ref="iva_pymes_sop_8" />
@@ -848,17 +1757,6 @@
             <field name="tax_dest_id" ref="irpf_pymes_7" />
         </record>
 
-        <record id="fptt_pymes_irpf7_16" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_pymes_irpf7" />
-            <field name="tax_src_id" ref="iva_pymes_sop_16" />
-            <field name="tax_dest_id" ref="iva_pymes_sop_16" />
-        </record>
-
-        <record id="fptt_pymes_irpf7_16_2" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_pymes_irpf7" />
-            <field name="tax_src_id" ref="iva_pymes_sop_16" />
-            <field name="tax_dest_id" ref="irpf_pymes_7" />
-        </record>
 
         <record id="fptt_pymes_irpf7_7" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_pymes_irpf7" />
@@ -886,6 +1784,18 @@
 
     <!-- Retenciones IRPF 2% fiscal.position.tax.template-->
 
+        <record id="fptt_pymes_irpf2sale_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf2" />
+            <field name="tax_src_id" ref="iva_pymes_rep_21" />
+            <field name="tax_dest_id" ref="iva_pymes_rep_21" />
+        </record>
+
+        <record id="fptt_pymes_irpf2sale_21_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf2" />
+            <field name="tax_src_id" ref="iva_pymes_rep_21" />
+            <field name="tax_dest_id" ref="irpf_pymes_sale_2" />
+        </record>
+
         <record id="fptt_pymes_irpf2sale_18" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_pymes_irpf2" />
             <field name="tax_src_id" ref="iva_pymes_rep_18" />
@@ -898,18 +1808,6 @@
             <field name="tax_dest_id" ref="irpf_pymes_sale_2" />
         </record>
 
-        <record id="fptt_pymes_irpf2sale_8" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_pymes_irpf2" />
-            <field name="tax_src_id" ref="iva_pymes_rep_8" />
-            <field name="tax_dest_id" ref="iva_pymes_rep_8" />
-        </record>
-
-        <record id="fptt_pymes_irpf2sale_8_2" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_pymes_irpf2" />
-            <field name="tax_src_id" ref="iva_pymes_rep_8" />
-            <field name="tax_dest_id" ref="irpf_pymes_sale_2" />
-        </record>
-
         <record id="fptt_pymes_irpf2sale_16" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_pymes_irpf2" />
             <field name="tax_src_id" ref="iva_pymes_rep_16" />
@@ -922,6 +1820,30 @@
             <field name="tax_dest_id" ref="irpf_pymes_sale_2" />
         </record>
 
+        <record id="fptt_pymes_irpf2sale_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf2" />
+            <field name="tax_src_id" ref="iva_pymes_rep_10" />
+            <field name="tax_dest_id" ref="iva_pymes_rep_10" />
+        </record>
+
+        <record id="fptt_pymes_irpf2sale_10_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf2" />
+            <field name="tax_src_id" ref="iva_pymes_rep_10" />
+            <field name="tax_dest_id" ref="irpf_pymes_sale_2" />
+        </record>
+
+        <record id="fptt_pymes_irpf2sale_8" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf2" />
+            <field name="tax_src_id" ref="iva_pymes_rep_8" />
+            <field name="tax_dest_id" ref="iva_pymes_rep_8" />
+        </record>
+
+        <record id="fptt_pymes_irpf2sale_8_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf2" />
+            <field name="tax_src_id" ref="iva_pymes_rep_8" />
+            <field name="tax_dest_id" ref="irpf_pymes_sale_2" />
+        </record>
+
         <record id="fptt_pymes_irpf2sale_7" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_pymes_irpf2" />
             <field name="tax_src_id" ref="iva_pymes_rep_7" />
@@ -946,6 +1868,18 @@
             <field name="tax_dest_id" ref="irpf_pymes_sale_2" />
         </record>
 
+        <record id="fptt_pymes_irpf2_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf2" />
+            <field name="tax_src_id" ref="iva_pymes_sop_21" />
+            <field name="tax_dest_id" ref="iva_pymes_sop_21" />
+        </record>
+
+        <record id="fptt_pymes_irpf2_21_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf2" />
+            <field name="tax_src_id" ref="iva_pymes_sop_21" />
+            <field name="tax_dest_id" ref="irpf_pymes_2" />
+        </record>
+
         <record id="fptt_pymes_irpf2_18" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_pymes_irpf2" />
             <field name="tax_src_id" ref="iva_pymes_sop_18" />
@@ -958,18 +1892,6 @@
             <field name="tax_dest_id" ref="irpf_pymes_2" />
         </record>
 
-        <record id="fptt_pymes_irpf2_8" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_pymes_irpf2" />
-            <field name="tax_src_id" ref="iva_pymes_sop_8" />
-            <field name="tax_dest_id" ref="iva_pymes_sop_8" />
-        </record>
-
-        <record id="fptt_pymes_irpf2_8_2" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_pymes_irpf2" />
-            <field name="tax_src_id" ref="iva_pymes_sop_8" />
-            <field name="tax_dest_id" ref="irpf_pymes_2" />
-        </record>
-
         <record id="fptt_pymes_irpf2_16" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_pymes_irpf2" />
             <field name="tax_src_id" ref="iva_pymes_sop_16" />
@@ -982,6 +1904,30 @@
             <field name="tax_dest_id" ref="irpf_pymes_2" />
         </record>
 
+        <record id="fptt_pymes_irpf2_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf2" />
+            <field name="tax_src_id" ref="iva_pymes_sop_10" />
+            <field name="tax_dest_id" ref="iva_pymes_sop_10" />
+        </record>
+
+        <record id="fptt_pymes_irpf2_10_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf2" />
+            <field name="tax_src_id" ref="iva_pymes_sop_10" />
+            <field name="tax_dest_id" ref="irpf_pymes_2" />
+        </record>
+
+        <record id="fptt_pymes_irpf2_8" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf2" />
+            <field name="tax_src_id" ref="iva_pymes_sop_8" />
+            <field name="tax_dest_id" ref="iva_pymes_sop_8" />
+        </record>
+
+        <record id="fptt_pymes_irpf2_8_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf2" />
+            <field name="tax_src_id" ref="iva_pymes_sop_8" />
+            <field name="tax_dest_id" ref="irpf_pymes_2" />
+        </record>
+
         <record id="fptt_pymes_irpf2_7" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_pymes_irpf2" />
             <field name="tax_src_id" ref="iva_pymes_sop_7" />
@@ -1008,6 +1954,18 @@
 
     <!-- Retenciones IRPF 1% fiscal.position.tax.template-->
 
+        <record id="fptt_pymes_irpf1sale_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf1" />
+            <field name="tax_src_id" ref="iva_pymes_rep_21" />
+            <field name="tax_dest_id" ref="iva_pymes_rep_21" />
+        </record>
+
+        <record id="fptt_pymes_irpf1sale_21_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf1" />
+            <field name="tax_src_id" ref="iva_pymes_rep_21" />
+            <field name="tax_dest_id" ref="irpf_pymes_sale_1" />
+        </record>
+
         <record id="fptt_pymes_irpf1sale_18" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_pymes_irpf1" />
             <field name="tax_src_id" ref="iva_pymes_rep_18" />
@@ -1020,18 +1978,6 @@
             <field name="tax_dest_id" ref="irpf_pymes_sale_1" />
         </record>
 
-        <record id="fptt_pymes_irpf1sale_8" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_pymes_irpf1" />
-            <field name="tax_src_id" ref="iva_pymes_rep_8" />
-            <field name="tax_dest_id" ref="iva_pymes_rep_8" />
-        </record>
-
-        <record id="fptt_pymes_irpf1sale_8_2" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_pymes_irpf1" />
-            <field name="tax_src_id" ref="iva_pymes_rep_8" />
-            <field name="tax_dest_id" ref="irpf_pymes_sale_1" />
-        </record>
-
         <record id="fptt_pymes_irpf1sale_16" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_pymes_irpf1" />
             <field name="tax_src_id" ref="iva_pymes_rep_16" />
@@ -1044,6 +1990,30 @@
             <field name="tax_dest_id" ref="irpf_pymes_sale_1" />
         </record>
 
+        <record id="fptt_pymes_irpf1sale_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf1" />
+            <field name="tax_src_id" ref="iva_pymes_rep_10" />
+            <field name="tax_dest_id" ref="iva_pymes_rep_10" />
+        </record>
+
+        <record id="fptt_pymes_irpf1sale_10_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf1" />
+            <field name="tax_src_id" ref="iva_pymes_rep_10" />
+            <field name="tax_dest_id" ref="irpf_pymes_sale_1" />
+        </record>
+
+        <record id="fptt_pymes_irpf1sale_8" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf1" />
+            <field name="tax_src_id" ref="iva_pymes_rep_8" />
+            <field name="tax_dest_id" ref="iva_pymes_rep_8" />
+        </record>
+
+        <record id="fptt_pymes_irpf1sale_8_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf1" />
+            <field name="tax_src_id" ref="iva_pymes_rep_8" />
+            <field name="tax_dest_id" ref="irpf_pymes_sale_1" />
+        </record>
+
         <record id="fptt_pymes_irpf1sale_7" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_pymes_irpf1" />
             <field name="tax_src_id" ref="iva_pymes_rep_7" />
@@ -1068,6 +2038,18 @@
             <field name="tax_dest_id" ref="irpf_pymes_sale_1" />
         </record>
 
+        <record id="fptt_pymes_irpf1_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf1" />
+            <field name="tax_src_id" ref="iva_pymes_sop_21" />
+            <field name="tax_dest_id" ref="iva_pymes_sop_21" />
+        </record>
+
+        <record id="fptt_pymes_irpf1_21_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf1" />
+            <field name="tax_src_id" ref="iva_pymes_sop_21" />
+            <field name="tax_dest_id" ref="irpf_pymes_1" />
+        </record>
+
         <record id="fptt_pymes_irpf1_18" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_pymes_irpf1" />
             <field name="tax_src_id" ref="iva_pymes_sop_18" />
@@ -1080,6 +2062,30 @@
             <field name="tax_dest_id" ref="irpf_pymes_1" />
         </record>
 
+         <record id="fptt_pymes_irpf1_16" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf1" />
+            <field name="tax_src_id" ref="iva_pymes_sop_16" />
+            <field name="tax_dest_id" ref="iva_pymes_sop_16" />
+        </record>
+
+        <record id="fptt_pymes_irpf1_16_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf1" />
+            <field name="tax_src_id" ref="iva_pymes_sop_16" />
+            <field name="tax_dest_id" ref="irpf_pymes_1" />
+        </record>
+
+        <record id="fptt_pymes_irpf1_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf1" />
+            <field name="tax_src_id" ref="iva_pymes_sop_10" />
+            <field name="tax_dest_id" ref="iva_pymes_sop_10" />
+        </record>
+
+        <record id="fptt_pymes_irpf1_10_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf1" />
+            <field name="tax_src_id" ref="iva_pymes_sop_10" />
+            <field name="tax_dest_id" ref="irpf_pymes_1" />
+        </record>
+
         <record id="fptt_pymes_irpf1_8" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_pymes_irpf1" />
             <field name="tax_src_id" ref="iva_pymes_sop_8" />
@@ -1092,18 +2098,6 @@
             <field name="tax_dest_id" ref="irpf_pymes_1" />
         </record>
 
-        <record id="fptt_pymes_irpf1_16" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_pymes_irpf1" />
-            <field name="tax_src_id" ref="iva_pymes_sop_16" />
-            <field name="tax_dest_id" ref="iva_pymes_sop_16" />
-        </record>
-
-        <record id="fptt_pymes_irpf1_16_2" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_pymes_irpf1" />
-            <field name="tax_src_id" ref="iva_pymes_sop_16" />
-            <field name="tax_dest_id" ref="irpf_pymes_1" />
-        </record>
-
         <record id="fptt_pymes_irpf1_7" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_pymes_irpf1" />
             <field name="tax_src_id" ref="iva_pymes_sop_7" />
@@ -1128,5 +2122,222 @@
             <field name="tax_dest_id" ref="irpf_pymes_1" />
         </record>
 
+        <record id="fptt_pymes_irpf21sale_ex" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf21" />
+            <field name="tax_src_id" ref="iva_pymes_rep_ex" />
+            <field name="tax_dest_id" ref="iva_pymes_rep_ex" />
+        </record>
+
+        <record id="fptt_pymes_irpf21sale_ex_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf21" />
+            <field name="tax_src_id" ref="iva_pymes_rep_ex" />
+            <field name="tax_dest_id" ref="irpf_pymes_sale_21" />
+        </record>
+
+        <record id="fptt_pymes_irpf20sale_ex" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf20" />
+            <field name="tax_src_id" ref="iva_pymes_rep_ex" />
+            <field name="tax_dest_id" ref="iva_pymes_rep_ex" />
+        </record>
+
+        <record id="fptt_pymes_irpf20sale_ex_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf20" />
+            <field name="tax_src_id" ref="iva_pymes_rep_ex" />
+            <field name="tax_dest_id" ref="irpf_pymes_sale_20" />
+        </record> 
+
+        <record id="fptt_pymes_irpf19sale_ex" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf19" />
+            <field name="tax_src_id" ref="iva_pymes_rep_ex" />
+            <field name="tax_dest_id" ref="iva_pymes_rep_ex" />
+        </record>
+
+        <record id="fptt_pymes_irpf19sale_ex_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf19" />
+            <field name="tax_src_id" ref="iva_pymes_rep_ex" />
+            <field name="tax_dest_id" ref="irpf_pymes_sale_19" />
+        </record>        
+
+        <record id="fptt_pymes_irpf18sale_ex" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf18" />
+            <field name="tax_src_id" ref="iva_pymes_rep_ex" />
+            <field name="tax_dest_id" ref="iva_pymes_rep_ex" />
+        </record>
+
+        <record id="fptt_pymes_irpf18sale_ex_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf18"/>
+            <field name="tax_src_id" ref="iva_pymes_rep_ex" />
+            <field name="tax_dest_id" ref="irpf_pymes_sale_18" />
+        </record>        
+
+        <record id="fptt_pymes_irpf15sale_ex" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf15" />
+            <field name="tax_src_id" ref="iva_pymes_rep_ex" />
+            <field name="tax_dest_id" ref="iva_pymes_rep_ex" />
+        </record>
+
+        <record id="fptt_pymes_irpf15sale_ex_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf15" />
+            <field name="tax_src_id" ref="iva_pymes_rep_ex" />
+            <field name="tax_dest_id" ref="irpf_pymes_sale_15" />
+        </record>        
+
+        <record id="fptt_pymes_irpf9sale_ex" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf9" />            
+            <field name="tax_src_id" ref="iva_pymes_rep_ex" />
+            <field name="tax_dest_id" ref="iva_pymes_rep_ex" />
+        </record>
+
+        <record id="fptt_pymes_irpf9sale_ex_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf9" />
+            <field name="tax_src_id" ref="iva_pymes_rep_ex" />
+            <field name="tax_dest_id" ref="irpf_pymes_sale_9" />
+        </record>
+        
+        <record id="fptt_pymes_irpf7sale_ex" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf7" />            
+            <field name="tax_src_id" ref="iva_pymes_rep_ex" />
+            <field name="tax_dest_id" ref="iva_pymes_rep_ex" />
+        </record>
+
+        <record id="fptt_pymes_irpf7sale_ex_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf7" />
+            <field name="tax_src_id" ref="iva_pymes_rep_ex" />
+            <field name="tax_dest_id" ref="irpf_pymes_sale_7" />
+        </record>
+
+        <record id="fptt_pymes_irpf2sale_ex" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf2" />            
+            <field name="tax_src_id" ref="iva_pymes_rep_ex" />
+            <field name="tax_dest_id" ref="iva_pymes_rep_ex" />
+        </record>
+
+        <record id="fptt_pymes_irpf2sale_ex_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf2" />
+            <field name="tax_src_id" ref="iva_pymes_rep_ex" />
+            <field name="tax_dest_id" ref="irpf_pymes_sale_2" />
+        </record>
+
+        <record id="fptt_pymes_irpf1sale_ex" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf1" />
+            <field name="tax_src_id" ref="iva_pymes_rep_ex" />
+            <field name="tax_dest_id" ref="iva_pymes_rep_ex" />
+        </record>
+
+        <record id="fptt_pymes_irpf1sale_ex_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf1" />
+            <field name="tax_src_id" ref="iva_pymes_rep_ex" />
+            <field name="tax_dest_id" ref="irpf_pymes_sale_1" />
+        </record>
+        
+        <!-- IVA SOPORTADO -->
+        
+        <record id="fptt_pymes_irpf21_0" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf21"/>
+            <field name="tax_src_id" ref="iva_pymes_sop_ex" />
+            <field name="tax_dest_id" ref="iva_pymes_sop_ex" />
+        </record>
+
+        <record id="fptt_pymes_irpf21_0_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf21"/>
+            <field name="tax_src_id" ref="iva_pymes_sop_ex" />
+            <field name="tax_dest_id" ref="irpf_pymes_21" />
+        </record>
+
+        <record id="fptt_pymes_irpf20_0" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf20"/>
+            <field name="tax_src_id" ref="iva_pymes_sop_ex" />
+            <field name="tax_dest_id" ref="iva_pymes_sop_ex" />
+        </record>
+
+        <record id="fptt_pymes_irpf20_0_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf20"/>
+            <field name="tax_src_id" ref="iva_pymes_sop_ex" />
+            <field name="tax_dest_id" ref="irpf_pymes_20" />
+        </record>
+
+        <record id="fptt_pymes_irpf19_0" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf19"/>
+            <field name="tax_src_id" ref="iva_pymes_sop_ex" />
+            <field name="tax_dest_id" ref="iva_pymes_sop_ex" />
+        </record>
+
+        <record id="fptt_pymes_irpf19_0_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf19"/>
+            <field name="tax_src_id" ref="iva_pymes_sop_ex" />
+            <field name="tax_dest_id" ref="irpf_pymes_19" />
+        </record>
+        
+        <record id="fptt_pymes_irpf18_0" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf18" />
+            <field name="tax_src_id" ref="iva_pymes_sop_ex" />
+            <field name="tax_dest_id" ref="iva_pymes_sop_ex" />
+        </record>
+
+        <record id="fptt_pymes_irpf18_0_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf18" />
+            <field name="tax_src_id" ref="iva_pymes_sop_ex" />
+            <field name="tax_dest_id" ref="irpf_pymes_18" />
+        </record>
+        
+        <record id="fptt_pymes_irpf15_0" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf15" />
+            <field name="tax_src_id" ref="iva_pymes_sop_ex" />
+            <field name="tax_dest_id" ref="iva_pymes_sop_ex" />
+        </record>
+
+        <record id="fptt_pymes_irpf15_0_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf15"/>
+            <field name="tax_src_id" ref="iva_pymes_sop_ex" />
+            <field name="tax_dest_id" ref="irpf_pymes_15" />
+        </record>
+        
+        <record id="fptt_pymes_irpf9_0" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf9" />
+            <field name="tax_src_id" ref="iva_pymes_sop_ex" />
+            <field name="tax_dest_id" ref="iva_pymes_sop_ex" />
+        </record>
+
+        <record id="fptt_pymes_irpf9_0_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf9" />
+            <field name="tax_src_id" ref="iva_pymes_sop_ex" />
+            <field name="tax_dest_id" ref="irpf_pymes_9" />
+        </record>        
+
+        <record id="fptt_pymes_irpf7_0" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf7" />
+            <field name="tax_src_id" ref="iva_pymes_sop_ex" />
+            <field name="tax_dest_id" ref="iva_pymes_sop_ex" />
+        </record>
+
+        <record id="fptt_pymes_irpf7_0_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf7" />
+            <field name="tax_src_id" ref="iva_pymes_sop_ex" />
+            <field name="tax_dest_id" ref="irpf_pymes_7" />
+        </record>        
+
+        <record id="fptt_pymes_irpf2_0" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf2" />
+            <field name="tax_src_id" ref="iva_pymes_sop_ex" />
+            <field name="tax_dest_id" ref="iva_pymes_sop_ex" />
+        </record>
+
+        <record id="fptt_pymes_irpf2_0_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf2" />
+            <field name="tax_src_id" ref="iva_pymes_sop_ex" />
+            <field name="tax_dest_id" ref="irpf_pymes_2" />
+        </record>
+        
+        <record id="fptt_pymes_irpf1_0" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf1" />
+            <field name="tax_src_id" ref="iva_pymes_sop_ex" />
+            <field name="tax_dest_id" ref="iva_pymes_sop_ex" />
+        </record>
+
+        <record id="fptt_pymes_irpf1_0_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf1" />
+            <field name="tax_src_id" ref="iva_pymes_sop_ex" />
+            <field name="tax_dest_id" ref="irpf_pymes_1" />
+        </record> 
     </data>
 </openerp>
diff --git a/addons/l10n_es/taxes_data.xml b/addons/l10n_es/taxes_data.xml
index 41b52ee077d..586358ffc70 100644
--- a/addons/l10n_es/taxes_data.xml
+++ b/addons/l10n_es/taxes_data.xml
@@ -1,25 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data noupdate="1">
-        
-     <!--
-     Definición de IVA y retenciones, códigos de impuestos y cuentas contables adicionales
-        
+    <data noupdate="0">
+
+    <!-- Definición de IVA y retenciones, códigos de impuestos y cuentas contables adicionales -->
+
+    <!-- Plantillas de impuestos para el Plan General Contable 2008.
+
       Jordi Esteve (Zikzakmedia) - jesteve@zikzakmedia.com (2009-11-28)
         Impuestos IRPF se les ha asignado el grupo others (Otros) en lugar del grupo vat (IVA) por defecto
 
       Jordi Esteve (Zikzakmedia) - jesteve@zikzakmedia.com (2010-02-18)
-           Añadido IRPF 2% (act. agrícolas, ganaderas, forestales), 19% y 21% (antiguo 18%)
+        Añadido IRPF 2% (act. agrícolas, ganaderas, forestales), 19% y 21% (antiguo 18%)
         Novedad 2010: Los rendimientos derivados de rentas de capital mobiliario o inmobiliario, el tipo base de retención pasa del 18% al 19% para los primeros 6000 EUR y al 21% a partir de los 6000 EUR.
-     -->
-        
+
+      Ignacio Ibeas (Acysos) - ignacio@acysos.com (2011-02-22)
+        Modificado type_tax_use de los recargos de equivalencia a "all"
+
+      Jordi Esteve (Zikzakmedia) - jesteve@zikzakmedia.com (2011-08-29)
+        Cambiado Recargos de equivalencia de "all" a "venta" (ya existen los de compra). Ahora quedan definidos de la misma forma que en taxes_data_pymes.xml
+
+      Pedro M. Baeza (Serv. Tecnol. Avanzados) - pedro.baeza@serviciosbaeza.com (2013-01-29)
+        Limpieza de subcuentas de impuestos y corrección de inversión de sujeto pasivo
+
+    -->
+
+
 <!-- Configuracion de codigos de impuesto-->
-        
-    
+
+
     <!-- *********************************************** -->
     <!--IVA DEVENGADO -->
     <!-- *********************************************** -->
-    
+
     <!--Base imponible-->
     <!-- *********************************************** -->
         <record id="iva_dev_base" model="account.tax.code.template">
@@ -28,46 +40,102 @@
             <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>         	
+
+        <!-- IVA Soportado -->
+        <record id="iva_sop_ex" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+            <field name="name">IVA Soportado exento (operaciones corrientes)</field>
+            <field eval="0.0" name="amount"/>
+            <field name="type">percent</field>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field name="base_code_id" ref="base_sop_ex"/>
+            <field name="ref_base_code_id" ref="base_sop_ex"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <!-- IVA REPERCUTIDO-->
+        <record id="iva_rep_ex" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+            <field name="name">IVA Exento</field>
+            <field eval="0.0" name="amount"/>
+            <field name="type">percent</field>
+            <field name="base_code_id" ref="base_rep_ex"/>
+            <field name="ref_base_code_id" ref="base_rep_ex"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">sale</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" model="account.tax.code.template">
             <field name="name">Régimen general IVA Devengado. Base Imponible 7%</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_04_8" model="account.tax.code.template">
             <field name="name">Régimen general IVA Devengado. Base Imponible 8%</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_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" model="account.tax.code.template">
             <field name="name">Régimen general IVA Devengado. Base Imponible 16%</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_07_18" model="account.tax.code.template">
             <field name="name">Régimen general IVA Devengado. Base Imponible 18%</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_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>
+
         <!-- RECARGO DE EQUIVALENCIA -->
         <!--record id="re_base" model="account.tax.code.template">
             <field name="name">Recargo Equivalencia Base Imponible</field>
@@ -75,73 +143,93 @@
             <field name="sign">1.0</field>
             <field name="parent_id" ref="iva_dev_base"/>
         </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" model="account.tax.code.template">
             <field name="name">Recargo Equivalencia Base Imponible 1%</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_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" model="account.tax.code.template">
             <field name="name">Recargo Equivalencia Base Imponible 4%</field>
             <field name="code">[16]</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" model="account.tax.code.template">
             <field name="name">Régimen general IVA Devengado. Cuota 7%</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_06_8" model="account.tax.code.template">
             <field name="name">Régimen general IVA Devengado. Cuota 8%</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_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" model="account.tax.code.template">
             <field name="name">Régimen general IVA Devengado. Cuota 16%</field>
             <field name="code">[09]</field>
@@ -155,7 +243,14 @@
             <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>
+
         <!-- RECARGO DE EQUIVALENCIA -->
         <!--record id="re_base" model="account.tax.code.template">
             <field name="name">Recargo Equivalencia Base Imponible</field>
@@ -163,47 +258,61 @@
             <field name="sign">1.0</field>
             <field name="parent_id" ref="iva_dev_base"/>
         </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" model="account.tax.code.template">
             <field name="name">Recargo Equivalencia. Cuota 1%</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_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" model="account.tax.code.template">
             <field name="name">Recargo Equivalencia. Cuota 4%</field>
             <field name="code">[18]</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">
@@ -212,7 +321,7 @@
             <field name="sign">1.0</field>
             <field name="parent_id" ref="vat_code_chart_root"/>
         </record>
-        
+
         <!-- Base en OPERACIONES INTERIORES CORRIENTES-->
         <record id="iva_ded_22" model="account.tax.code.template">
             <field name="name">Base operaciones interiores corrientes</field>
@@ -220,19 +329,12 @@
             <field name="parent_id" ref="iva_ded_base_total"/>
             <field name="sign">1.0</field>
         </record>
-        <record id="iva_ded_22_16" model="account.tax.code.template">
-            <field name="name">Base operaciones interiores corrientes (16%)</field>
+       <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_18" model="account.tax.code.template">
-            <field name="name">Base operaciones interiores corrientes (18%)</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_7" model="account.tax.code.template">
             <field name="name">Base operaciones interiores corrientes (7%)</field>
             <field name="code">--</field>
@@ -245,13 +347,30 @@
             <field name="parent_id" ref="iva_ded_22"/>
             <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>
+        <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_16" model="account.tax.code.template">
+            <field name="name">Base operaciones interiores corrientes (16%)</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_18" model="account.tax.code.template">
+            <field name="name">Base operaciones interiores corrientes (18%)</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>
@@ -259,19 +378,12 @@
             <field name="parent_id" ref="iva_ded_base_total"/>
             <field name="sign">1.0</field>
         </record>
-        <record id="iva_ded_24_16" model="account.tax.code.template">
-            <field name="name">Base operaciones interiores bienes inversión (16%)</field>
+        <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_18" model="account.tax.code.template">
-            <field name="name">Base operaciones interiores bienes inversión (18%)</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_7" model="account.tax.code.template">
             <field name="name">Base operaciones interiores bienes inversión (7%)</field>
             <field name="code">--</field>
@@ -284,14 +396,31 @@
             <field name="parent_id" ref="iva_ded_24"/>
             <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>
+        <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_16" model="account.tax.code.template">
+            <field name="name">Base operaciones interiores bienes inversión (16%)</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_18" model="account.tax.code.template">
+            <field name="name">Base operaciones interiores bienes inversión (18%)</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 corrientes</field>
@@ -299,6 +428,30 @@
             <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 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_7" model="account.tax.code.template">
+            <field name="name">Base importaciones bienes corrientes (7%)</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_8" model="account.tax.code.template">
+            <field name="name">Base importaciones bienes corrientes (8%)</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 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_16" model="account.tax.code.template">
             <field name="name">Base importaciones bienes corrientes (16%)</field>
             <field name="code">--</field>
@@ -311,26 +464,13 @@
             <field name="parent_id" ref="iva_ded_26"/>
             <field name="sign">1.0</field>
         </record>
-        
-        <record id="iva_ded_26_7" model="account.tax.code.template">
-            <field name="name">Base importaciones bienes corrientes (7%)</field>
+        <record id="iva_ded_26_21" model="account.tax.code.template">
+            <field name="name">Base importaciones bienes corrientes (21%)</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_8" model="account.tax.code.template">
-            <field name="name">Base importaciones bienes corrientes (8%)</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_4" model="account.tax.code.template">
-            <field name="name">Base importaciones bienes corrientes (4%)</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>
@@ -338,19 +478,12 @@
             <field name="parent_id" ref="iva_ded_base_total"/>
             <field name="sign">1.0</field>
         </record>
-        <record id="iva_ded_28_16" model="account.tax.code.template">
-            <field name="name">Base importaciones bienes inversión (16%)</field>
+        <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_18" model="account.tax.code.template">
-            <field name="name">Base importaciones bienes inversión (18%)</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_7" model="account.tax.code.template">
             <field name="name">Base importaciones bienes inversión (7%)</field>
             <field name="code">--</field>
@@ -363,13 +496,31 @@
             <field name="parent_id" ref="iva_ded_28"/>
             <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>
+         <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_16" model="account.tax.code.template">
+            <field name="name">Base importaciones bienes inversión (16%)</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_18" model="account.tax.code.template">
+            <field name="name">Base importaciones bienes inversión (18%)</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 corrientes</field>
@@ -377,6 +528,30 @@
             <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 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_7" model="account.tax.code.template">
+            <field name="name">Base adquisiciones intracomunitarias bienes corrientes (7%)</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_8" model="account.tax.code.template">
+            <field name="name">Base adquisiciones intracomunitarias bienes corrientes (8%)</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 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_16" model="account.tax.code.template">
             <field name="name">Base adquisiciones intracomunitarias bienes corrientes (16%)</field>
             <field name="code">--</field>
@@ -389,26 +564,13 @@
             <field name="parent_id" ref="iva_ded_30"/>
             <field name="sign">1.0</field>
         </record>
-        
-        <record id="iva_ded_30_7" model="account.tax.code.template">
-            <field name="name">Base adquisiciones intracomunitarias bienes corrientes (7%)</field>
+        <record id="iva_ded_30_21" model="account.tax.code.template">
+            <field name="name">Base adquisiciones intracomunitarias bienes corrientes (21%)</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_8" model="account.tax.code.template">
-            <field name="name">Base adquisiciones intracomunitarias bienes corrientes (8%)</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_4" model="account.tax.code.template">
-            <field name="name">Base adquisiciones intracomunitarias bienes corrientes (4%)</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>
@@ -416,19 +578,12 @@
             <field name="parent_id" ref="iva_ded_base_total"/>
             <field name="sign">1.0</field>
         </record>
-        <record id="iva_ded_32_16" model="account.tax.code.template">
-            <field name="name">Base adquisiciones intracomunitarias bienes inversión (16%)</field>
+        <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_18" model="account.tax.code.template">
-            <field name="name">Base adquisiciones intracomunitarias bienes inversión (18%)</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_7" model="account.tax.code.template">
             <field name="name">Base adquisiciones intracomunitarias bienes inversión (7%)</field>
             <field name="code">--</field>
@@ -441,18 +596,71 @@
             <field name="parent_id" ref="iva_ded_32"/>
             <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>
+        <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_16" model="account.tax.code.template">
+            <field name="name">Base adquisiciones intracomunitarias bienes inversión (16%)</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_18" model="account.tax.code.template">
+            <field name="name">Base adquisiciones intracomunitarias bienes inversión (18%)</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" model="account.tax.code.template">
+            <field name="name">Recargo Equivalencia Ded. Base Imponible 1%</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" model="account.tax.code.template">
+            <field name="name">Recargo Equivalencia Ded. Base Imponible 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>
@@ -467,19 +675,12 @@
             <field name="parent_id" ref="iva_ded_cuota_total"/>
             <field name="sign">1.0</field>
         </record>
-        <record id="iva_ded_23_16" model="account.tax.code.template">
-            <field name="name">Cuotas soportadas operaciones interiores corrientes (16%)</field>
+        <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_18" model="account.tax.code.template">
-            <field name="name">Cuotas soportadas operaciones interiores corrientes (18%)</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_7" model="account.tax.code.template">
             <field name="name">Cuotas soportadas operaciones interiores corrientes (7%)</field>
             <field name="code">--</field>
@@ -492,13 +693,31 @@
             <field name="parent_id" ref="iva_ded_23"/>
             <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>
+        <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_16" model="account.tax.code.template">
+            <field name="name">Cuotas soportadas operaciones interiores corrientes (16%)</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_18" model="account.tax.code.template">
+            <field name="name">Cuotas soportadas operaciones interiores corrientes (18%)</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>
@@ -506,19 +725,12 @@
             <field name="parent_id" ref="iva_ded_cuota_total"/>
             <field name="sign">1.0</field>
         </record>
-        <record id="iva_ded_25_16" model="account.tax.code.template">
-            <field name="name">Cuotas soportadas operaciones interiores bienes inversión (16%)</field>
+        <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_18" model="account.tax.code.template">
-            <field name="name">Cuotas soportadas operaciones interiores bienes inversión (18%)</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_7" model="account.tax.code.template">
             <field name="name">Cuotas soportadas operaciones interiores bienes inversión (7%)</field>
             <field name="code">--</field>
@@ -531,13 +743,31 @@
             <field name="parent_id" ref="iva_ded_25"/>
             <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>
+        <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_16" model="account.tax.code.template">
+            <field name="name">Cuotas soportadas operaciones interiores bienes inversión (16%)</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_18" model="account.tax.code.template">
+            <field name="name">Cuotas soportadas operaciones interiores bienes inversión (18%)</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 corrientes</field>
@@ -545,19 +775,12 @@
             <field name="parent_id" ref="iva_ded_cuota_total"/>
             <field name="sign">1.0</field>
         </record>
-        <record id="iva_ded_27_16" model="account.tax.code.template">
-            <field name="name">Cuotas devengadas importaciones bienes corrientes (16%)</field>
+        <record id="iva_ded_27_4" model="account.tax.code.template">
+            <field name="name">Cuotas devengadas importaciones bienes 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_18" model="account.tax.code.template">
-            <field name="name">Cuotas devengadas importaciones bienes corrientes (18%)</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_7" model="account.tax.code.template">
             <field name="name">Cuotas devengadas importaciones bienes corrientes (7%)</field>
             <field name="code">--</field>
@@ -570,13 +793,31 @@
             <field name="parent_id" ref="iva_ded_27"/>
             <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 corrientes (4%)</field>
+        <record id="iva_ded_27_10" model="account.tax.code.template">
+            <field name="name">Cuotas devengadas importaciones bienes 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_16" model="account.tax.code.template">
+            <field name="name">Cuotas devengadas importaciones bienes corrientes (16%)</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_18" model="account.tax.code.template">
+            <field name="name">Cuotas devengadas importaciones bienes corrientes (18%)</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 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>
@@ -584,19 +825,12 @@
             <field name="parent_id" ref="iva_ded_cuota_total"/>
             <field name="sign">1.0</field>
         </record>
-        <record id="iva_ded_29_16" model="account.tax.code.template">
-            <field name="name">Cuotas devengadas importaciones bienes inversión (16%)</field>
+        <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_18" model="account.tax.code.template">
-            <field name="name">Cuotas devengadas importaciones bienes inversión (18%)</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_7" model="account.tax.code.template">
             <field name="name">Cuotas devengadas importaciones bienes inversión (7%)</field>
             <field name="code">--</field>
@@ -609,13 +843,30 @@
             <field name="parent_id" ref="iva_ded_29"/>
             <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>
+        <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_16" model="account.tax.code.template">
+            <field name="name">Cuotas devengadas importaciones bienes inversión (16%)</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_18" model="account.tax.code.template">
+            <field name="name">Cuotas devengadas importaciones bienes inversión (18%)</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 corrientes</field>
@@ -623,6 +874,30 @@
             <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 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_7" model="account.tax.code.template">
+            <field name="name">En adquisiciones intracomunitarias bienes corrientes (7%)</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_8" model="account.tax.code.template">
+            <field name="name">En adquisiciones intracomunitarias bienes corrientes (8%)</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 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_16" model="account.tax.code.template">
             <field name="name">En adquisiciones intracomunitarias bienes corrientes (16%)</field>
             <field name="code">--</field>
@@ -635,26 +910,12 @@
             <field name="parent_id" ref="iva_ded_31"/>
             <field name="sign">1.0</field>
         </record>
-        
-        <record id="iva_ded_31_7" model="account.tax.code.template">
-            <field name="name">En adquisiciones intracomunitarias bienes corrientes (7%)</field>
+        <record id="iva_ded_31_21" model="account.tax.code.template">
+            <field name="name">En adquisiciones intracomunitarias bienes corrientes (21%)</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_8" model="account.tax.code.template">
-            <field name="name">En adquisiciones intracomunitarias bienes corrientes (8%)</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_4" model="account.tax.code.template">
-            <field name="name">En adquisiciones intracomunitarias bienes corrientes (4%)</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>
@@ -662,19 +923,12 @@
             <field name="parent_id" ref="iva_ded_cuota_total"/>
             <field name="sign">1.0</field>
         </record>
-        <record id="iva_ded_33_16" model="account.tax.code.template">
-            <field name="name">En adquisiciones intracomunitarias bienes inversión (16%)</field>
+        <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_18" model="account.tax.code.template">
-            <field name="name">En adquisiciones intracomunitarias bienes inversión (18%)</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_7" model="account.tax.code.template">
             <field name="name">En adquisiciones intracomunitarias bienes inversión (7%)</field>
             <field name="code">--</field>
@@ -687,8 +941,26 @@
             <field name="parent_id" ref="iva_ded_33"/>
             <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>
+        <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_16" model="account.tax.code.template">
+            <field name="name">En adquisiciones intracomunitarias bienes inversión (16%)</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_18" model="account.tax.code.template">
+            <field name="name">En adquisiciones intracomunitarias bienes inversión (18%)</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>
@@ -716,110 +988,42 @@
             <field name="sign">1.0</field>
         </record>
 
-<!-- ********************************* -->
-<!--Cuentas para IVA-->
-<!-- ********************************* -->
-
-        <record id="pgc_472004" model="account.account.template">
-            <field name="code">472004</field>
-            <field name="reconcile" eval="True"/>
-            <field name="parent_id" ref="pgc_472"/>
-            <field name="type">other</field>
-            <field name="name">Hacienda Pública. IVA soportado 4%</field>
-            <field name="user_type" ref="tax"/>
-        </record>
-        
-        <record id="pgc_472007" model="account.account.template">
-            <field name="code">472007</field>
-            <field name="reconcile" eval="True"/>
-            <field name="parent_id" ref="pgc_472"/>
-            <field name="type">other</field>
-            <field name="name">Hacienda Pública. IVA soportado 7%</field>
-            <field name="user_type" ref="tax"/>
-        </record>
-        
-        <record id="pgc_472008" model="account.account.template">
-            <field name="code">472008</field>
-            <field name="reconcile" eval="True"/>
-            <field name="parent_id" ref="pgc_472"/>
-            <field name="type">other</field>
-            <field name="name">Hacienda Pública. IVA soportado 8%</field>
-            <field name="user_type" ref="tax"/>
-        </record>
-        
-        <record id="pgc_472016" model="account.account.template">
-            <field name="code">472016</field>
-            <field name="reconcile" eval="True"/>
-            <field name="parent_id" ref="pgc_472"/>
-            <field name="type">other</field>
-            <field name="name">Hacienda Pública. IVA soportado 16%</field>
-            <field name="user_type" ref="tax"/>
-        </record>
-        
-        <record id="pgc_472018" model="account.account.template">
-            <field name="code">472018</field>
-            <field name="reconcile" eval="True"/>
-            <field name="parent_id" ref="pgc_472"/>
-            <field name="type">other</field>
-            <field name="name">Hacienda Pública. IVA soportado 18%</field>
-            <field name="user_type" ref="tax"/>
-        </record>
-        
-        <record id="pgc_477004" model="account.account.template">
-            <field name="code">477004</field>
-            <field name="reconcile" eval="True"/>
-            <field name="parent_id" ref="pgc_477"/>
-            <field name="type">other</field>
-            <field name="name">Hacienda Pública. IVA repercutido 4%</field>
-            <field name="user_type" ref="tax"/>
-        </record>
-        
-        <record id="pgc_477007" model="account.account.template">
-            <field name="code">477007</field>
-            <field name="reconcile" eval="True"/>
-            <field name="parent_id" ref="pgc_477"/>
-            <field name="type">other</field>
-            <field name="name">Hacienda Pública. IVA repercutido 7%</field>
-            <field name="user_type" ref="tax"/>
-        </record>
-        
-        <record id="pgc_477008" model="account.account.template">
-            <field name="code">477008</field>
-            <field name="reconcile" eval="True"/>
-            <field name="parent_id" ref="pgc_477"/>
-            <field name="type">other</field>
-            <field name="name">Hacienda Pública. IVA repercutido 8%</field>
-            <field name="user_type" ref="tax"/>
-        </record>
-        
-        <record id="pgc_477016" model="account.account.template">
-            <field name="code">477016</field>
-            <field name="reconcile" eval="True"/>
-            <field name="parent_id" ref="pgc_477"/>
-            <field name="type">other</field>
-            <field name="name">Hacienda Pública. IVA repercutido 16%</field>
-            <field name="user_type" ref="tax"/>
+        <!--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="pgc_477018" model="account.account.template">
-            <field name="code">477018</field>
-            <field name="reconcile" eval="True"/>
-            <field name="parent_id" ref="pgc_477"/>
-            <field name="type">other</field>
-            <field name="name">Hacienda Pública. IVA repercutido 18%</field>
-            <field name="user_type" ref="tax"/>
+        <record id="iva_ded_15" model="account.tax.code.template">
+            <field name="name">Recargo Equivalencia Ded. Cuota 1%</field>
+            <field name="code">[15]</field>
+            <field name="parent_id" ref="iva_ded_cuota_total"/>
+            <field name="sign">1.0</field>
         </record>
-        
-        <record id="pgc_475001" model="account.account.template">
-            <field name="code">475001</field>
-            <field name="reconcile" eval="True"/>
-            <field name="parent_id" ref="pgc_4750"/>
-            <field name="type">payable</field>
-            <field name="name">Hacienda acreedora IVA</field>
-            <field name="user_type" ref="tax"/>
+
+        <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" model="account.tax.code.template">
+            <field name="name">Recargo Equivalencia Ded. Cuota 4%</field>
+            <field name="code">[18]</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>
+
 <!-- ********************************* -->
 <!-- Plantillas de Impuestos IVA       -->
 <!-- ********************************* -->
@@ -831,8 +1035,8 @@
             <field name="name">4% IVA Soportado (operaciones corrientes)</field>
             <field eval="0.04" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_472004"/>
-            <field name="account_paid_id" ref="pgc_472004"/>
+            <field name="account_collected_id" ref="pgc_472000"/>
+            <field name="account_paid_id" ref="pgc_472000"/>
             <field name="base_code_id" ref="iva_ded_22_4"/>
             <field name="tax_code_id" ref="iva_ded_23_4"/>
             <field name="ref_base_code_id" ref="iva_ded_22_4"/>
@@ -843,14 +1047,14 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
         </record>
-        
+
         <record id="iva_sop_4_inv" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template"/>
             <field name="name">4% IVA Soportado (bienes de inversión)</field>
             <field eval="0.04" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_472004"/>
-            <field name="account_paid_id" ref="pgc_472004"/>
+            <field name="account_collected_id" ref="pgc_472000"/>
+            <field name="account_paid_id" ref="pgc_472000"/>
             <field name="base_code_id" ref="iva_ded_24_4"/>
             <field name="tax_code_id" ref="iva_ded_25_4"/>
             <field name="ref_base_code_id" ref="iva_ded_24_4"/>
@@ -861,14 +1065,14 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
         </record>
-        
+
         <record id="iva_sop_7" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template"/>
             <field name="name">7% IVA Soportado (operaciones corrientes)</field>
             <field eval="0.07" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_472007"/>
-            <field name="account_paid_id" ref="pgc_472007"/>
+            <field name="account_collected_id" ref="pgc_472000"/>
+            <field name="account_paid_id" ref="pgc_472000"/>
             <field name="base_code_id" ref="iva_ded_22_7"/>
             <field name="tax_code_id" ref="iva_ded_23_7"/>
             <field name="ref_base_code_id" ref="iva_ded_22_7"/>
@@ -879,14 +1083,14 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
         </record>
-        
+
         <record id="iva_sop_7_inv" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template"/>
             <field name="name">7% IVA Soportado (bienes de inversión)</field>
             <field eval="0.07" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_472007"/>
-            <field name="account_paid_id" ref="pgc_472007"/>
+            <field name="account_collected_id" ref="pgc_472000"/>
+            <field name="account_paid_id" ref="pgc_472000"/>
             <field name="base_code_id" ref="iva_ded_24_7"/>
             <field name="tax_code_id" ref="iva_ded_25_7"/>
             <field name="ref_base_code_id" ref="iva_ded_24_7"/>
@@ -897,14 +1101,14 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
         </record>
-        
+
         <record id="iva_sop_8" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template"/>
             <field name="name">8% IVA Soportado (operaciones corrientes)</field>
             <field eval="0.08" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_472008"/>
-            <field name="account_paid_id" ref="pgc_472008"/>
+            <field name="account_collected_id" ref="pgc_472000"/>
+            <field name="account_paid_id" ref="pgc_472000"/>
             <field name="base_code_id" ref="iva_ded_22_8"/>
             <field name="tax_code_id" ref="iva_ded_23_8"/>
             <field name="ref_base_code_id" ref="iva_ded_22_8"/>
@@ -915,14 +1119,14 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
         </record>
-        
+
         <record id="iva_sop_8_inv" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template"/>
             <field name="name">8% IVA Soportado (bienes de inversión)</field>
             <field eval="0.08" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_472008"/>
-            <field name="account_paid_id" ref="pgc_472008"/>
+            <field name="account_collected_id" ref="pgc_472000"/>
+            <field name="account_paid_id" ref="pgc_472000"/>
             <field name="base_code_id" ref="iva_ded_24_8"/>
             <field name="tax_code_id" ref="iva_ded_25_8"/>
             <field name="ref_base_code_id" ref="iva_ded_24_8"/>
@@ -933,14 +1137,50 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
         </record>
-        
+
+		<record id="iva_sop_10" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+            <field name="name">10% IVA Soportado (operaciones corrientes)</field>
+            <field eval="0.10" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_472000"/>
+            <field name="account_paid_id" ref="pgc_472000"/>
+            <field name="base_code_id" ref="iva_ded_22_10"/>
+            <field name="tax_code_id" ref="iva_ded_23_10"/>
+            <field name="ref_base_code_id" ref="iva_ded_22_10"/>
+            <field name="ref_tax_code_id" ref="iva_ded_23_10"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="iva_sop_10_inv" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+            <field name="name">10% IVA Soportado (bienes de inversión)</field>
+            <field eval="0.10" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_472000"/>
+            <field name="account_paid_id" ref="pgc_472000"/>
+            <field name="base_code_id" ref="iva_ded_24_10"/>
+            <field name="tax_code_id" ref="iva_ded_25_10"/>
+            <field name="ref_base_code_id" ref="iva_ded_24_10"/>
+            <field name="ref_tax_code_id" ref="iva_ded_25_10"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
         <record id="iva_sop_16" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template"/>
             <field name="name">16% IVA Soportado (operaciones corrientes)</field>
             <field eval="0.16" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_472016"/>
-            <field name="account_paid_id" ref="pgc_472016"/>
+            <field name="account_collected_id" ref="pgc_472000"/>
+            <field name="account_paid_id" ref="pgc_472000"/>
             <field name="base_code_id" ref="iva_ded_22_16"/>
             <field name="tax_code_id" ref="iva_ded_23_16"/>
             <field name="ref_base_code_id" ref="iva_ded_22_16"/>
@@ -951,14 +1191,14 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
         </record>
-        
+
         <record id="iva_sop_16_inv" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template"/>
             <field name="name">16% IVA Soportado (bienes de inversión)</field>
             <field eval="0.16" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_472016"/>
-            <field name="account_paid_id" ref="pgc_472016"/>
+            <field name="account_collected_id" ref="pgc_472000"/>
+            <field name="account_paid_id" ref="pgc_472000"/>
             <field name="base_code_id" ref="iva_ded_24_16"/>
             <field name="tax_code_id" ref="iva_ded_25_16"/>
             <field name="ref_base_code_id" ref="iva_ded_24_16"/>
@@ -969,14 +1209,14 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
         </record>
-        
+
         <record id="iva_sop_18" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template"/>
             <field name="name">18% IVA Soportado (operaciones corrientes)</field>
             <field eval="0.18" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_472018"/>
-            <field name="account_paid_id" ref="pgc_472018"/>
+            <field name="account_collected_id" ref="pgc_472000"/>
+            <field name="account_paid_id" ref="pgc_472000"/>
             <field name="base_code_id" ref="iva_ded_22_18"/>
             <field name="tax_code_id" ref="iva_ded_23_18"/>
             <field name="ref_base_code_id" ref="iva_ded_22_18"/>
@@ -986,15 +1226,16 @@
             <field eval="-1.0" name="ref_tax_sign"/>
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
+            <field name="sequence" eval="0"/>
         </record>
-        
+
         <record id="iva_sop_18_inv" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template"/>
             <field name="name">18% IVA Soportado (bienes de inversión)</field>
             <field eval="0.18" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_472018"/>
-            <field name="account_paid_id" ref="pgc_472018"/>
+            <field name="account_collected_id" ref="pgc_472000"/>
+            <field name="account_paid_id" ref="pgc_472000"/>
             <field name="base_code_id" ref="iva_ded_24_18"/>
             <field name="tax_code_id" ref="iva_ded_25_18"/>
             <field name="ref_base_code_id" ref="iva_ded_24_18"/>
@@ -1005,7 +1246,44 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
         </record>
-        
+
+        <record id="iva_sop_21" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+            <field name="name">21% IVA Soportado (operaciones corrientes)</field>
+            <field eval="0.21" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_472000"/>
+            <field name="account_paid_id" ref="pgc_472000"/>
+            <field name="base_code_id" ref="iva_ded_22_21"/>
+            <field name="tax_code_id" ref="iva_ded_23_21"/>
+            <field name="ref_base_code_id" ref="iva_ded_22_21"/>
+            <field name="ref_tax_code_id" ref="iva_ded_23_21"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+            <field name="sequence" eval="0"/>
+        </record>
+
+        <record id="iva_sop_21_inv" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+            <field name="name">21% IVA Soportado (bienes de inversión)</field>
+            <field eval="0.21" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_472000"/>
+            <field name="account_paid_id" ref="pgc_472000"/>
+            <field name="base_code_id" ref="iva_ded_24_21"/>
+            <field name="tax_code_id" ref="iva_ded_25_21"/>
+            <field name="ref_base_code_id" ref="iva_ded_24_21"/>
+            <field name="ref_tax_code_id" ref="iva_ded_25_21"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
         <!-- Plantillas para Extracomunitario-->
         <!-- IVA compras -->
         <record id="iva_X0_compras_bc" model="account.tax.template">
@@ -1036,15 +1314,15 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
         </record>
-        
+
         <record id="iva_X4_compras_bc" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template"/>
             <field name="name">IVA 4% Importaciones bienes corrientes</field>
             <field name="description">IVA 4% Importaciones bienes corrientes</field>
             <field eval="0.04" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_472004"/>
-            <field name="account_paid_id" ref="pgc_472004"/>
+            <field name="account_collected_id" ref="pgc_472000"/>
+            <field name="account_paid_id" ref="pgc_472000"/>
             <field name="base_code_id" ref="iva_ded_26_4"/>
             <field name="tax_code_id" ref="iva_ded_27_4"/>
             <field name="ref_base_code_id" ref="iva_ded_26_4"/>
@@ -1061,8 +1339,8 @@
             <field name="description">IVA 4% Importaciones bienes de inversión</field>
             <field eval="0.04" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_472004"/>
-            <field name="account_paid_id" ref="pgc_472004"/>
+            <field name="account_collected_id" ref="pgc_472000"/>
+            <field name="account_paid_id" ref="pgc_472000"/>
             <field name="base_code_id" ref="iva_ded_28_4"/>
             <field name="tax_code_id" ref="iva_ded_29_4"/>
             <field name="ref_base_code_id" ref="iva_ded_28_4"/>
@@ -1073,15 +1351,15 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
         </record>
-         
+
         <record id="iva_X7_compras_bc" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template"/>
             <field name="name">IVA 7% Importaciones bienes corrientes</field>
             <field name="description">IVA 7% Importaciones bienes corrientes</field>
             <field eval="0.07" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_472007"/>
-            <field name="account_paid_id" ref="pgc_472007"/>
+            <field name="account_collected_id" ref="pgc_472000"/>
+            <field name="account_paid_id" ref="pgc_472000"/>
             <field name="base_code_id" ref="iva_ded_26_7"/>
             <field name="tax_code_id" ref="iva_ded_27_7"/>
             <field name="ref_base_code_id" ref="iva_ded_26_7"/>
@@ -1098,8 +1376,8 @@
             <field name="description">IVA 7% Importaciones bienes de inversión</field>
             <field eval="0.07" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_472007"/>
-            <field name="account_paid_id" ref="pgc_472007"/>
+            <field name="account_collected_id" ref="pgc_472000"/>
+            <field name="account_paid_id" ref="pgc_472000"/>
             <field name="base_code_id" ref="iva_ded_28_7"/>
             <field name="tax_code_id" ref="iva_ded_29_7"/>
             <field name="ref_base_code_id" ref="iva_ded_28_7"/>
@@ -1110,15 +1388,15 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
         </record>
-        
+
         <record id="iva_X8_compras_bc" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template"/>
             <field name="name">IVA 8% Importaciones bienes corrientes</field>
             <field name="description">IVA 8% Importaciones bienes corrientes</field>
             <field eval="0.08" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_472008"/>
-            <field name="account_paid_id" ref="pgc_472008"/>
+            <field name="account_collected_id" ref="pgc_472000"/>
+            <field name="account_paid_id" ref="pgc_472000"/>
             <field name="base_code_id" ref="iva_ded_26_8"/>
             <field name="tax_code_id" ref="iva_ded_27_8"/>
             <field name="ref_base_code_id" ref="iva_ded_26_8"/>
@@ -1135,8 +1413,8 @@
             <field name="description">IVA 8% Importaciones bienes de inversión</field>
             <field eval="0.08" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_472008"/>
-            <field name="account_paid_id" ref="pgc_472008"/>
+            <field name="account_collected_id" ref="pgc_472000"/>
+            <field name="account_paid_id" ref="pgc_472000"/>
             <field name="base_code_id" ref="iva_ded_28_8"/>
             <field name="tax_code_id" ref="iva_ded_29_8"/>
             <field name="ref_base_code_id" ref="iva_ded_28_8"/>
@@ -1147,15 +1425,53 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
         </record>
-        
+
+        <record id="iva_X10_compras_bc" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+            <field name="name">IVA 10% Importaciones bienes corrientes</field>
+            <field name="description">IVA 10% Importaciones bienes corrientes</field>
+            <field eval="0.10" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_472000"/>
+            <field name="account_paid_id" ref="pgc_472000"/>
+            <field name="base_code_id" ref="iva_ded_26_10"/>
+            <field name="tax_code_id" ref="iva_ded_27_10"/>
+            <field name="ref_base_code_id" ref="iva_ded_26_10"/>
+            <field name="ref_tax_code_id" ref="iva_ded_27_10"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_X10_compras_bi" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+            <field name="name">IVA 10% Importaciones bienes de inversión</field>
+            <field name="description">IVA 10% Importaciones bienes de inversión</field>
+            <field eval="0.10" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_472000"/>
+            <field name="account_paid_id" ref="pgc_472000"/>
+            <field name="base_code_id" ref="iva_ded_28_10"/>
+            <field name="tax_code_id" ref="iva_ded_29_10"/>
+            <field name="ref_base_code_id" ref="iva_ded_28_10"/>
+            <field name="ref_tax_code_id" ref="iva_ded_29_10"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+
         <record id="iva_X16_compras_bc" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template"/>
             <field name="name">IVA 16% Importaciones bienes corrientes</field>
             <field name="description">IVA 16% Importaciones bienes corrientes</field>
             <field eval="0.16" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_472016"/>
-            <field name="account_paid_id" ref="pgc_472016"/>
+            <field name="account_collected_id" ref="pgc_472000"/>
+            <field name="account_paid_id" ref="pgc_472000"/>
             <field name="base_code_id" ref="iva_ded_26_16"/>
             <field name="tax_code_id" ref="iva_ded_27_16"/>
             <field name="ref_base_code_id" ref="iva_ded_26_16"/>
@@ -1172,8 +1488,8 @@
             <field name="description">IVA 16% Importaciones bienes de inversión</field>
             <field eval="0.16" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_472016"/>
-            <field name="account_paid_id" ref="pgc_472016"/>
+            <field name="account_collected_id" ref="pgc_472000"/>
+            <field name="account_paid_id" ref="pgc_472000"/>
             <field name="base_code_id" ref="iva_ded_28_16"/>
             <field name="tax_code_id" ref="iva_ded_29_16"/>
             <field name="ref_base_code_id" ref="iva_ded_28_16"/>
@@ -1184,15 +1500,15 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
         </record>
-        
+
         <record id="iva_X18_compras_bc" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template"/>
             <field name="name">IVA 18% Importaciones bienes corrientes</field>
             <field name="description">IVA 18% Importaciones bienes corrientes</field>
             <field eval="0.18" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_472018"/>
-            <field name="account_paid_id" ref="pgc_472018"/>
+            <field name="account_collected_id" ref="pgc_472000"/>
+            <field name="account_paid_id" ref="pgc_472000"/>
             <field name="base_code_id" ref="iva_ded_26_18"/>
             <field name="tax_code_id" ref="iva_ded_27_18"/>
             <field name="ref_base_code_id" ref="iva_ded_26_18"/>
@@ -1209,8 +1525,8 @@
             <field name="description">IVA 18% Importaciones bienes de inversión</field>
             <field eval="0.18" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_472018"/>
-            <field name="account_paid_id" ref="pgc_472018"/>
+            <field name="account_collected_id" ref="pgc_472000"/>
+            <field name="account_paid_id" ref="pgc_472000"/>
             <field name="base_code_id" ref="iva_ded_28_18"/>
             <field name="tax_code_id" ref="iva_ded_29_18"/>
             <field name="ref_base_code_id" ref="iva_ded_28_18"/>
@@ -1221,7 +1537,44 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
         </record>
-        
+
+		<record id="iva_X21_compras_bc" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+            <field name="name">IVA 21% Importaciones bienes corrientes</field>
+            <field name="description">IVA 21% Importaciones bienes corrientes</field>
+            <field eval="0.21" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_472000"/>
+            <field name="account_paid_id" ref="pgc_472000"/>
+            <field name="base_code_id" ref="iva_ded_26_21"/>
+            <field name="tax_code_id" ref="iva_ded_27_21"/>
+            <field name="ref_base_code_id" ref="iva_ded_26_21"/>
+            <field name="ref_tax_code_id" ref="iva_ded_27_21"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_X21_compras_bi" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+            <field name="name">IVA 21% Importaciones bienes de inversión</field>
+            <field name="description">IVA 21% Importaciones bienes de inversión</field>
+            <field eval="0.21" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_472000"/>
+            <field name="account_paid_id" ref="pgc_472000"/>
+            <field name="base_code_id" ref="iva_ded_28_21"/>
+            <field name="tax_code_id" ref="iva_ded_29_21"/>
+            <field name="ref_base_code_id" ref="iva_ded_28_21"/>
+            <field name="ref_tax_code_id" ref="iva_ded_29_21"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
         <!-- IVA EXPORTACIONES (VENTAS )-->
         <record id="iva_X0" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template"/>
@@ -1269,16 +1622,16 @@
             <field name="parent_id" ref="iva_ISP_compras_16"/>
             <field name="amount" eval="-0.16"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_477016"/>
-            <field name="account_paid_id" ref="pgc_477016"/>
+            <field name="account_collected_id" ref="pgc_477000"/>
+            <field name="account_paid_id" ref="pgc_477000"/>
             <field name="base_code_id" ref="iva_dev_07"/>
             <field name="tax_code_id" ref="iva_dev_09"/>
             <field name="ref_base_code_id" ref="iva_dev_07"/>
             <field name="ref_tax_code_id" ref="iva_dev_09"/>
             <field name="tax_sign" eval="-1.0"/>
-            <field name="base_sign" eval="-1.0"/>
+            <field name="base_sign" eval="1.0"/>
             <field name="ref_tax_sign" eval="1.0"/>
-            <field name="ref_base_sign" eval="1.0"/>
+            <field name="ref_base_sign" eval="-1.0"/>
             <field name="type_tax_use">purchase</field>
         </record>
         <record id="iva_ISP_compras_16_3" model="account.tax.template">
@@ -1287,8 +1640,8 @@
             <field name="parent_id" ref="iva_ISP_compras_16"/>
             <field name="amount" eval="0.16"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_472016"/>
-            <field name="account_paid_id" ref="pgc_472016"/>
+            <field name="account_collected_id" ref="pgc_472000"/>
+            <field name="account_paid_id" ref="pgc_472000"/>
             <field name="base_code_id" ref="iva_ded_22_16"/>
             <field name="tax_code_id" ref="iva_ded_23_16"/>
             <field name="ref_base_code_id" ref="iva_ded_22_16"/>
@@ -1299,7 +1652,7 @@
             <field name="ref_base_sign" eval="-1.0"/>
             <field name="type_tax_use">purchase</field>
         </record>
-        
+
         <record id="iva_ISP_compras_18" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template"/>
             <field name="name">IVA 18% Inversión del sujeto pasivo</field>
@@ -1333,16 +1686,16 @@
             <field name="parent_id" ref="iva_ISP_compras_18"/>
             <field name="amount" eval="-0.18"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_477018"/>
-            <field name="account_paid_id" ref="pgc_477018"/>
+            <field name="account_collected_id" ref="pgc_477000"/>
+            <field name="account_paid_id" ref="pgc_477000"/>
             <field name="base_code_id" ref="iva_dev_07_18"/>
             <field name="tax_code_id" ref="iva_dev_09_18"/>
             <field name="ref_base_code_id" ref="iva_dev_07_18"/>
             <field name="ref_tax_code_id" ref="iva_dev_09_18"/>
             <field name="tax_sign" eval="-1.0"/>
-            <field name="base_sign" eval="-1.0"/>
+            <field name="base_sign" eval="1.0"/>
             <field name="ref_tax_sign" eval="1.0"/>
-            <field name="ref_base_sign" eval="1.0"/>
+            <field name="ref_base_sign" eval="-1.0"/>
             <field name="type_tax_use">purchase</field>
         </record>
         <record id="iva_ISP_compras_18_3" model="account.tax.template">
@@ -1351,8 +1704,8 @@
             <field name="parent_id" ref="iva_ISP_compras_18"/>
             <field name="amount" eval="0.18"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_472018"/>
-            <field name="account_paid_id" ref="pgc_472018"/>
+            <field name="account_collected_id" ref="pgc_472000"/>
+            <field name="account_paid_id" ref="pgc_472000"/>
             <field name="base_code_id" ref="iva_ded_22_18"/>
             <field name="tax_code_id" ref="iva_ded_23_18"/>
             <field name="ref_base_code_id" ref="iva_ded_22_18"/>
@@ -1363,16 +1716,81 @@
             <field name="ref_base_sign" eval="-1.0"/>
             <field name="type_tax_use">purchase</field>
         </record>
-        
-        
+
+
+		<record id="iva_ISP_compras_21" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+            <field name="name">IVA 21% Inversión del sujeto pasivo</field>
+            <field name="description">IVA 21% Inversión del sujeto pasivo</field>
+            <field name="amount" eval="1.00"/>
+            <field name="type">percent</field>
+            <field name="child_depend" eval="1"/>
+            <field name="base_sign" eval="1.0"/>
+            <field name="tax_sign" eval="1.0"/>
+            <field name="ref_base_sign" eval="-1.0"/>
+            <field name="ref_tax_sign" eval="-1.0"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_ISP_compras_21_1" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+            <field name="name">IVA 21% Inversión del sujeto pasivo (1)</field>
+            <field name="parent_id" ref="iva_ISP_compras_21"/>
+            <field name="amount" eval="0.00"/>
+            <field name="type">percent</field>
+            <field name="base_code_id" ref="base_extra_44"/>
+            <field name="ref_base_code_id" ref="base_extra_44"/>
+            <field name="base_sign" eval="1.0"/>
+            <field name="tax_sign" eval="1.0"/>
+            <field name="ref_base_sign" eval="-1.0"/>
+            <field name="ref_tax_sign" eval="-1.0"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_ISP_compras_21_2" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+            <field name="name">IVA 21% Inversión del sujeto pasivo (2)</field>
+            <field name="parent_id" ref="iva_ISP_compras_21"/>
+            <field name="amount" eval="-0.21"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_477000"/>
+            <field name="account_paid_id" ref="pgc_477000"/>
+            <field name="base_code_id" ref="iva_dev_07_21"/>
+            <field name="tax_code_id" ref="iva_dev_09_21"/>
+            <field name="ref_base_code_id" ref="iva_dev_07_21"/>
+            <field name="ref_tax_code_id" ref="iva_dev_09_21"/>
+            <field name="tax_sign" eval="-1.0"/>
+            <field name="base_sign" eval="1.0"/>
+            <field name="ref_tax_sign" eval="1.0"/>
+            <field name="ref_base_sign" eval="-1.0"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_ISP_compras_21_3" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+            <field name="name">IVA 21% Inversión del sujeto pasivo (3)</field>
+            <field name="parent_id" ref="iva_ISP_compras_21"/>
+            <field name="amount" eval="0.21"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_472000"/>
+            <field name="account_paid_id" ref="pgc_472000"/>
+            <field name="base_code_id" ref="iva_ded_22_21"/>
+            <field name="tax_code_id" ref="iva_ded_23_21"/>
+            <field name="ref_base_code_id" ref="iva_ded_22_21"/>
+            <field name="ref_tax_code_id" ref="iva_ded_23_21"/>
+            <field name="tax_sign" eval="1.0"/>
+            <field name="base_sign" eval="1.0"/>
+            <field name="ref_tax_sign" eval="-1.0"/>
+            <field name="ref_base_sign" eval="-1.0"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+
         <!-- IVA REPERCUTIDO-->
         <record id="iva_rep_4" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template"/>
             <field name="name">IVA 4%</field>
             <field eval="0.04" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_477004"/>
-            <field name="account_paid_id" ref="pgc_477004"/>
+            <field name="account_collected_id" ref="pgc_477000"/>
+            <field name="account_paid_id" ref="pgc_477000"/>
             <field name="base_code_id" ref="iva_dev_01"/>
             <field name="tax_code_id" ref="iva_dev_03"/>
             <field name="ref_base_code_id" ref="iva_dev_01"/>
@@ -1383,14 +1801,14 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">sale</field>
         </record>
-        
+
         <record id="iva_rep_7" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template"/>
             <field name="name">IVA 7%</field>
             <field eval="0.07" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_477007"/>
-            <field name="account_paid_id" ref="pgc_477007"/>
+            <field name="account_collected_id" ref="pgc_477000"/>
+            <field name="account_paid_id" ref="pgc_477000"/>
             <field name="base_code_id" ref="iva_dev_04"/>
             <field name="tax_code_id" ref="iva_dev_06"/>
             <field name="ref_base_code_id" ref="iva_dev_04"/>
@@ -1401,14 +1819,14 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">sale</field>
         </record>
-        
+
         <record id="iva_rep_8" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template"/>
             <field name="name">IVA 8%</field>
             <field eval="0.08" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_477008"/>
-            <field name="account_paid_id" ref="pgc_477008"/>
+            <field name="account_collected_id" ref="pgc_477000"/>
+            <field name="account_paid_id" ref="pgc_477000"/>
             <field name="base_code_id" ref="iva_dev_04_8"/>
             <field name="tax_code_id" ref="iva_dev_06_8"/>
             <field name="ref_base_code_id" ref="iva_dev_04_8"/>
@@ -1419,14 +1837,32 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">sale</field>
         </record>
-        
+
+        <record id="iva_rep_10" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+            <field name="name">IVA 10%</field>
+            <field eval="0.10" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_477000"/>
+            <field name="account_paid_id" ref="pgc_477000"/>
+            <field name="base_code_id" ref="iva_dev_04_10"/>
+            <field name="tax_code_id" ref="iva_dev_06_10"/>
+            <field name="ref_base_code_id" ref="iva_dev_04_10"/>
+            <field name="ref_tax_code_id" ref="iva_dev_06_10"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">sale</field>
+        </record>
+
         <record id="iva_rep_16" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template"/>
             <field name="name">IVA 16%</field>
             <field eval="0.16" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_477016"/>
-            <field name="account_paid_id" ref="pgc_477016"/>
+            <field name="account_collected_id" ref="pgc_477000"/>
+            <field name="account_paid_id" ref="pgc_477000"/>
             <field name="base_code_id" ref="iva_dev_07"/>
             <field name="tax_code_id" ref="iva_dev_09"/>
             <field name="ref_base_code_id" ref="iva_dev_07"/>
@@ -1437,14 +1873,14 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">sale</field>
         </record>
-        
+
         <record id="iva_rep_18" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template"/>
             <field name="name">IVA 18%</field>
             <field eval="0.18" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_477018"/>
-            <field name="account_paid_id" ref="pgc_477018"/>
+            <field name="account_collected_id" ref="pgc_477000"/>
+            <field name="account_paid_id" ref="pgc_477000"/>
             <field name="base_code_id" ref="iva_dev_07_18"/>
             <field name="tax_code_id" ref="iva_dev_09_18"/>
             <field name="ref_base_code_id" ref="iva_dev_07_18"/>
@@ -1454,17 +1890,37 @@
             <field eval="-1.0" name="ref_tax_sign"/>
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">sale</field>
+            <field eval="0" name="sequence"/>
         </record>
-        
-        
+
+        <record id="iva_rep_21" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+            <field name="name">IVA 21%</field>
+            <field eval="0.21" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_477000"/>
+            <field name="account_paid_id" ref="pgc_477000"/>
+            <field name="base_code_id" ref="iva_dev_07_21"/>
+            <field name="tax_code_id" ref="iva_dev_09_21"/>
+            <field name="ref_base_code_id" ref="iva_dev_07_21"/>
+            <field name="ref_tax_code_id" ref="iva_dev_09_21"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">sale</field>
+            <field eval="0" name="sequence"/>
+        </record>
+
+
         <!-- Plantillas para recargo de equivalencia-->
         <record id="re_05" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template"/>
-            <field name="name">0.50% Recargo Equivalencia</field>
+            <field name="name">0.50% Recargo Equivalencia Ventas</field>
             <field eval="0.005" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_475001"/>
-            <field name="account_paid_id" ref="pgc_475001"/>
+            <field name="account_collected_id" ref="pgc_477000"/>
+            <field name="account_paid_id" ref="pgc_477000"/>
             <field name="base_code_id" ref="iva_dev_10"/>
             <field name="tax_code_id" ref="iva_dev_12"/>
             <field name="ref_base_code_id" ref="iva_dev_10"/>
@@ -1475,14 +1931,14 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">sale</field>
         </record>
-        
+
         <record id="re_1" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template"/>
-            <field name="name">1% Recargo Equivalencia</field>
+            <field name="name">1% Recargo Equivalencia Ventas</field>
             <field eval="0.01" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_475001"/>
-            <field name="account_paid_id" ref="pgc_475001"/>
+            <field name="account_collected_id" ref="pgc_477000"/>
+            <field name="account_paid_id" ref="pgc_477000"/>
             <field name="base_code_id" ref="iva_dev_13"/>
             <field name="tax_code_id" ref="iva_dev_15"/>
             <field name="ref_base_code_id" ref="iva_dev_13"/>
@@ -1493,14 +1949,32 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">sale</field>
         </record>
-        
+
+        <record id="re_14" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+            <field name="name">1.4% Recargo Equivalencia Ventas</field>
+            <field eval="0.014" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_477000"/>
+            <field name="account_paid_id" ref="pgc_477000"/>
+            <field name="base_code_id" ref="iva_dev_13_14"/>
+            <field name="tax_code_id" ref="iva_dev_15_14"/>
+            <field name="ref_base_code_id" ref="iva_dev_13_14"/>
+            <field name="ref_tax_code_id" ref="iva_dev_15_14"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">sale</field>
+        </record>
+
         <record id="re_4" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template"/>
-            <field name="name">4% Recargo Equivalencia</field>
+            <field name="name">4% Recargo Equivalencia Ventas</field>
             <field eval="0.04" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_475001"/>
-            <field name="account_paid_id" ref="pgc_475001"/>
+            <field name="account_collected_id" ref="pgc_477000"/>
+            <field name="account_paid_id" ref="pgc_477000"/>
             <field name="base_code_id" ref="iva_dev_16"/>
             <field name="tax_code_id" ref="iva_dev_18"/>
             <field name="ref_base_code_id" ref="iva_dev_16"/>
@@ -1511,10 +1985,118 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">sale</field>
         </record>
-        
-        
+
+        <record id="re_52" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+            <field name="name">5.2% Recargo Equivalencia Ventas</field>
+            <field eval="0.052" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_477000"/>
+            <field name="account_paid_id" ref="pgc_477000"/>
+            <field name="base_code_id" ref="iva_dev_16_52"/>
+            <field name="tax_code_id" ref="iva_dev_18_52"/>
+            <field name="ref_base_code_id" ref="iva_dev_16_52"/>
+            <field name="ref_tax_code_id" ref="iva_dev_18_52"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">sale</field>
+        </record>
+
+        <record id="re_buy_05" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+            <field name="name">0.50% Recargo Equivalencia Compras</field>
+            <field eval="0.005" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_472000"/>
+            <field name="account_paid_id" ref="pgc_472000"/>
+            <field name="base_code_id" ref="iva_ded_10"/>
+            <field name="tax_code_id" ref="iva_ded_12"/>
+            <field name="ref_base_code_id" ref="iva_ded_10"/>
+            <field name="ref_tax_code_id" ref="iva_ded_12"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="re_buy_1" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+            <field name="name">1% Recargo Equivalencia Compras</field>
+            <field eval="0.01" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_472000"/>
+            <field name="account_paid_id" ref="pgc_472000"/>
+            <field name="base_code_id" ref="iva_ded_13"/>
+            <field name="tax_code_id" ref="iva_ded_15"/>
+            <field name="ref_base_code_id" ref="iva_ded_13"/>
+            <field name="ref_tax_code_id" ref="iva_ded_15"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="re_buy_14" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+            <field name="name">1.4% Recargo Equivalencia Compras</field>
+            <field eval="0.014" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_472000"/>
+            <field name="account_paid_id" ref="pgc_472000"/>
+            <field name="base_code_id" ref="iva_ded_13_14"/>
+            <field name="tax_code_id" ref="iva_ded_15_14"/>
+            <field name="ref_base_code_id" ref="iva_ded_13_14"/>
+            <field name="ref_tax_code_id" ref="iva_ded_15_14"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="re_buy_4" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+            <field name="name">4% Recargo Equivalencia Compras</field>
+            <field eval="0.04" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_472000"/>
+            <field name="account_paid_id" ref="pgc_472000"/>
+            <field name="base_code_id" ref="iva_ded_16"/>
+            <field name="tax_code_id" ref="iva_ded_18"/>
+            <field name="ref_base_code_id" ref="iva_ded_16"/>
+            <field name="ref_tax_code_id" ref="iva_ded_18"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="re_buy_52" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+            <field name="name">5.2% Recargo Equivalencia Compras</field>
+            <field eval="0.052" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_472000"/>
+            <field name="account_paid_id" ref="pgc_472000"/>
+            <field name="base_code_id" ref="iva_ded_16_52"/>
+            <field name="tax_code_id" ref="iva_ded_18_52"/>
+            <field name="ref_base_code_id" ref="iva_ded_16_52"/>
+            <field name="ref_tax_code_id" ref="iva_ded_18_52"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+
 <!-- OPERACIONES INTRACOMUNITARIAS -->
-        
+
         <!-- VENTAS -->
         <record id="iva_IO" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template"/>
@@ -1528,366 +2110,11 @@
             <field eval="-1.0" name="ref_tax_sign"/>
             <field name="type_tax_use">sale</field>
         </record>
-        
-        
+
+
         <!-- COMPRAS -->
-        <record id="iva_IC_compras_16_bc" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nES_chart_template"/>
-            <field name="name">IVA 16% Intracomunitario. Bienes corrientes</field>
-            <field name="description">IVA 16% Intracomunitario. Bienes corrientes</field>
-            <field eval="1.00" name="amount"/>
-            <field name="type">percent</field>
-            <field eval="1" name="child_depend"/>
-            <field name="type_tax_use">purchase</field>
-        </record>
-        <record id="iva_IC_compras_16_bc_1" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nES_chart_template"/>
-            <field name="parent_id" ref="iva_IC_compras_16_bc"/>
-            <field name="name">IVA 16% Intracomunitario. Bienes corrientes (1)</field>
-            <field eval="0.16" name="amount"/>
-            <field name="type">percent</field>
-            <field name="account_paid_id" ref="pgc_472016"/>
-            <field name="account_collected_id" ref="pgc_472016"/>
-            <field name="base_code_id" ref="iva_ded_30_16"/>
-            <field name="tax_code_id" ref="iva_ded_31_16"/>
-            <field name="ref_base_code_id" ref="iva_ded_30_16"/>
-            <field name="ref_tax_code_id" ref="iva_ded_31_16"/>
-            <field eval="-1.0" name="ref_base_sign"/>
-            <field eval="-1.0" name="ref_tax_sign"/>
-            <field name="type_tax_use">purchase</field>
-        </record>
-        <record id="iva_IC_compras_16_bc_2" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nES_chart_template"/>
-            <field name="parent_id" ref="iva_IC_compras_16_bc"/>
-            <field name="name">IVA 16% Intracomunitario. Bienes corrientes (2)</field>
-            <field eval="-0.16" name="amount"/>
-            <field name="type">percent</field>
-            <field name="account_paid_id" ref="pgc_477016"/>
-            <field name="account_collected_id" ref="pgc_477016"/>
-            <field name="base_code_id" ref="iva_dev_19"/>
-            <field name="tax_code_id" ref="iva_dev_20"/>
-            <field eval="-1.0" name="tax_sign"/>
-            <field name="ref_base_code_id" ref="iva_dev_19"/>
-            <field eval="-1.0" name="ref_base_sign"/>
-            <!--ATENCIÓN AQUÍ CON LOS SIGNOS. PENDIENTE DE PRUEBA EN PROFUNDIDAD-->
-            <field name="ref_tax_code_id" ref="iva_dev_20"/>
-            <field eval="1.0" name="ref_tax_sign"/>
-            <field name="type_tax_use">purchase</field>
-        </record>
-        
-        <record id="iva_IC_compras_18_bc" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nES_chart_template"/>
-            <field name="name">IVA 18% Intracomunitario. Bienes corrientes</field>
-            <field name="description">IVA 18% Intracomunitario. Bienes corrientes</field>
-            <field eval="1.00" name="amount"/>
-            <field name="type">percent</field>
-            <field eval="1" name="child_depend"/>
-            <field name="type_tax_use">purchase</field>
-        </record>
-        <record id="iva_IC_compras_18_bc_1" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nES_chart_template"/>
-            <field name="parent_id" ref="iva_IC_compras_18_bc"/>
-            <field name="name">IVA 18% Intracomunitario. Bienes corrientes (1)</field>
-            <field eval="0.18" name="amount"/>
-            <field name="type">percent</field>
-            <field name="account_paid_id" ref="pgc_472018"/>
-            <field name="account_collected_id" ref="pgc_472018"/>
-            <field name="base_code_id" ref="iva_ded_30_18"/>
-            <field name="tax_code_id" ref="iva_ded_31_18"/>
-            <field name="ref_base_code_id" ref="iva_ded_30_18"/>
-            <field name="ref_tax_code_id" ref="iva_ded_31_18"/>
-            <field eval="-1.0" name="ref_base_sign"/>
-            <field eval="-1.0" name="ref_tax_sign"/>
-            <field name="type_tax_use">purchase</field>
-        </record>
-        <record id="iva_IC_compras_18_bc_2" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nES_chart_template"/>
-            <field name="parent_id" ref="iva_IC_compras_18_bc"/>
-            <field name="name">IVA 18% Intracomunitario. Bienes corrientes (2)</field>
-            <field eval="-0.18" name="amount"/>
-            <field name="type">percent</field>
-            <field name="account_paid_id" ref="pgc_477018"/>
-            <field name="account_collected_id" ref="pgc_477018"/>
-            <field name="base_code_id" ref="iva_dev_19"/>
-            <field name="tax_code_id" ref="iva_dev_20"/>
-            <field eval="-1.0" name="tax_sign"/>
-            <field name="ref_base_code_id" ref="iva_dev_19"/>
-            <field eval="-1.0" name="ref_base_sign"/>
-            <!--ATENCIÓN AQUÍ CON LOS SIGNOS. PENDIENTE DE PRUEBA EN PROFUNDIDAD-->
-            <field name="ref_tax_code_id" ref="iva_dev_20"/>
-            <field eval="1.0" name="ref_tax_sign"/>
-            <field name="type_tax_use">purchase</field>
-        </record>
-        <!--record id="vat_IO_buy_21b_3" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nES_chart_template"/>
-            <field name="parent_id" ref="vat_IO_buy_21b"/>
-            <field name="name">Biens Déductibles 21% (3)</field>
-            <field eval="0.00" name="amount"/>
-            <field name="type">percent</field>
-            <field name="ref_base_code_id" ref="vat_code_a86"/>
-            <field eval="-1.0" name="ref_base_sign"/>
-            <field name="type_tax_use">purchase</field>
-        </record-->
-<!-- ES NECESARIO ESTE ÚLTIMO REGISTRO????-->
 
-        <record id="iva_IC_compras_16_bi" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nES_chart_template"/>
-            <field name="name">IVA 16% Intracomunitario. Bienes de inversión</field>
-            <field name="description">IVA 16% Intracomunitario. Bienes de inversión</field>
-            <field eval="1.00" name="amount"/>
-            <field name="type">percent</field>
-            <field eval="1" name="child_depend"/>
-            <field name="type_tax_use">purchase</field>
-        </record>
-        <record id="iva_IC_compras_16_bi_1" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nES_chart_template"/>
-            <field name="parent_id" ref="iva_IC_compras_16_bi"/>
-            <field name="name">IVA 16% Intracomunitario. Bienes de inversión (1)</field>
-            <field eval="0.16" name="amount"/>
-            <field name="type">percent</field>
-            <field name="account_paid_id" ref="pgc_472016"/>
-            <field name="account_collected_id" ref="pgc_472016"/>
-            <field name="base_code_id" ref="iva_ded_32_16"/>
-            <field name="tax_code_id" ref="iva_ded_33_16"/>
-            <field name="ref_base_code_id" ref="iva_ded_32_16"/>
-            <field eval="-1.0" name="ref_base_sign"/>
-            <field name="ref_tax_code_id" ref="iva_ded_33_16"/>
-            <field eval="-1.0" name="ref_tax_sign"/>
-            <field name="type_tax_use">purchase</field>
-        </record>
-        <record id="iva_IC_compras_16_bi_2" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nES_chart_template"/>
-            <field name="parent_id" ref="iva_IC_compras_16_bi"/>
-            <field name="name">IVA 16% Intracomunitario. Bienes de inversión (2)</field>
-            <field eval="-0.16" name="amount"/>
-            <field name="type">percent</field>
-            <field name="account_paid_id" ref="pgc_477016"/>
-            <field name="account_collected_id" ref="pgc_477016"/>
-            <field name="base_code_id" ref="iva_dev_19"/>
-            <field name="tax_code_id" ref="iva_dev_20"/>
-            <field eval="-1.0" name="tax_sign"/>
-            <field name="ref_base_code_id" ref="iva_dev_19"/>
-            <field eval="-1.0" name="ref_base_sign"/>
-            <field name="ref_tax_code_id" ref="iva_dev_20"/>
-            <field eval="1.0" name="ref_tax_sign"/>
-            <field name="type_tax_use">purchase</field>
-        </record>
-        <record id="iva_IC_compras_18_bi" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nES_chart_template"/>
-            <field name="name">IVA 18% Intracomunitario. Bienes de inversión</field>
-            <field name="description">IVA 18% Intracomunitario. Bienes de inversión</field>
-            <field eval="1.00" name="amount"/>
-            <field name="type">percent</field>
-            <field eval="1" name="child_depend"/>
-            <field name="type_tax_use">purchase</field>
-        </record>
-        <record id="iva_IC_compras_18_bi_1" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nES_chart_template"/>
-            <field name="parent_id" ref="iva_IC_compras_18_bi"/>
-            <field name="name">IVA 18% Intracomunitario. Bienes de inversión (1)</field>
-            <field eval="0.18" name="amount"/>
-            <field name="type">percent</field>
-            <field name="account_paid_id" ref="pgc_472018"/>
-            <field name="account_collected_id" ref="pgc_472018"/>
-            <field name="base_code_id" ref="iva_ded_32_18"/>
-            <field name="tax_code_id" ref="iva_ded_33_18"/>
-            <field name="ref_base_code_id" ref="iva_ded_32_18"/>
-            <field eval="-1.0" name="ref_base_sign"/>
-            <field name="ref_tax_code_id" ref="iva_ded_33_18"/>
-            <field eval="-1.0" name="ref_tax_sign"/>
-            <field name="type_tax_use">purchase</field>
-        </record>
-        <record id="iva_IC_compras_18_bi_2" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nES_chart_template"/>
-            <field name="parent_id" ref="iva_IC_compras_18_bi"/>
-            <field name="name">IVA 18% Intracomunitario. Bienes de inversión (2)</field>
-            <field eval="-0.18" name="amount"/>
-            <field name="type">percent</field>
-            <field name="account_paid_id" ref="pgc_477018"/>
-            <field name="account_collected_id" ref="pgc_477018"/>
-            <field name="base_code_id" ref="iva_dev_19"/>
-            <field name="tax_code_id" ref="iva_dev_20"/>
-            <field eval="-1.0" name="tax_sign"/>
-            <field name="ref_base_code_id" ref="iva_dev_19"/>
-            <field eval="-1.0" name="ref_base_sign"/>
-            <field name="ref_tax_code_id" ref="iva_dev_20"/>
-            <field eval="1.0" name="ref_tax_sign"/>
-            <field name="type_tax_use">purchase</field>
-        </record>
-
-        <record id="iva_IC_compras_7_bc" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nES_chart_template"/>
-            <field name="name">IVA 7% Intracomunitario. Bienes corrientes</field>
-            <field name="description">IVA 7% Intracomunitario. Bienes corrientes</field>
-            <field eval="1.00" name="amount"/>
-            <field name="type">percent</field>
-            <field eval="1" name="child_depend"/>
-            <field name="type_tax_use">purchase</field>
-        </record>
-        <record id="iva_IC_compras_7_bc_1" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nES_chart_template"/>
-            <field name="parent_id" ref="iva_IC_compras_7_bc"/>
-            <field name="name">IVA 7% Intracomunitario. Bienes corrientes (1)</field>
-            <field eval="0.07" name="amount"/>
-            <field name="type">percent</field>
-            <field name="account_paid_id" ref="pgc_472007"/>
-            <field name="account_collected_id" ref="pgc_472007"/>
-            <field name="base_code_id" ref="iva_ded_30_7"/>
-            <field name="tax_code_id" ref="iva_ded_31_7"/>
-            <field name="ref_base_code_id" ref="iva_ded_30_7"/>
-            <field eval="-1.0" name="ref_base_sign"/>
-            <field name="ref_tax_code_id" ref="iva_ded_31_7"/>
-            <field eval="-1.0" name="ref_tax_sign"/>
-            <field name="type_tax_use">purchase</field>
-        </record>
-        <record id="iva_IC_compras_7_bc_2" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nES_chart_template"/>
-            <field name="parent_id" ref="iva_IC_compras_7_bc"/>
-            <field name="name">IVA 7% Intracomunitario. Bienes corrientes (2)</field>
-            <field eval="-0.07" name="amount"/>
-            <field name="type">percent</field>
-            <field name="account_paid_id" ref="pgc_477007"/>
-            <field name="account_collected_id" ref="pgc_477007"/>
-            <field name="base_code_id" ref="iva_dev_19"/>
-            <field name="tax_code_id" ref="iva_dev_20"/>
-            <field eval="-1.0" name="tax_sign"/>
-            <field name="ref_base_code_id" ref="iva_dev_19"/>
-            <field eval="-1.0" name="ref_base_sign"/>
-            <field name="ref_tax_code_id" ref="iva_dev_20"/>
-            <field eval="1.0" name="ref_tax_sign"/>
-            <field name="type_tax_use">purchase</field>
-        </record>
-
-        <record id="iva_IC_compras_7_bi" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nES_chart_template"/>
-            <field name="name">IVA 7% Intracomunitario. Bienes de inversión</field>
-            <field name="description">IVA 7% Intracomunitario. Bienes de inversión</field>
-            <field eval="1.00" name="amount"/>
-            <field name="type">percent</field>
-            <field eval="1" name="child_depend"/>
-            <field name="type_tax_use">purchase</field>
-        </record>
-        <record id="iva_IC_compras_7_bi_1" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nES_chart_template"/>
-            <field name="parent_id" ref="iva_IC_compras_7_bi"/>
-            <field name="name">IVA 7% Intracomunitario. Bienes de inversión (1)</field>
-            <field eval="0.07" name="amount"/>
-            <field name="type">percent</field>
-            <field name="account_paid_id" ref="pgc_472007"/>
-            <field name="account_collected_id" ref="pgc_472007"/>
-            <field name="base_code_id" ref="iva_ded_32_7"/>
-            <field name="tax_code_id" ref="iva_ded_33_7"/>
-            <field name="ref_base_code_id" ref="iva_ded_32_7"/>
-            <field eval="-1.0" name="ref_base_sign"/>
-            <field name="ref_tax_code_id" ref="iva_ded_33_7"/>
-            <field eval="-1.0" name="ref_tax_sign"/>
-            <field name="type_tax_use">purchase</field>
-        </record>
-        <record id="iva_IC_compras_7_bi_2" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nES_chart_template"/>
-            <field name="parent_id" ref="iva_IC_compras_7_bi"/>
-            <field name="name">IVA 7% Intracomunitario. Bienes de inversión (2)</field>
-            <field eval="-0.07" name="amount"/>
-            <field name="type">percent</field>
-            <field name="account_paid_id" ref="pgc_477007"/>
-            <field name="account_collected_id" ref="pgc_477007"/>
-            <field name="base_code_id" ref="iva_dev_19"/>
-            <field name="tax_code_id" ref="iva_dev_20"/>
-            <field eval="-1.0" name="tax_sign"/>
-            <field name="ref_base_code_id" ref="iva_dev_19"/>
-            <field eval="-1.0" name="ref_base_sign"/>
-            <field name="ref_tax_code_id" ref="iva_dev_20"/>
-            <field eval="1.0" name="ref_tax_sign"/>
-            <field name="type_tax_use">purchase</field>
-        </record>
-        
-        <record id="iva_IC_compras_8_bc" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nES_chart_template"/>
-            <field name="name">IVA 8% Intracomunitario. Bienes corrientes</field>
-            <field name="description">IVA 8% Intracomunitario. Bienes corrientes</field>
-            <field eval="1.00" name="amount"/>
-            <field name="type">percent</field>
-            <field eval="1" name="child_depend"/>
-            <field name="type_tax_use">purchase</field>
-        </record>
-        <record id="iva_IC_compras_8_bc_1" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nES_chart_template"/>
-            <field name="parent_id" ref="iva_IC_compras_8_bc"/>
-            <field name="name">IVA 8% Intracomunitario. Bienes corrientes (1)</field>
-            <field eval="0.08" name="amount"/>
-            <field name="type">percent</field>
-            <field name="account_paid_id" ref="pgc_472008"/>
-            <field name="account_collected_id" ref="pgc_472008"/>
-            <field name="base_code_id" ref="iva_ded_30_8"/>
-            <field name="tax_code_id" ref="iva_ded_31_8"/>
-            <field name="ref_base_code_id" ref="iva_ded_30_8"/>
-            <field eval="-1.0" name="ref_base_sign"/>
-            <field name="ref_tax_code_id" ref="iva_ded_31_8"/>
-            <field eval="-1.0" name="ref_tax_sign"/>
-            <field name="type_tax_use">purchase</field>
-        </record>
-        <record id="iva_IC_compras_8_bc_2" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nES_chart_template"/>
-            <field name="parent_id" ref="iva_IC_compras_8_bc"/>
-            <field name="name">IVA 8% Intracomunitario. Bienes corrientes (2)</field>
-            <field eval="-0.08" name="amount"/>
-            <field name="type">percent</field>
-            <field name="account_paid_id" ref="pgc_477008"/>
-            <field name="account_collected_id" ref="pgc_477008"/>
-            <field name="base_code_id" ref="iva_dev_19"/>
-            <field name="tax_code_id" ref="iva_dev_20"/>
-            <field eval="-1.0" name="tax_sign"/>
-            <field name="ref_base_code_id" ref="iva_dev_19"/>
-            <field eval="-1.0" name="ref_base_sign"/>
-            <field name="ref_tax_code_id" ref="iva_dev_20"/>
-            <field eval="1.0" name="ref_tax_sign"/>
-            <field name="type_tax_use">purchase</field>
-        </record>
-
-        <record id="iva_IC_compras_8_bi" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nES_chart_template"/>
-            <field name="name">IVA 8% Intracomunitario. Bienes de inversión</field>
-            <field name="description">IVA 8% Intracomunitario. Bienes de inversión</field>
-            <field eval="1.00" name="amount"/>
-            <field name="type">percent</field>
-            <field eval="1" name="child_depend"/>
-            <field name="type_tax_use">purchase</field>
-        </record>
-        <record id="iva_IC_compras_8_bi_1" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nES_chart_template"/>
-            <field name="parent_id" ref="iva_IC_compras_8_bi"/>
-            <field name="name">IVA 8% Intracomunitario. Bienes de inversión (1)</field>
-            <field eval="0.08" name="amount"/>
-            <field name="type">percent</field>
-            <field name="account_paid_id" ref="pgc_472008"/>
-            <field name="account_collected_id" ref="pgc_472008"/>
-            <field name="base_code_id" ref="iva_ded_32_8"/>
-            <field name="tax_code_id" ref="iva_ded_33_8"/>
-            <field name="ref_base_code_id" ref="iva_ded_32_8"/>
-            <field eval="-1.0" name="ref_base_sign"/>
-            <field name="ref_tax_code_id" ref="iva_ded_33_8"/>
-            <field eval="-1.0" name="ref_tax_sign"/>
-            <field name="type_tax_use">purchase</field>
-        </record>
-        <record id="iva_IC_compras_8_bi_2" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nES_chart_template"/>
-            <field name="parent_id" ref="iva_IC_compras_8_bi"/>
-            <field name="name">IVA 8% Intracomunitario. Bienes de inversión (2)</field>
-            <field eval="-0.08" name="amount"/>
-            <field name="type">percent</field>
-            <field name="account_paid_id" ref="pgc_477008"/>
-            <field name="account_collected_id" ref="pgc_477008"/>
-            <field name="base_code_id" ref="iva_dev_19"/>
-            <field name="tax_code_id" ref="iva_dev_20"/>
-            <field eval="-1.0" name="tax_sign"/>
-            <field name="ref_base_code_id" ref="iva_dev_19"/>
-            <field eval="-1.0" name="ref_base_sign"/>
-            <field name="ref_tax_code_id" ref="iva_dev_20"/>
-            <field eval="1.0" name="ref_tax_sign"/>
-            <field name="type_tax_use">purchase</field>
-        </record>
-
-        <record id="iva_IC_compras_4_bc" model="account.tax.template">
+		<record id="iva_IC_compras_4_bc" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template"/>
             <field name="name">IVA 4% Intracomunitario. Bienes corrientes</field>
             <field name="description">IVA 4% Intracomunitario. Bienes corrientes</field>
@@ -1902,8 +2129,8 @@
             <field name="name">IVA 4% Intracomunitario. Bienes corrientes (1)</field>
             <field eval="0.04" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_paid_id" ref="pgc_472004"/>
-            <field name="account_collected_id" ref="pgc_472004"/>
+            <field name="account_paid_id" ref="pgc_472000"/>
+            <field name="account_collected_id" ref="pgc_472000"/>
             <field name="base_code_id" ref="iva_ded_30_4"/>
             <field name="tax_code_id" ref="iva_ded_31_4"/>
             <field name="ref_base_code_id" ref="iva_ded_30_4"/>
@@ -1918,8 +2145,8 @@
             <field name="name">IVA 4% Intracomunitario. Bienes corrientes (2)</field>
             <field eval="-0.04" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_paid_id" ref="pgc_477004"/>
-            <field name="account_collected_id" ref="pgc_477004"/>
+            <field name="account_paid_id" ref="pgc_477000"/>
+            <field name="account_collected_id" ref="pgc_477000"/>
             <field name="base_code_id" ref="iva_dev_19"/>
             <field name="tax_code_id" ref="iva_dev_20"/>
             <field eval="-1.0" name="tax_sign"/>
@@ -1945,8 +2172,8 @@
             <field name="name">IVA 4% Intracomunitario. Bienes de inversión (1)</field>
             <field eval="0.04" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_paid_id" ref="pgc_472004"/>
-            <field name="account_collected_id" ref="pgc_472004"/>
+            <field name="account_paid_id" ref="pgc_472000"/>
+            <field name="account_collected_id" ref="pgc_472000"/>
             <field name="base_code_id" ref="iva_ded_32_4"/>
             <field name="tax_code_id" ref="iva_ded_33_4"/>
             <field name="ref_base_code_id" ref="iva_ded_32_4"/>
@@ -1961,8 +2188,8 @@
             <field name="name">IVA 4% Intracomunitario. Bienes de inversión (2)</field>
             <field eval="-0.04" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_paid_id" ref="pgc_477004"/>
-            <field name="account_collected_id" ref="pgc_477004"/>
+            <field name="account_paid_id" ref="pgc_477000"/>
+            <field name="account_collected_id" ref="pgc_477000"/>
             <field name="base_code_id" ref="iva_dev_19"/>
             <field name="tax_code_id" ref="iva_dev_20"/>
             <field eval="-1.0" name="tax_sign"/>
@@ -1972,7 +2199,538 @@
             <field eval="1.0" name="ref_tax_sign"/>
             <field name="type_tax_use">purchase</field>
         </record>
-        
+
+         <record id="iva_IC_compras_7_bc" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+            <field name="name">IVA 7% Intracomunitario. Bienes corrientes</field>
+            <field name="description">IVA 7% Intracomunitario. Bienes corrientes</field>
+            <field eval="1.00" name="amount"/>
+            <field name="type">percent</field>
+            <field eval="1" name="child_depend"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_IC_compras_7_bc_1" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+            <field name="parent_id" ref="iva_IC_compras_7_bc"/>
+            <field name="name">IVA 7% Intracomunitario. Bienes corrientes (1)</field>
+            <field eval="0.07" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_472000"/>
+            <field name="account_collected_id" ref="pgc_472000"/>
+            <field name="base_code_id" ref="iva_ded_30_7"/>
+            <field name="tax_code_id" ref="iva_ded_31_7"/>
+            <field name="ref_base_code_id" ref="iva_ded_30_7"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="ref_tax_code_id" ref="iva_ded_31_7"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_IC_compras_7_bc_2" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+            <field name="parent_id" ref="iva_IC_compras_7_bc"/>
+            <field name="name">IVA 7% Intracomunitario. Bienes corrientes (2)</field>
+            <field eval="-0.07" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_477000"/>
+            <field name="account_collected_id" ref="pgc_477000"/>
+            <field name="base_code_id" ref="iva_dev_19"/>
+            <field name="tax_code_id" ref="iva_dev_20"/>
+            <field eval="-1.0" name="tax_sign"/>
+            <field name="ref_base_code_id" ref="iva_dev_19"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="ref_tax_code_id" ref="iva_dev_20"/>
+            <field eval="1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="iva_IC_compras_7_bi" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+            <field name="name">IVA 7% Intracomunitario. Bienes de inversión</field>
+            <field name="description">IVA 7% Intracomunitario. Bienes de inversión</field>
+            <field eval="1.00" name="amount"/>
+            <field name="type">percent</field>
+            <field eval="1" name="child_depend"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_IC_compras_7_bi_1" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+            <field name="parent_id" ref="iva_IC_compras_7_bi"/>
+            <field name="name">IVA 7% Intracomunitario. Bienes de inversión (1)</field>
+            <field eval="0.07" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_472000"/>
+            <field name="account_collected_id" ref="pgc_472000"/>
+            <field name="base_code_id" ref="iva_ded_32_7"/>
+            <field name="tax_code_id" ref="iva_ded_33_7"/>
+            <field name="ref_base_code_id" ref="iva_ded_32_7"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="ref_tax_code_id" ref="iva_ded_33_7"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_IC_compras_7_bi_2" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+            <field name="parent_id" ref="iva_IC_compras_7_bi"/>
+            <field name="name">IVA 7% Intracomunitario. Bienes de inversión (2)</field>
+            <field eval="-0.07" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_477000"/>
+            <field name="account_collected_id" ref="pgc_477000"/>
+            <field name="base_code_id" ref="iva_dev_19"/>
+            <field name="tax_code_id" ref="iva_dev_20"/>
+            <field eval="-1.0" name="tax_sign"/>
+            <field name="ref_base_code_id" ref="iva_dev_19"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="ref_tax_code_id" ref="iva_dev_20"/>
+            <field eval="1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="iva_IC_compras_8_bc" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+            <field name="name">IVA 8% Intracomunitario. Bienes corrientes</field>
+            <field name="description">IVA 8% Intracomunitario. Bienes corrientes</field>
+            <field eval="1.00" name="amount"/>
+            <field name="type">percent</field>
+            <field eval="1" name="child_depend"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_IC_compras_8_bc_1" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+            <field name="parent_id" ref="iva_IC_compras_8_bc"/>
+            <field name="name">IVA 8% Intracomunitario. Bienes corrientes (1)</field>
+            <field eval="0.08" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_472000"/>
+            <field name="account_collected_id" ref="pgc_472000"/>
+            <field name="base_code_id" ref="iva_ded_30_8"/>
+            <field name="tax_code_id" ref="iva_ded_31_8"/>
+            <field name="ref_base_code_id" ref="iva_ded_30_8"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="ref_tax_code_id" ref="iva_ded_31_8"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_IC_compras_8_bc_2" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+            <field name="parent_id" ref="iva_IC_compras_8_bc"/>
+            <field name="name">IVA 8% Intracomunitario. Bienes corrientes (2)</field>
+            <field eval="-0.08" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_477000"/>
+            <field name="account_collected_id" ref="pgc_477000"/>
+            <field name="base_code_id" ref="iva_dev_19"/>
+            <field name="tax_code_id" ref="iva_dev_20"/>
+            <field eval="-1.0" name="tax_sign"/>
+            <field name="ref_base_code_id" ref="iva_dev_19"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="ref_tax_code_id" ref="iva_dev_20"/>
+            <field eval="1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="iva_IC_compras_8_bi" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+            <field name="name">IVA 8% Intracomunitario. Bienes de inversión</field>
+            <field name="description">IVA 8% Intracomunitario. Bienes de inversión</field>
+            <field eval="1.00" name="amount"/>
+            <field name="type">percent</field>
+            <field eval="1" name="child_depend"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_IC_compras_8_bi_1" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+            <field name="parent_id" ref="iva_IC_compras_8_bi"/>
+            <field name="name">IVA 8% Intracomunitario. Bienes de inversión (1)</field>
+            <field eval="0.08" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_472000"/>
+            <field name="account_collected_id" ref="pgc_472000"/>
+            <field name="base_code_id" ref="iva_ded_32_8"/>
+            <field name="tax_code_id" ref="iva_ded_33_8"/>
+            <field name="ref_base_code_id" ref="iva_ded_32_8"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="ref_tax_code_id" ref="iva_ded_33_8"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_IC_compras_8_bi_2" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+            <field name="parent_id" ref="iva_IC_compras_8_bi"/>
+            <field name="name">IVA 8% Intracomunitario. Bienes de inversión (2)</field>
+            <field eval="-0.08" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_477000"/>
+            <field name="account_collected_id" ref="pgc_477000"/>
+            <field name="base_code_id" ref="iva_dev_19"/>
+            <field name="tax_code_id" ref="iva_dev_20"/>
+            <field eval="-1.0" name="tax_sign"/>
+            <field name="ref_base_code_id" ref="iva_dev_19"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="ref_tax_code_id" ref="iva_dev_20"/>
+            <field eval="1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="iva_IC_compras_10_bc" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+            <field name="name">IVA 10% Intracomunitario. Bienes corrientes</field>
+            <field name="description">IVA 10% Intracomunitario. Bienes corrientes</field>
+            <field eval="1.00" name="amount"/>
+            <field name="type">percent</field>
+            <field eval="1" name="child_depend"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_IC_compras_10_bc_1" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+            <field name="parent_id" ref="iva_IC_compras_10_bc"/>
+            <field name="name">IVA 10% Intracomunitario. Bienes corrientes (1)</field>
+            <field eval="0.10" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_472000"/>
+            <field name="account_collected_id" ref="pgc_472000"/>
+            <field name="base_code_id" ref="iva_ded_30_10"/>
+            <field name="tax_code_id" ref="iva_ded_31_10"/>
+            <field name="ref_base_code_id" ref="iva_ded_30_10"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="ref_tax_code_id" ref="iva_ded_31_10"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_IC_compras_10_bc_2" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+            <field name="parent_id" ref="iva_IC_compras_10_bc"/>
+            <field name="name">IVA 10% Intracomunitario. Bienes corrientes (2)</field>
+            <field eval="-0.10" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_477000"/>
+            <field name="account_collected_id" ref="pgc_477000"/>
+            <field name="base_code_id" ref="iva_dev_19"/>
+            <field name="tax_code_id" ref="iva_dev_20"/>
+            <field eval="-1.0" name="tax_sign"/>
+            <field name="ref_base_code_id" ref="iva_dev_19"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="ref_tax_code_id" ref="iva_dev_20"/>
+            <field eval="1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="iva_IC_compras_10_bi" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+            <field name="name">IVA 10% Intracomunitario. Bienes de inversión</field>
+            <field name="description">IVA 10% Intracomunitario. Bienes de inversión</field>
+            <field eval="1.00" name="amount"/>
+            <field name="type">percent</field>
+            <field eval="1" name="child_depend"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_IC_compras_10_bi_1" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+            <field name="parent_id" ref="iva_IC_compras_10_bi"/>
+            <field name="name">IVA 10% Intracomunitario. Bienes de inversión (1)</field>
+            <field eval="0.10" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_472000"/>
+            <field name="account_collected_id" ref="pgc_472000"/>
+            <field name="base_code_id" ref="iva_ded_32_10"/>
+            <field name="tax_code_id" ref="iva_ded_33_10"/>
+            <field name="ref_base_code_id" ref="iva_ded_32_10"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="ref_tax_code_id" ref="iva_ded_33_10"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_IC_compras_10_bi_2" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+            <field name="parent_id" ref="iva_IC_compras_10_bi"/>
+            <field name="name">IVA 10% Intracomunitario. Bienes de inversión (2)</field>
+            <field eval="-0.10" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_477000"/>
+            <field name="account_collected_id" ref="pgc_477000"/>
+            <field name="base_code_id" ref="iva_dev_19"/>
+            <field name="tax_code_id" ref="iva_dev_20"/>
+            <field eval="-1.0" name="tax_sign"/>
+            <field name="ref_base_code_id" ref="iva_dev_19"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="ref_tax_code_id" ref="iva_dev_20"/>
+            <field eval="1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+		<record id="iva_IC_compras_16_bc" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+            <field name="name">IVA 16% Intracomunitario. Bienes corrientes</field>
+            <field name="description">IVA 16% Intracomunitario. Bienes corrientes</field>
+            <field eval="1.00" name="amount"/>
+            <field name="type">percent</field>
+            <field eval="1" name="child_depend"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_IC_compras_16_bc_1" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+            <field name="parent_id" ref="iva_IC_compras_16_bc"/>
+            <field name="name">IVA 16% Intracomunitario. Bienes corrientes (1)</field>
+            <field eval="0.16" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_472000"/>
+            <field name="account_collected_id" ref="pgc_472000"/>
+            <field name="base_code_id" ref="iva_ded_30_16"/>
+            <field name="tax_code_id" ref="iva_ded_31_16"/>
+            <field name="ref_base_code_id" ref="iva_ded_30_16"/>
+            <field name="ref_tax_code_id" ref="iva_ded_31_16"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_IC_compras_16_bc_2" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+            <field name="parent_id" ref="iva_IC_compras_16_bc"/>
+            <field name="name">IVA 16% Intracomunitario. Bienes corrientes (2)</field>
+            <field eval="-0.16" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_477000"/>
+            <field name="account_collected_id" ref="pgc_477000"/>
+            <field name="base_code_id" ref="iva_dev_19"/>
+            <field name="tax_code_id" ref="iva_dev_20"/>
+            <field eval="-1.0" name="tax_sign"/>
+            <field name="ref_base_code_id" ref="iva_dev_19"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <!--ATENCIÓN AQUÍ CON LOS SIGNOS. PENDIENTE DE PRUEBA EN PROFUNDIDAD-->
+            <field name="ref_tax_code_id" ref="iva_dev_20"/>
+            <field eval="1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+		<record id="iva_IC_compras_16_bi" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+            <field name="name">IVA 16% Intracomunitario. Bienes de inversión</field>
+            <field name="description">IVA 16% Intracomunitario. Bienes de inversión</field>
+            <field eval="1.00" name="amount"/>
+            <field name="type">percent</field>
+            <field eval="1" name="child_depend"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_IC_compras_16_bi_1" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+            <field name="parent_id" ref="iva_IC_compras_16_bi"/>
+            <field name="name">IVA 16% Intracomunitario. Bienes de inversión (1)</field>
+            <field eval="0.16" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_472000"/>
+            <field name="account_collected_id" ref="pgc_472000"/>
+            <field name="base_code_id" ref="iva_ded_32_16"/>
+            <field name="tax_code_id" ref="iva_ded_33_16"/>
+            <field name="ref_base_code_id" ref="iva_ded_32_16"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="ref_tax_code_id" ref="iva_ded_33_16"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_IC_compras_16_bi_2" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+            <field name="parent_id" ref="iva_IC_compras_16_bi"/>
+            <field name="name">IVA 16% Intracomunitario. Bienes de inversión (2)</field>
+            <field eval="-0.16" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_477000"/>
+            <field name="account_collected_id" ref="pgc_477000"/>
+            <field name="base_code_id" ref="iva_dev_19"/>
+            <field name="tax_code_id" ref="iva_dev_20"/>
+            <field eval="-1.0" name="tax_sign"/>
+            <field name="ref_base_code_id" ref="iva_dev_19"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="ref_tax_code_id" ref="iva_dev_20"/>
+            <field eval="1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="iva_IC_compras_18_bc" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+            <field name="name">IVA 18% Intracomunitario. Bienes corrientes</field>
+            <field name="description">IVA 18% Intracomunitario. Bienes corrientes</field>
+            <field eval="1.00" name="amount"/>
+            <field name="type">percent</field>
+            <field eval="1" name="child_depend"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_IC_compras_18_bc_1" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+            <field name="parent_id" ref="iva_IC_compras_18_bc"/>
+            <field name="name">IVA 18% Intracomunitario. Bienes corrientes (1)</field>
+            <field eval="0.18" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_472000"/>
+            <field name="account_collected_id" ref="pgc_472000"/>
+            <field name="base_code_id" ref="iva_ded_30_18"/>
+            <field name="tax_code_id" ref="iva_ded_31_18"/>
+            <field name="ref_base_code_id" ref="iva_ded_30_18"/>
+            <field name="ref_tax_code_id" ref="iva_ded_31_18"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_IC_compras_18_bc_2" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+            <field name="parent_id" ref="iva_IC_compras_18_bc"/>
+            <field name="name">IVA 18% Intracomunitario. Bienes corrientes (2)</field>
+            <field eval="-0.18" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_477000"/>
+            <field name="account_collected_id" ref="pgc_477000"/>
+            <field name="base_code_id" ref="iva_dev_19"/>
+            <field name="tax_code_id" ref="iva_dev_20"/>
+            <field eval="-1.0" name="tax_sign"/>
+            <field name="ref_base_code_id" ref="iva_dev_19"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <!--ATENCIÓN AQUÍ CON LOS SIGNOS. PENDIENTE DE PRUEBA EN PROFUNDIDAD-->
+            <field name="ref_tax_code_id" ref="iva_dev_20"/>
+            <field eval="1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <!--record id="vat_IO_buy_21b_3" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+            <field name="parent_id" ref="vat_IO_buy_21b"/>
+            <field name="name">Biens Déductibles 21% (3)</field>
+            <field eval="0.00" name="amount"/>
+            <field name="type">percent</field>
+            <field name="ref_base_code_id" ref="vat_code_a86"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record-->
+<!-- ES NECESARIO ESTE ÚLTIMO REGISTRO????-->
+
+         <record id="iva_IC_compras_18_bi" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+            <field name="name">IVA 18% Intracomunitario. Bienes de inversión</field>
+            <field name="description">IVA 18% Intracomunitario. Bienes de inversión</field>
+            <field eval="1.00" name="amount"/>
+            <field name="type">percent</field>
+            <field eval="1" name="child_depend"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_IC_compras_18_bi_1" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+            <field name="parent_id" ref="iva_IC_compras_18_bi"/>
+            <field name="name">IVA 18% Intracomunitario. Bienes de inversión (1)</field>
+            <field eval="0.18" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_472000"/>
+            <field name="account_collected_id" ref="pgc_472000"/>
+            <field name="base_code_id" ref="iva_ded_32_18"/>
+            <field name="tax_code_id" ref="iva_ded_33_18"/>
+            <field name="ref_base_code_id" ref="iva_ded_32_18"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="ref_tax_code_id" ref="iva_ded_33_18"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_IC_compras_18_bi_2" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+            <field name="parent_id" ref="iva_IC_compras_18_bi"/>
+            <field name="name">IVA 18% Intracomunitario. Bienes de inversión (2)</field>
+            <field eval="-0.18" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_477000"/>
+            <field name="account_collected_id" ref="pgc_477000"/>
+            <field name="base_code_id" ref="iva_dev_19"/>
+            <field name="tax_code_id" ref="iva_dev_20"/>
+            <field eval="-1.0" name="tax_sign"/>
+            <field name="ref_base_code_id" ref="iva_dev_19"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="ref_tax_code_id" ref="iva_dev_20"/>
+            <field eval="1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+		<record id="iva_IC_compras_21_bc" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+            <field name="name">IVA 21% Intracomunitario. Bienes corrientes</field>
+            <field name="description">IVA 21% Intracomunitario. Bienes corrientes</field>
+            <field eval="1.00" name="amount"/>
+            <field name="type">percent</field>
+            <field eval="1" name="child_depend"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_IC_compras_21_bc_1" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+            <field name="parent_id" ref="iva_IC_compras_21_bc"/>
+            <field name="name">IVA 21% Intracomunitario. Bienes corrientes (1)</field>
+            <field eval="0.21" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_472000"/>
+            <field name="account_collected_id" ref="pgc_472000"/>
+            <field name="base_code_id" ref="iva_ded_30_21"/>
+            <field name="tax_code_id" ref="iva_ded_31_21"/>
+            <field name="ref_base_code_id" ref="iva_ded_30_21"/>
+            <field name="ref_tax_code_id" ref="iva_ded_31_21"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_IC_compras_21_bc_2" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+            <field name="parent_id" ref="iva_IC_compras_21_bc"/>
+            <field name="name">IVA 21% Intracomunitario. Bienes corrientes (2)</field>
+            <field eval="-0.21" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_477000"/>
+            <field name="account_collected_id" ref="pgc_477000"/>
+            <field name="base_code_id" ref="iva_dev_19"/>
+            <field name="tax_code_id" ref="iva_dev_20"/>
+            <field eval="-1.0" name="tax_sign"/>
+            <field name="ref_base_code_id" ref="iva_dev_19"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <!--ATENCIÓN AQUÍ CON LOS SIGNOS. PENDIENTE DE PRUEBA EN PROFUNDIDAD-->
+            <field name="ref_tax_code_id" ref="iva_dev_20"/>
+            <field eval="1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+		<record id="iva_IC_compras_21_bi" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+            <field name="name">IVA 21% Intracomunitario. Bienes de inversión</field>
+            <field name="description">IVA 21% Intracomunitario. Bienes de inversión</field>
+            <field eval="1.00" name="amount"/>
+            <field name="type">percent</field>
+            <field eval="1" name="child_depend"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_IC_compras_21_bi_1" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+            <field name="parent_id" ref="iva_IC_compras_21_bi"/>
+            <field name="name">IVA 21% Intracomunitario. Bienes de inversión (1)</field>
+            <field eval="0.21" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_472000"/>
+            <field name="account_collected_id" ref="pgc_472000"/>
+            <field name="base_code_id" ref="iva_ded_32_21"/>
+            <field name="tax_code_id" ref="iva_ded_33_21"/>
+            <field name="ref_base_code_id" ref="iva_ded_32_21"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="ref_tax_code_id" ref="iva_ded_33_21"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_IC_compras_21_bi_2" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+            <field name="parent_id" ref="iva_IC_compras_21_bi"/>
+            <field name="name">IVA 21% Intracomunitario. Bienes de inversión (2)</field>
+            <field eval="-0.21" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_477000"/>
+            <field name="account_collected_id" ref="pgc_477000"/>
+            <field name="base_code_id" ref="iva_dev_19"/>
+            <field name="tax_code_id" ref="iva_dev_20"/>
+            <field eval="-1.0" name="tax_sign"/>
+            <field name="ref_base_code_id" ref="iva_dev_19"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="ref_tax_code_id" ref="iva_dev_20"/>
+            <field eval="1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+
         <!-- RETENCIONES DE IRPF -->
         <!--
         - Novedad 2010: Los rendimientos derivados de rentas de capital mobiliario o inmobiliario, el tipo base de retención pasa del 18% al 19% para los primeros 6000 EUR y al 21% a partir de los 6000 EUR.
@@ -1980,9 +2738,9 @@
         - Rendimientos de actividades profesionales: 15% (tipo general) y 7% (tipo especial reducido por inicio de actividad)
         - Rendimientos de actividades agrícolas, ganaderas, forestales: 2%
         - Retención del 1% a aplicar en el pago de rendimientos a empresarios en módulos.-->
-        
+
         <!-- 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>
@@ -1990,56 +2748,70 @@
             <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_18" model="account.tax.code.template">
             <field name="name">IRPF Retenciones practicadas Base Imponible 18%</field>
             <field name="code">B.IRPF18</field>
             <field name="parent_id" ref="irpf_base"/>
             <field name="sign">1.0</field>
         </record>
-        
+
         <record id="irpf_base_19" model="account.tax.code.template">
             <field name="name">IRPF Retenciones practicadas Base Imponible 19%</field>
             <field name="code">B.IRPF19</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>
@@ -2047,128 +2819,78 @@
             <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_18" model="account.tax.code.template">
             <field name="name">IRPF Retenciones practicadas Cuota 18%</field>
             <field name="code">IRPF18</field>
             <field name="parent_id" ref="irpf_cuota_total"/>
             <field name="sign">1.0</field>
         </record>
-        
+
         <record id="irpf_cuota_19" model="account.tax.code.template">
             <field name="name">IRPF Retenciones practicadas Cuota 19%</field>
             <field name="code">IRPF19</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>
-        
-        <!--Cuentas para Retenciones-->
-        <record id="pgc_475101" model="account.account.template">
-            <field name="code">475101</field>
-            <field name="reconcile" eval="True"/>
-            <field name="parent_id" ref="pgc_4751"/>
-            <field name="type">other</field>
-            <field name="name">Hacienda Pública. Retenciones empresarios módulos 1%</field>
-            <field name="user_type" ref="tax"/>
-        </record>
-        
-        <record id="pgc_475102" model="account.account.template">
-            <field name="code">475102</field>
-            <field name="reconcile" eval="True"/>
-            <field name="parent_id" ref="pgc_4751"/>
-            <field name="type">other</field>
-            <field name="name">Hacienda Pública. Retenciones act. agrícolas, ganaderas, forestales 2%</field>
-            <field name="user_type" ref="tax"/>
-        </record>
-        
-        <record id="pgc_475107" model="account.account.template">
-            <field name="code">475107</field>
-            <field name="reconcile" eval="True"/>
-            <field name="parent_id" ref="pgc_4751"/>
-            <field name="type">other</field>
-            <field name="name">Hacienda Pública. Retenciones act. profesionales 7%</field>
-            <field name="user_type" ref="tax"/>
-        </record>
-        
-        <record id="pgc_475115" model="account.account.template">
-            <field name="code">475115</field>
-            <field name="reconcile" eval="True"/>
-            <field name="parent_id" ref="pgc_4751"/>
-            <field name="type">other</field>
-            <field name="name">Hacienda Pública. Retenciones act. profesionales 15%</field>
-            <field name="user_type" ref="tax"/>
-        </record>
-        
-        <record id="pgc_475118" model="account.account.template">
-            <field name="code">475118</field>
-            <field name="reconcile" eval="True"/>
-            <field name="parent_id" ref="pgc_4751"/>
-            <field name="type">other</field>
-            <field name="name">Hacienda Pública. Retenciones arrendamientos, cap. mobiliario 18%</field>
-            <field name="user_type" ref="tax"/>
-        </record>
-        
-        <record id="pgc_475119" model="account.account.template">
-            <field name="code">475119</field>
-            <field name="reconcile" eval="True"/>
-            <field name="parent_id" ref="pgc_4751"/>
-            <field name="type">other</field>
-            <field name="name">Hacienda Pública. Retenciones arrendamientos, cap. mobiliario 19%</field>
-            <field name="user_type" ref="tax"/>
-        </record>
-        
-        <record id="pgc_475121" model="account.account.template">
-            <field name="code">475121</field>
-            <field name="reconcile" eval="True"/>
-            <field name="parent_id" ref="pgc_4751"/>
-            <field name="type">other</field>
-            <field name="name">Hacienda Pública. Retenciones arrendamientos, cap. mobiliario 21%</field>
-            <field name="user_type" ref="tax"/>
-        </record>
-        
+
         <!-- Plantillas de retenciones-->
         <record id="irpf_1" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template"/>
             <field name="name">Retenciones IRPF 1%</field>
             <field eval="-0.01" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_475101"/>
-            <field name="account_paid_id" ref="pgc_475101"/>
+            <field name="account_collected_id" ref="pgc_475100"/>
+            <field name="account_paid_id" ref="pgc_475100"/>
             <field name="base_code_id" ref="irpf_base_1"/>
             <field name="tax_code_id" ref="irpf_cuota_1"/>
             <field name="ref_base_code_id" ref="irpf_base_1"/>
@@ -2179,14 +2901,14 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
         </record>
-        
+
         <record id="irpf_2" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template"/>
             <field name="name">Retenciones IRPF 2%</field>
             <field eval="-0.02" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_475102"/>
-            <field name="account_paid_id" ref="pgc_475102"/>
+            <field name="account_collected_id" ref="pgc_475100"/>
+            <field name="account_paid_id" ref="pgc_475100"/>
             <field name="base_code_id" ref="irpf_base_2"/>
             <field name="tax_code_id" ref="irpf_cuota_2"/>
             <field name="ref_base_code_id" ref="irpf_base_2"/>
@@ -2197,14 +2919,14 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
         </record>
-        
+
         <record id="irpf_7" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template"/>
             <field name="name">Retenciones IRPF 7%</field>
             <field eval="-0.07" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_475107"/>
-            <field name="account_paid_id" ref="pgc_475107"/>
+            <field name="account_collected_id" ref="pgc_475100"/>
+            <field name="account_paid_id" ref="pgc_475100"/>
             <field name="base_code_id" ref="irpf_base_7"/>
             <field name="tax_code_id" ref="irpf_cuota_7"/>
             <field name="ref_base_code_id" ref="irpf_base_7"/>
@@ -2215,14 +2937,32 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
         </record>
-        
+
+        <record id="irpf_9" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+            <field name="name">Retenciones IRPF 9%</field>
+            <field eval="-0.09" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_475100"/>
+            <field name="account_paid_id" ref="pgc_475100"/>
+            <field name="base_code_id" ref="irpf_base_9"/>
+            <field name="tax_code_id" ref="irpf_cuota_9"/>
+            <field name="ref_base_code_id" ref="irpf_base_9"/>
+            <field name="ref_tax_code_id" ref="irpf_cuota_9"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
         <record id="irpf_15" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template"/>
             <field name="name">Retenciones IRPF 15%</field>
             <field eval="-0.15" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_475115"/>
-            <field name="account_paid_id" ref="pgc_475115"/>
+            <field name="account_collected_id" ref="pgc_475100"/>
+            <field name="account_paid_id" ref="pgc_475100"/>
             <field name="base_code_id" ref="irpf_base_15"/>
             <field name="tax_code_id" ref="irpf_cuota_15"/>
             <field name="ref_base_code_id" ref="irpf_base_15"/>
@@ -2233,14 +2973,14 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
         </record>
-        
+
         <record id="irpf_18" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template"/>
             <field name="name">Retenciones IRPF 18%</field>
             <field eval="-0.18" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_475118"/>
-            <field name="account_paid_id" ref="pgc_475118"/>
+            <field name="account_collected_id" ref="pgc_475100"/>
+            <field name="account_paid_id" ref="pgc_475100"/>
             <field name="base_code_id" ref="irpf_base_18"/>
             <field name="tax_code_id" ref="irpf_cuota_18"/>
             <field name="ref_base_code_id" ref="irpf_base_18"/>
@@ -2251,14 +2991,14 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
         </record>
-        
+
         <record id="irpf_19" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template"/>
             <field name="name">Retenciones IRPF 19%</field>
             <field eval="-0.19" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_475119"/>
-            <field name="account_paid_id" ref="pgc_475119"/>
+            <field name="account_collected_id" ref="pgc_475100"/>
+            <field name="account_paid_id" ref="pgc_475100"/>
             <field name="base_code_id" ref="irpf_base_19"/>
             <field name="tax_code_id" ref="irpf_cuota_19"/>
             <field name="ref_base_code_id" ref="irpf_base_19"/>
@@ -2269,14 +3009,32 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
         </record>
-        
+
+        <record id="irpf_20" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+            <field name="name">Retenciones IRPF 20%</field>
+            <field eval="-0.20" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_475100"/>
+            <field name="account_paid_id" ref="pgc_475100"/>
+            <field name="base_code_id" ref="irpf_base_20"/>
+            <field name="tax_code_id" ref="irpf_cuota_20"/>
+            <field name="ref_base_code_id" ref="irpf_base_20"/>
+            <field name="ref_tax_code_id" ref="irpf_cuota_20"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
         <record id="irpf_21" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template"/>
             <field name="name">Retenciones IRPF 21%</field>
             <field eval="-0.21" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_475121"/>
-            <field name="account_paid_id" ref="pgc_475121"/>
+            <field name="account_collected_id" ref="pgc_475100"/>
+            <field name="account_paid_id" ref="pgc_475100"/>
             <field name="base_code_id" ref="irpf_base_21"/>
             <field name="tax_code_id" ref="irpf_cuota_21"/>
             <field name="ref_base_code_id" ref="irpf_base_21"/>
@@ -2287,9 +3045,9 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</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>
@@ -2297,56 +3055,70 @@
             <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_18" model="account.tax.code.template">
             <field name="name">IRPF Retenciones a cuenta Base Imponible 18%</field>
             <field name="code">B.IRPF18 AC</field>
             <field name="parent_id" ref="irpf_base_sale"/>
             <field name="sign">1.0</field>
         </record>
-        
+
         <record id="irpf_base_sale_19" model="account.tax.code.template">
             <field name="name">IRPF Retenciones a cuenta Base Imponible 19%</field>
             <field name="code">B.IRPF19 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>
@@ -2354,128 +3126,78 @@
             <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_18" model="account.tax.code.template">
             <field name="name">IRPF Retenciones a cuenta Cuota 18%</field>
             <field name="code">IRPF18 AC</field>
             <field name="parent_id" ref="irpf_cuota_sale_total"/>
             <field name="sign">1.0</field>
         </record>
-        
+
         <record id="irpf_cuota_sale_19" model="account.tax.code.template">
             <field name="name">IRPF Retenciones a cuenta Cuota 19%</field>
             <field name="code">IRPF19 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>
-        
-        <!--Cuentas para Retenciones-->
-        <record id="pgc_473001" model="account.account.template">
-            <field name="code">473001</field>
-            <field name="reconcile" eval="True"/>
-            <field name="parent_id" ref="pgc_473"/>
-            <field name="type">other</field>
-            <field name="name">Hacienda Pública. Retenciones a cuenta empresarios módulos 1%</field>
-            <field name="user_type" ref="tax"/>
-        </record>
-        
-        <record id="pgc_473002" model="account.account.template">
-            <field name="code">473002</field>
-            <field name="reconcile" eval="True"/>
-            <field name="parent_id" ref="pgc_473"/>
-            <field name="type">other</field>
-            <field name="name">Hacienda Pública. Retenciones a cuenta act. agrícolas, ganaderas, forestales 2%</field>
-            <field name="user_type" ref="tax"/>
-        </record>
 
-        <record id="pgc_473007" model="account.account.template">
-            <field name="code">473007</field>
-            <field name="reconcile" eval="True"/>
-            <field name="parent_id" ref="pgc_473"/>
-            <field name="type">other</field>
-            <field name="name">Hacienda Pública. Retenciones a cuenta act. profesionales 7%</field>
-            <field name="user_type" ref="tax"/>
-        </record>
-        
-        <record id="pgc_473015" model="account.account.template">
-            <field name="code">473015</field>
-            <field name="reconcile" eval="True"/>
-            <field name="parent_id" ref="pgc_473"/>
-            <field name="type">other</field>
-            <field name="name">Hacienda Pública. Retenciones a cuenta act. profesionales 15%</field>
-            <field name="user_type" ref="tax"/>
-        </record>
-        
-        <record id="pgc_473018" model="account.account.template">
-            <field name="code">473018</field>
-            <field name="reconcile" eval="True"/>
-            <field name="parent_id" ref="pgc_473"/>
-            <field name="type">other</field>
-            <field name="name">Hacienda Pública. Retenciones a cuenta arrendamientos, cap. mobiliario 18%</field>
-            <field name="user_type" ref="tax"/>
-        </record>
-        
-        <record id="pgc_473019" model="account.account.template">
-            <field name="code">473019</field>
-            <field name="reconcile" eval="True"/>
-            <field name="parent_id" ref="pgc_473"/>
-            <field name="type">other</field>
-            <field name="name">Hacienda Pública. Retenciones a cuenta arrendamientos, cap. mobiliario 19%</field>
-            <field name="user_type" ref="tax"/>
-        </record>
-        
-        <record id="pgc_473021" model="account.account.template">
-            <field name="code">473021</field>
-            <field name="reconcile" eval="True"/>
-            <field name="parent_id" ref="pgc_473"/>
-            <field name="type">other</field>
-            <field name="name">Hacienda Pública. Retenciones a cuenta arrendamientos, cap. mobiliario 21%</field>
-            <field name="user_type" ref="tax"/>
-        </record>
-        
         <!-- Plantillas de retenciones-->
         <record id="irpf_sale_1" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template"/>
             <field name="name">Retenciones a cuenta IRPF 1%</field>
             <field eval="-0.01" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_473001"/>
-            <field name="account_paid_id" ref="pgc_473001"/>
+            <field name="account_collected_id" ref="pgc_473000"/>
+            <field name="account_paid_id" ref="pgc_473000"/>
             <field name="base_code_id" ref="irpf_base_sale_1"/>
             <field name="tax_code_id" ref="irpf_cuota_sale_1"/>
             <field name="ref_base_code_id" ref="irpf_base_sale_1"/>
@@ -2486,14 +3208,14 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">sale</field>
         </record>
-        
+
         <record id="irpf_sale_2" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template"/>
             <field name="name">Retenciones a cuenta IRPF 2%</field>
             <field eval="-0.02" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_473002"/>
-            <field name="account_paid_id" ref="pgc_473002"/>
+            <field name="account_collected_id" ref="pgc_473000"/>
+            <field name="account_paid_id" ref="pgc_473000"/>
             <field name="base_code_id" ref="irpf_base_sale_2"/>
             <field name="tax_code_id" ref="irpf_cuota_sale_2"/>
             <field name="ref_base_code_id" ref="irpf_base_sale_2"/>
@@ -2504,14 +3226,14 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">sale</field>
         </record>
-        
+
         <record id="irpf_sale_7" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template"/>
             <field name="name">Retenciones a cuenta IRPF 7%</field>
             <field eval="-0.07" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_473007"/>
-            <field name="account_paid_id" ref="pgc_473007"/>
+            <field name="account_collected_id" ref="pgc_473000"/>
+            <field name="account_paid_id" ref="pgc_473000"/>
             <field name="base_code_id" ref="irpf_base_sale_7"/>
             <field name="tax_code_id" ref="irpf_cuota_sale_7"/>
             <field name="ref_base_code_id" ref="irpf_base_sale_7"/>
@@ -2522,14 +3244,32 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">sale</field>
         </record>
-        
+
+        <record id="irpf_sale_9" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+            <field name="name">Retenciones a cuenta IRPF 9%</field>
+            <field eval="-0.09" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_473000"/>
+            <field name="account_paid_id" ref="pgc_473000"/>
+            <field name="base_code_id" ref="irpf_base_sale_9"/>
+            <field name="tax_code_id" ref="irpf_cuota_sale_9"/>
+            <field name="ref_base_code_id" ref="irpf_base_sale_9"/>
+            <field name="ref_tax_code_id" ref="irpf_cuota_sale_9"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">sale</field>
+        </record>
+
         <record id="irpf_sale_15" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template"/>
             <field name="name">Retenciones a cuenta IRPF 15%</field>
             <field eval="-0.15" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_473015"/>
-            <field name="account_paid_id" ref="pgc_473015"/>
+            <field name="account_collected_id" ref="pgc_473000"/>
+            <field name="account_paid_id" ref="pgc_473000"/>
             <field name="base_code_id" ref="irpf_base_sale_15"/>
             <field name="tax_code_id" ref="irpf_cuota_sale_15"/>
             <field name="ref_base_code_id" ref="irpf_base_sale_15"/>
@@ -2540,14 +3280,14 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">sale</field>
         </record>
-        
+
         <record id="irpf_sale_18" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template"/>
             <field name="name">Retenciones a cuenta IRPF 18%</field>
             <field eval="-0.18" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_473018"/>
-            <field name="account_paid_id" ref="pgc_473018"/>
+            <field name="account_collected_id" ref="pgc_473000"/>
+            <field name="account_paid_id" ref="pgc_473000"/>
             <field name="base_code_id" ref="irpf_base_sale_18"/>
             <field name="tax_code_id" ref="irpf_cuota_sale_18"/>
             <field name="ref_base_code_id" ref="irpf_base_sale_18"/>
@@ -2558,14 +3298,14 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">sale</field>
         </record>
-        
+
         <record id="irpf_sale_19" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template"/>
             <field name="name">Retenciones a cuenta IRPF 19%</field>
             <field eval="-0.19" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_473019"/>
-            <field name="account_paid_id" ref="pgc_473019"/>
+            <field name="account_collected_id" ref="pgc_473000"/>
+            <field name="account_paid_id" ref="pgc_473000"/>
             <field name="base_code_id" ref="irpf_base_sale_19"/>
             <field name="tax_code_id" ref="irpf_cuota_sale_19"/>
             <field name="ref_base_code_id" ref="irpf_base_sale_19"/>
@@ -2576,14 +3316,32 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">sale</field>
         </record>
-        
+
+        <record id="irpf_sale_20" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+            <field name="name">Retenciones a cuenta IRPF 20%</field>
+            <field eval="-0.20" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_473000"/>
+            <field name="account_paid_id" ref="pgc_473000"/>
+            <field name="base_code_id" ref="irpf_base_sale_20"/>
+            <field name="tax_code_id" ref="irpf_cuota_sale_20"/>
+            <field name="ref_base_code_id" ref="irpf_base_sale_20"/>
+            <field name="ref_tax_code_id" ref="irpf_cuota_sale_20"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">sale</field>
+        </record>
+
         <record id="irpf_sale_21" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template"/>
             <field name="name">Retenciones a cuenta IRPF 21%</field>
             <field eval="-0.21" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_473021"/>
-            <field name="account_paid_id" ref="pgc_473021"/>
+            <field name="account_collected_id" ref="pgc_473000"/>
+            <field name="account_paid_id" ref="pgc_473000"/>
             <field name="base_code_id" ref="irpf_base_sale_21"/>
             <field name="tax_code_id" ref="irpf_cuota_sale_21"/>
             <field name="ref_base_code_id" ref="irpf_base_sale_21"/>
diff --git a/addons/l10n_es/taxes_data_assoc.xml b/addons/l10n_es/taxes_data_assoc.xml
new file mode 100644
index 00000000000..e2ebb47fb59
--- /dev/null
+++ b/addons/l10n_es/taxes_data_assoc.xml
@@ -0,0 +1,3540 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="0">
+
+      <!--
+      Plantillas de impuestos para el Plan General Contable Asociaciones 2008.
+
+      Basado en taxes_data.xml, con los siguientes cambios:
+
+      - Se sustituyen los códigos:
+            vat_code_chart_root => vat_code_chart_assoc_root
+            l10nES_chart_template => l10nES_chart_template_assoc
+            pgc_* => pgc_assoc_*
+            iva_* => iva_assoc_*
+            re_* => re_assoc_*
+            irpf_* => irpf_assoc_*
+            base_* => base_assoc_*
+
+       Corrección: Códigos 42 "Entregas Intracomunitarias" y 43 "Exportaciones y operaciones asimiladas"
+       Impuestos IRPF se les ha asignado el grupo others (Otros) en lugar del grupo vat (IVA) por defecto
+       Añdido IRPF 2% (act. agrícolas, ganaderas, forestales), 19% y 21% (antiguo 18%)
+       Novedad 2010: Los rendimientos derivados de rentas de capital mobiliario o inmobiliario, el tipo base de retención pasa del 18% al 19% para los primeros 6000 EUR y al 21% a partir de los 6000 EUR.
+      -->
+
+<!-- Definición de IVA y retenciones, códigos de impuestos y cuentas contables adicionales -->
+
+
+<!-- Configuracion de codigos de impuesto-->
+
+
+    <!-- *********************************************** -->
+    <!--IVA DEVENGADO -->
+    <!-- *********************************************** -->
+
+    <!--Base imponible-->
+    <!-- *********************************************** -->
+        <record id="iva_assoc_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_assoc_root"/>
+        </record>
+
+    <!-- Exentas IVA -->
+        <record id="base_assoc_sop_ex" model="account.tax.code.template">
+            <field name="name">Base adquisiciones exentas</field>
+            <field name="company_id" model="res.company"  search="[]"/>
+            <field name="parent_id" ref="vat_code_chart_assoc_root"/>
+            <field name="code">--</field>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="base_assoc_rep_ex" model="account.tax.code.template">
+            <field name="name">Base ventas exentas</field>
+            <field name="code">--</field>
+            <field name="company_id" model="res.company"  search="[]"/>
+            <field name="parent_id" ref="vat_code_chart_assoc_root"/>
+            <field name="sign">1.0</field>
+        </record>             
+
+        <!-- IVA Soportado -->
+        <record id="iva_assoc_sop_ex" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">IVA Soportado exento (operaciones corrientes)</field>
+            <field eval="0.0" name="amount"/>
+            <field name="type">percent</field>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field name="base_code_id" ref="base_assoc_sop_ex"/>
+            <field name="ref_base_code_id" ref="base_assoc_sop_ex"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <!-- IVA REPERCUTIDO-->
+        <record id="iva_assoc_rep_ex" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">IVA Exento</field>
+            <field eval="0.0" name="amount"/>
+            <field name="type">percent</field>
+            <field name="base_code_id" ref="base_assoc_rep_ex"/>
+            <field name="ref_base_code_id" ref="base_assoc_rep_ex"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">sale</field>
+        </record>
+
+
+
+    <!--Régimen general-->
+
+        <record id="iva_assoc_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_assoc_dev_base"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="iva_assoc_dev_04" model="account.tax.code.template">
+            <field name="name">Régimen general IVA Devengado. Base Imponible 7%</field>
+            <field name="code">[04]</field>
+            <field name="parent_id" ref="iva_assoc_dev_base"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_dev_04_8" model="account.tax.code.template">
+            <field name="name">Régimen general IVA Devengado. Base Imponible 8%</field>
+            <field name="code">[04]</field>
+            <field name="parent_id" ref="iva_assoc_dev_base"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="iva_assoc_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_assoc_dev_base"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="iva_assoc_dev_07" model="account.tax.code.template">
+            <field name="name">Régimen general IVA Devengado. Base Imponible 16%</field>
+            <field name="code">[07]</field>
+            <field name="parent_id" ref="iva_assoc_dev_base"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_dev_07_18" model="account.tax.code.template">
+            <field name="name">Régimen general IVA Devengado. Base Imponible 18%</field>
+            <field name="code">[07]</field>
+            <field name="parent_id" ref="iva_assoc_dev_base"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="iva_assoc_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_assoc_dev_base"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <!-- RECARGO DE EQUIVALENCIA -->
+        <!--record id="re_assoc_base" model="account.tax.code.template">
+            <field name="name">Recargo Equivalencia Base Imponible</field>
+            <field name="code">_</field>
+            <field name="sign">1.0</field>
+            <field name="parent_id" ref="iva_assoc_dev_base"/>
+        </record-->
+
+        <record id="iva_assoc_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_assoc_dev_base"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="iva_assoc_dev_13" model="account.tax.code.template">
+            <field name="name">Recargo Equivalencia Base Imponible 1%</field>
+            <field name="code">[13]</field>
+            <field name="parent_id" ref="iva_assoc_dev_base"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="iva_assoc_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_assoc_dev_base"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="iva_assoc_dev_16" model="account.tax.code.template">
+            <field name="name">Recargo Equivalencia Base Imponible 4%</field>
+            <field name="code">[16]</field>
+            <field name="parent_id" ref="iva_assoc_dev_base"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="iva_assoc_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_assoc_dev_base"/>
+            <field name="sign">1.0</field>
+        </record>
+
+
+        <!-- ADQUISICIONES INTRACOMUNITARIAS -->
+
+        <record id="iva_assoc_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_assoc_dev_base"/>
+            <field name="sign">1.0</field>
+        </record>
+
+    <!--IVA devengado cuota-->
+    <!-- *********************************************** -->
+
+
+    <!--Régimen general-->
+
+
+        <record id="iva_assoc_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_assoc_root"/>
+        </record>
+
+        <record id="iva_assoc_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_assoc_dev_21"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="iva_assoc_dev_06" model="account.tax.code.template">
+            <field name="name">Régimen general IVA Devengado. Cuota 7%</field>
+            <field name="code">[06]</field>
+            <field name="parent_id" ref="iva_assoc_dev_21"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="iva_assoc_dev_06_8" model="account.tax.code.template">
+            <field name="name">Régimen general IVA Devengado. Cuota 8%</field>
+            <field name="code">[06]</field>
+            <field name="parent_id" ref="iva_assoc_dev_21"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="iva_assoc_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_assoc_dev_21"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="iva_assoc_dev_09" model="account.tax.code.template">
+            <field name="name">Régimen general IVA Devengado. Cuota 16%</field>
+            <field name="code">[09]</field>
+            <field name="parent_id" ref="iva_assoc_dev_21"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="iva_assoc_dev_09_18" model="account.tax.code.template">
+            <field name="name">Régimen general IVA Devengado. Cuota 18%</field>
+            <field name="code">[09]</field>
+            <field name="parent_id" ref="iva_assoc_dev_21"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="iva_assoc_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_assoc_dev_21"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <!-- RECARGO DE EQUIVALENCIA -->
+        <!--record id="re_base" model="account.tax.code.template">
+            <field name="name">Recargo Equivalencia Base Imponible</field>
+            <field name="code">_</field>
+            <field name="sign">1.0</field>
+            <field name="parent_id" ref="iva_assoc_dev_base"/>
+        </record-->
+
+        <record id="iva_assoc_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_assoc_dev_21"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="iva_assoc_dev_15" model="account.tax.code.template">
+            <field name="name">Recargo Equivalencia. Cuota 1%</field>
+            <field name="code">[15]</field>
+            <field name="parent_id" ref="iva_assoc_dev_21"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="iva_assoc_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_assoc_dev_21"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="iva_assoc_dev_18" model="account.tax.code.template">
+            <field name="name">Recargo Equivalencia. Cuota 4%</field>
+            <field name="code">[18]</field>
+            <field name="parent_id" ref="iva_assoc_dev_21"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="iva_assoc_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_assoc_dev_21"/>
+            <field name="sign">1.0</field>
+        </record>
+
+
+        <!-- ADQUISICIONES INTRACOMUNITARIAS -->
+
+        <record id="iva_assoc_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_assoc_dev_21"/>
+            <field name="sign">1.0</field>
+        </record>
+
+
+
+
+
+    <!-- *********************************************** -->
+    <!--IVA DEDUCIBLE -->
+    <!-- *********************************************** -->
+
+
+    <!--IVA Soportado (Deducible) Base Imponible-->
+    <!-- *********************************************** -->
+        <record id="iva_assoc_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_assoc_root"/>
+        </record>
+
+        <!-- Base en OPERACIONES INTERIORES CORRIENTES-->
+        <record id="iva_assoc_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_assoc_ded_base_total"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_ded_22_16" model="account.tax.code.template">
+            <field name="name">Base operaciones interiores corrientes (16%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_22"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_ded_22_18" model="account.tax.code.template">
+            <field name="name">Base operaciones interiores corrientes (18%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_22"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="iva_assoc_ded_22_7" model="account.tax.code.template">
+            <field name="name">Base operaciones interiores corrientes (7%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_22"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_ded_22_8" model="account.tax.code.template">
+            <field name="name">Base operaciones interiores corrientes (8%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_22"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_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_assoc_ded_22"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="iva_assoc_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_assoc_ded_22"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="iva_assoc_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_assoc_ded_22"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <!-- Base en OPERACIONES INTERIORES CON BIENES DE INVERSIÓN-->
+        <record id="iva_assoc_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_assoc_ded_base_total"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_ded_24_16" model="account.tax.code.template">
+            <field name="name">Base operaciones interiores bienes inversión (16%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_24"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="iva_assoc_ded_24_18" model="account.tax.code.template">
+            <field name="name">Base operaciones interiores bienes inversión (18%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_24"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="iva_assoc_ded_24_7" model="account.tax.code.template">
+            <field name="name">Base operaciones interiores bienes inversión (7%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_24"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="iva_assoc_ded_24_8" model="account.tax.code.template">
+            <field name="name">Base operaciones interiores bienes inversión (8%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_24"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="iva_assoc_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_assoc_ded_24"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="iva_assoc_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_assoc_ded_24"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="iva_assoc_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_assoc_ded_24"/>
+            <field name="sign">1.0</field>
+        </record>
+
+
+        <!-- Base EN LAS IMPORTACIONES DE BIENES CORRIENTES-->
+        <record id="iva_assoc_ded_26" model="account.tax.code.template">
+            <field name="name">Base importaciones bienes corrientes</field>
+            <field name="code">[26]</field>
+            <field name="parent_id" ref="iva_assoc_ded_base_total"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_ded_26_16" model="account.tax.code.template">
+            <field name="name">Base importaciones bienes corrientes (16%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_26"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_ded_26_18" model="account.tax.code.template">
+            <field name="name">Base importaciones bienes corrientes (18%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_26"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="iva_assoc_ded_26_7" model="account.tax.code.template">
+            <field name="name">Base importaciones bienes corrientes (7%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_26"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_ded_26_8" model="account.tax.code.template">
+            <field name="name">Base importaciones bienes corrientes (8%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_26"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_ded_26_4" model="account.tax.code.template">
+            <field name="name">Base importaciones bienes corrientes (4%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_26"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="iva_assoc_ded_26_10" model="account.tax.code.template">
+            <field name="name">Base importaciones bienes corrientes (10%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_26"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_ded_26_21" model="account.tax.code.template">
+            <field name="name">Base importaciones bienes corrientes (21%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_26"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <!-- Base EN LAS IMPORTACIONES DE BIENES DE INVERSIÓN-->
+        <record id="iva_assoc_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_assoc_ded_base_total"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_ded_28_16" model="account.tax.code.template">
+            <field name="name">Base importaciones bienes inversión (16%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_28"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_ded_28_18" model="account.tax.code.template">
+            <field name="name">Base importaciones bienes inversión (18%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_28"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="iva_assoc_ded_28_7" model="account.tax.code.template">
+            <field name="name">Base importaciones bienes inversión (7%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_28"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_ded_28_8" model="account.tax.code.template">
+            <field name="name">Base importaciones bienes inversión (8%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_28"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_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_assoc_ded_28"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_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_assoc_ded_28"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_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_assoc_ded_28"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <!-- ADQUISICIONES INTRACOMUNITARIAS DE BIENES CORRIENTES-->
+        <record id="iva_assoc_ded_30" model="account.tax.code.template">
+            <field name="name">Base adquisiciones intracomunitarias bienes corrientes</field>
+            <field name="code">[30]</field>
+            <field name="parent_id" ref="iva_assoc_ded_base_total"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_ded_30_16" model="account.tax.code.template">
+            <field name="name">Base adquisiciones intracomunitarias bienes corrientes (16%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_30"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_ded_30_18" model="account.tax.code.template">
+            <field name="name">Base adquisiciones intracomunitarias bienes corrientes (18%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_30"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="iva_assoc_ded_30_7" model="account.tax.code.template">
+            <field name="name">Base adquisiciones intracomunitarias bienes corrientes (7%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_30"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_ded_30_8" model="account.tax.code.template">
+            <field name="name">Base adquisiciones intracomunitarias bienes corrientes (8%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_30"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_ded_30_4" model="account.tax.code.template">
+            <field name="name">Base adquisiciones intracomunitarias bienes corrientes (4%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_30"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_ded_30_10" model="account.tax.code.template">
+            <field name="name">Base adquisiciones intracomunitarias bienes corrientes (10%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_30"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_ded_30_21" model="account.tax.code.template">
+            <field name="name">Base adquisiciones intracomunitarias bienes corrientes (21%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_30"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <!-- ADQUISICIONES INTRACOMUNITARIAS DE BIENES DE INVERSIÓN-->
+        <record id="iva_assoc_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_assoc_ded_base_total"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_ded_32_16" model="account.tax.code.template">
+            <field name="name">Base adquisiciones intracomunitarias bienes inversión (16%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_32"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_ded_32_18" model="account.tax.code.template">
+            <field name="name">Base adquisiciones intracomunitarias bienes inversión (18%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_32"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="iva_assoc_ded_32_7" model="account.tax.code.template">
+            <field name="name">Base adquisiciones intracomunitarias bienes inversión (7%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_32"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_ded_32_8" model="account.tax.code.template">
+            <field name="name">Base adquisiciones intracomunitarias bienes inversión (8%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_32"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_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_assoc_ded_32"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_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_assoc_ded_32"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_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_assoc_ded_32"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <!-- BASE RECARGO DE EQUIVALENCIA-->
+        <record id="iva_assoc_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_assoc_ded_base_total"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="iva_assoc_ded_13" model="account.tax.code.template">
+            <field name="name">Recargo Equivalencia Ded. Base Imponible 1%</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_base_total"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="iva_assoc_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_assoc_ded_base_total"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="iva_assoc_ded_16" model="account.tax.code.template">
+            <field name="name">Recargo Equivalencia Ded. Base Imponible 4%</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_base_total"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="iva_assoc_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_assoc_ded_base_total"/>
+            <field name="sign">1.0</field>
+        </record>
+
+
+    <!-- IVA DEDUCIBLE Cuotas-->
+    <!-- *********************************************** -->
+
+        <record id="iva_assoc_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_assoc_root"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <!-- Cuotas en OPERACIONES INTERIORES CORRIENTES-->
+        <record id="iva_assoc_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_assoc_ded_cuota_total"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_ded_23_16" model="account.tax.code.template">
+            <field name="name">Cuotas soportadas operaciones interiores corrientes (16%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_23"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_ded_23_18" model="account.tax.code.template">
+            <field name="name">Cuotas soportadas operaciones interiores corrientes (18%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_23"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="iva_assoc_ded_23_7" model="account.tax.code.template">
+            <field name="name">Cuotas soportadas operaciones interiores corrientes (7%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_23"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_ded_23_8" model="account.tax.code.template">
+            <field name="name">Cuotas soportadas operaciones interiores corrientes (8%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_23"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_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_assoc_ded_23"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_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_assoc_ded_23"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_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_assoc_ded_23"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <!-- Cuotas en OPERACIONES INTERIORES CON BIENES DE INVERSIÓN-->
+        <record id="iva_assoc_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_assoc_ded_cuota_total"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_ded_25_16" model="account.tax.code.template">
+            <field name="name">Cuotas soportadas operaciones interiores bienes inversión (16%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_25"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_ded_25_18" model="account.tax.code.template">
+            <field name="name">Cuotas soportadas operaciones interiores bienes inversión (18%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_25"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="iva_assoc_ded_25_7" model="account.tax.code.template">
+            <field name="name">Cuotas soportadas operaciones interiores bienes inversión (7%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_25"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_ded_25_8" model="account.tax.code.template">
+            <field name="name">Cuotas soportadas operaciones interiores bienes inversión (8%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_25"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_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_assoc_ded_25"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_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_assoc_ded_25"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_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_assoc_ded_25"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <!-- Cuotas devengadas EN LAS IMPORTACIONES DE BIENES CORRIENTES-->
+        <record id="iva_assoc_ded_27" model="account.tax.code.template">
+            <field name="name">Cuotas devengadas importaciones bienes corrientes</field>
+            <field name="code">[27]</field>
+            <field name="parent_id" ref="iva_assoc_ded_cuota_total"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_ded_27_16" model="account.tax.code.template">
+            <field name="name">Cuotas devengadas importaciones bienes corrientes (16%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_27"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_ded_27_18" model="account.tax.code.template">
+            <field name="name">Cuotas devengadas importaciones bienes corrientes (18%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_27"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="iva_assoc_ded_27_7" model="account.tax.code.template">
+            <field name="name">Cuotas devengadas importaciones bienes corrientes (7%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_27"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_ded_27_8" model="account.tax.code.template">
+            <field name="name">Cuotas devengadas importaciones bienes corrientes (8%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_27"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_ded_27_4" model="account.tax.code.template">
+            <field name="name">Cuotas devengadas importaciones bienes corrientes (4%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_27"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_ded_27_10" model="account.tax.code.template">
+            <field name="name">Cuotas devengadas importaciones bienes corrientes (10%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_27"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_ded_27_21" model="account.tax.code.template">
+            <field name="name">Cuotas devengadas importaciones bienes corrientes (21%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_27"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <!-- Cuotas devengadas EN LAS IMPORTACIONES DE BIENES DE INVERSIÓN-->
+        <record id="iva_assoc_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_assoc_ded_cuota_total"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_ded_29_16" model="account.tax.code.template">
+            <field name="name">Cuotas devengadas importaciones bienes inversión (16%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_29"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_ded_29_18" model="account.tax.code.template">
+            <field name="name">Cuotas devengadas importaciones bienes inversión (18%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_29"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="iva_assoc_ded_29_7" model="account.tax.code.template">
+            <field name="name">Cuotas devengadas importaciones bienes inversión (7%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_29"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_ded_29_8" model="account.tax.code.template">
+            <field name="name">Cuotas devengadas importaciones bienes inversión (8%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_29"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_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_assoc_ded_29"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_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_assoc_ded_29"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_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_assoc_ded_29"/>
+            <field name="sign">1.0</field>
+        </record>
+        <!-- ADQUISICIONES INTRACOMUNITARIAS DE BIENES CORRIENTES-->
+        <record id="iva_assoc_ded_31" model="account.tax.code.template">
+            <field name="name">En adquisiciones intracomunitarias bienes corrientes</field>
+            <field name="code">[31]</field>
+            <field name="parent_id" ref="iva_assoc_ded_cuota_total"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_ded_31_16" model="account.tax.code.template">
+            <field name="name">En adquisiciones intracomunitarias bienes corrientes (16%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_31"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_ded_31_18" model="account.tax.code.template">
+            <field name="name">En adquisiciones intracomunitarias bienes corrientes (18%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_31"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="iva_assoc_ded_31_7" model="account.tax.code.template">
+            <field name="name">En adquisiciones intracomunitarias bienes corrientes (7%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_31"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_ded_31_8" model="account.tax.code.template">
+            <field name="name">En adquisiciones intracomunitarias bienes corrientes (8%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_31"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_ded_31_4" model="account.tax.code.template">
+            <field name="name">En adquisiciones intracomunitarias bienes corrientes (4%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_31"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_ded_31_10" model="account.tax.code.template">
+            <field name="name">En adquisiciones intracomunitarias bienes corrientes (10%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_31"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_ded_31_21" model="account.tax.code.template">
+            <field name="name">En adquisiciones intracomunitarias bienes corrientes (21%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_31"/>
+            <field name="sign">1.0</field>
+        </record>
+        <!-- ADQUISICIONES INTRACOMUNITARIAS DE BIENES DE INVERSIÓN-->
+        <record id="iva_assoc_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_assoc_ded_cuota_total"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_ded_33_16" model="account.tax.code.template">
+            <field name="name">En adquisiciones intracomunitarias bienes inversión (16%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_33"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_ded_33_18" model="account.tax.code.template">
+            <field name="name">En adquisiciones intracomunitarias bienes inversión (18%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_33"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="iva_assoc_ded_33_7" model="account.tax.code.template">
+            <field name="name">En adquisiciones intracomunitarias bienes inversión (7%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_33"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_ded_33_8" model="account.tax.code.template">
+            <field name="name">En adquisiciones intracomunitarias bienes inversión (8%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_33"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_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_assoc_ded_33"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_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_assoc_ded_33"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_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_assoc_ded_33"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <!--Otros Códigos de Impuestos-->
+        <record id="base_assoc_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_assoc_root"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="base_assoc_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_assoc_root"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="base_assoc_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_assoc_root"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <!--Cuota Recargo de Equivalencia-->
+        <record id="iva_assoc_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_assoc_ded_cuota_total"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="iva_assoc_ded_15" model="account.tax.code.template">
+            <field name="name">Recargo Equivalencia Ded. Cuota 1%</field>
+            <field name="code">[15]</field>
+            <field name="parent_id" ref="iva_assoc_ded_cuota_total"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="iva_assoc_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_assoc_ded_cuota_total"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="iva_assoc_ded_18" model="account.tax.code.template">
+            <field name="name">Recargo Equivalencia Ded. Cuota 4%</field>
+            <field name="code">[18]</field>
+            <field name="parent_id" ref="iva_assoc_ded_cuota_total"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="iva_assoc_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_assoc_ded_cuota_total"/>
+            <field name="sign">1.0</field>
+        </record>
+
+<!-- ********************************* -->
+<!-- Plantillas de Impuestos IVA       -->
+<!-- ********************************* -->
+
+<!-- IVA Soportado -->
+
+        <record id="iva_assoc_sop_4" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">4% IVA Soportado (operaciones corrientes)</field>
+            <field eval="0.04" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_472000"/>
+            <field name="account_paid_id" ref="pgc_assoc_472000"/>
+            <field name="base_code_id" ref="iva_assoc_ded_22_4"/>
+            <field name="tax_code_id" ref="iva_assoc_ded_23_4"/>
+            <field name="ref_base_code_id" ref="iva_assoc_ded_22_4"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_ded_23_4"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="iva_assoc_sop_4_inv" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">4% IVA Soportado (bienes de inversión)</field>
+            <field eval="0.04" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_472000"/>
+            <field name="account_paid_id" ref="pgc_assoc_472000"/>
+            <field name="base_code_id" ref="iva_assoc_ded_24_4"/>
+            <field name="tax_code_id" ref="iva_assoc_ded_25_4"/>
+            <field name="ref_base_code_id" ref="iva_assoc_ded_24_4"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_ded_25_4"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="iva_assoc_sop_7" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">7% IVA Soportado (operaciones corrientes)</field>
+            <field eval="0.07" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_472000"/>
+            <field name="account_paid_id" ref="pgc_assoc_472000"/>
+            <field name="base_code_id" ref="iva_assoc_ded_22_7"/>
+            <field name="tax_code_id" ref="iva_assoc_ded_23_7"/>
+            <field name="ref_base_code_id" ref="iva_assoc_ded_22_7"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_ded_23_7"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="iva_assoc_sop_7_inv" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">7% IVA Soportado (bienes de inversión)</field>
+            <field eval="0.07" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_472000"/>
+            <field name="account_paid_id" ref="pgc_assoc_472000"/>
+            <field name="base_code_id" ref="iva_assoc_ded_24_7"/>
+            <field name="tax_code_id" ref="iva_assoc_ded_25_7"/>
+            <field name="ref_base_code_id" ref="iva_assoc_ded_24_7"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_ded_25_7"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="iva_assoc_sop_8" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">8% IVA Soportado (operaciones corrientes)</field>
+            <field eval="0.08" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_472000"/>
+            <field name="account_paid_id" ref="pgc_assoc_472000"/>
+            <field name="base_code_id" ref="iva_assoc_ded_22_8"/>
+            <field name="tax_code_id" ref="iva_assoc_ded_23_8"/>
+            <field name="ref_base_code_id" ref="iva_assoc_ded_22_8"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_ded_23_8"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="iva_assoc_sop_8_inv" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">8% IVA Soportado (bienes de inversión)</field>
+            <field eval="0.08" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_472000"/>
+            <field name="account_paid_id" ref="pgc_assoc_472000"/>
+            <field name="base_code_id" ref="iva_assoc_ded_24_8"/>
+            <field name="tax_code_id" ref="iva_assoc_ded_25_8"/>
+            <field name="ref_base_code_id" ref="iva_assoc_ded_24_8"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_ded_25_8"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="iva_assoc_sop_10" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">10% IVA Soportado (operaciones corrientes)</field>
+            <field eval="0.10" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_472000"/>
+            <field name="account_paid_id" ref="pgc_assoc_472000"/>
+            <field name="base_code_id" ref="iva_assoc_ded_22_10"/>
+            <field name="tax_code_id" ref="iva_assoc_ded_23_10"/>
+            <field name="ref_base_code_id" ref="iva_assoc_ded_22_10"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_ded_23_10"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="iva_assoc_sop_10_inv" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">10% IVA Soportado (bienes de inversión)</field>
+            <field eval="0.10" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_472000"/>
+            <field name="account_paid_id" ref="pgc_assoc_472000"/>
+            <field name="base_code_id" ref="iva_assoc_ded_24_10"/>
+            <field name="tax_code_id" ref="iva_assoc_ded_25_10"/>
+            <field name="ref_base_code_id" ref="iva_assoc_ded_24_10"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_ded_25_10"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="iva_assoc_sop_16" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">16% IVA Soportado (operaciones corrientes)</field>
+            <field eval="0.16" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_472000"/>
+            <field name="account_paid_id" ref="pgc_assoc_472000"/>
+            <field name="base_code_id" ref="iva_assoc_ded_22_16"/>
+            <field name="tax_code_id" ref="iva_assoc_ded_23_16"/>
+            <field name="ref_base_code_id" ref="iva_assoc_ded_22_16"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_ded_23_16"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="iva_assoc_sop_16_inv" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">16% IVA Soportado (bienes de inversión)</field>
+            <field eval="0.16" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_472000"/>
+            <field name="account_paid_id" ref="pgc_assoc_472000"/>
+            <field name="base_code_id" ref="iva_assoc_ded_24_16"/>
+            <field name="tax_code_id" ref="iva_assoc_ded_25_16"/>
+            <field name="ref_base_code_id" ref="iva_assoc_ded_24_16"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_ded_25_16"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="iva_assoc_sop_18" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">18% IVA Soportado (operaciones corrientes)</field>
+            <field eval="0.18" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_472000"/>
+            <field name="account_paid_id" ref="pgc_assoc_472000"/>
+            <field name="base_code_id" ref="iva_assoc_ded_22_18"/>
+            <field name="tax_code_id" ref="iva_assoc_ded_23_18"/>
+            <field name="ref_base_code_id" ref="iva_assoc_ded_22_18"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_ded_23_18"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="iva_assoc_sop_18_inv" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">18% IVA Soportado (bienes de inversión)</field>
+            <field eval="0.18" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_472000"/>
+            <field name="account_paid_id" ref="pgc_assoc_472000"/>
+            <field name="base_code_id" ref="iva_assoc_ded_24_18"/>
+            <field name="tax_code_id" ref="iva_assoc_ded_25_18"/>
+            <field name="ref_base_code_id" ref="iva_assoc_ded_24_18"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_ded_25_18"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="iva_assoc_sop_21" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">21% IVA Soportado (operaciones corrientes)</field>
+            <field eval="0.21" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_472000"/>
+            <field name="account_paid_id" ref="pgc_assoc_472000"/>
+            <field name="base_code_id" ref="iva_assoc_ded_22_21"/>
+            <field name="tax_code_id" ref="iva_assoc_ded_23_21"/>
+            <field name="ref_base_code_id" ref="iva_assoc_ded_22_21"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_ded_23_21"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+            <field eval="0" name="sequence"/>
+        </record>
+
+        <record id="iva_assoc_sop_21_inv" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">21% IVA Soportado (bienes de inversión)</field>
+            <field eval="0.21" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_472000"/>
+            <field name="account_paid_id" ref="pgc_assoc_472000"/>
+            <field name="base_code_id" ref="iva_assoc_ded_24_21"/>
+            <field name="tax_code_id" ref="iva_assoc_ded_25_21"/>
+            <field name="ref_base_code_id" ref="iva_assoc_ded_24_21"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_ded_25_21"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <!-- Plantillas para Extracomunitario-->
+        <!-- IVA compras -->
+        <record id="iva_assoc_X0_compras_bc" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">IVA 0% Importaciones bienes corrientes</field>
+            <field name="description">IVA 0% Importaciones bienes corrientes</field>
+            <field eval="0.00" name="amount"/>
+            <field name="type">percent</field>
+            <field name="base_code_id" ref="iva_assoc_ded_26"/>
+            <field name="ref_base_code_id" ref="iva_assoc_ded_26"/>
+            <field name="tax_code_id" ref="iva_assoc_ded_27"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_ded_27"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_assoc_X0_compras_bi" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">IVA 0% Importaciones bienes de inversión</field>
+            <field name="description">IVA 0% Importaciones bienes de inversión</field>
+            <field eval="0.00" name="amount"/>
+            <field name="type">percent</field>
+            <field name="base_code_id" ref="iva_assoc_ded_28"/>
+            <field name="ref_base_code_id" ref="iva_assoc_ded_28"/>
+            <field name="tax_code_id" ref="iva_assoc_ded_29"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_ded_29"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="iva_assoc_X4_compras_bc" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">IVA 4% Importaciones bienes corrientes</field>
+            <field name="description">IVA 4% Importaciones bienes corrientes</field>
+            <field eval="0.04" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_472000"/>
+            <field name="account_paid_id" ref="pgc_assoc_472000"/>
+            <field name="base_code_id" ref="iva_assoc_ded_26_4"/>
+            <field name="tax_code_id" ref="iva_assoc_ded_27_4"/>
+            <field name="ref_base_code_id" ref="iva_assoc_ded_26_4"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_ded_27_4"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_assoc_X4_compras_bi" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">IVA 4% Importaciones bienes de inversión</field>
+            <field name="description">IVA 4% Importaciones bienes de inversión</field>
+            <field eval="0.04" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_472000"/>
+            <field name="account_paid_id" ref="pgc_assoc_472000"/>
+            <field name="base_code_id" ref="iva_assoc_ded_28_4"/>
+            <field name="tax_code_id" ref="iva_assoc_ded_29_4"/>
+            <field name="ref_base_code_id" ref="iva_assoc_ded_28_4"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_ded_29_4"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="iva_assoc_X7_compras_bc" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">IVA 7% Importaciones bienes corrientes</field>
+            <field name="description">IVA 7% Importaciones bienes corrientes</field>
+            <field eval="0.07" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_472000"/>
+            <field name="account_paid_id" ref="pgc_assoc_472000"/>
+            <field name="base_code_id" ref="iva_assoc_ded_26_7"/>
+            <field name="tax_code_id" ref="iva_assoc_ded_27_7"/>
+            <field name="ref_base_code_id" ref="iva_assoc_ded_26_7"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_ded_27_7"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_assoc_X7_compras_bi" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">IVA 7% Importaciones bienes de inversión</field>
+            <field name="description">IVA 7% Importaciones bienes de inversión</field>
+            <field eval="0.07" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_472000"/>
+            <field name="account_paid_id" ref="pgc_assoc_472000"/>
+            <field name="base_code_id" ref="iva_assoc_ded_28_7"/>
+            <field name="tax_code_id" ref="iva_assoc_ded_29_7"/>
+            <field name="ref_base_code_id" ref="iva_assoc_ded_28_7"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_ded_29_7"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="iva_assoc_X8_compras_bc" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">IVA 8% Importaciones bienes corrientes</field>
+            <field name="description">IVA 8% Importaciones bienes corrientes</field>
+            <field eval="0.08" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_472000"/>
+            <field name="account_paid_id" ref="pgc_assoc_472000"/>
+            <field name="base_code_id" ref="iva_assoc_ded_26_8"/>
+            <field name="tax_code_id" ref="iva_assoc_ded_27_8"/>
+            <field name="ref_base_code_id" ref="iva_assoc_ded_26_8"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_ded_27_8"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_assoc_X8_compras_bi" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">IVA 8% Importaciones bienes de inversión</field>
+            <field name="description">IVA 8% Importaciones bienes de inversión</field>
+            <field eval="0.08" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_472000"/>
+            <field name="account_paid_id" ref="pgc_assoc_472000"/>
+            <field name="base_code_id" ref="iva_assoc_ded_28_8"/>
+            <field name="tax_code_id" ref="iva_assoc_ded_29_8"/>
+            <field name="ref_base_code_id" ref="iva_assoc_ded_28_8"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_ded_29_8"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="iva_assoc_X10_compras_bc" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">IVA 10% Importaciones bienes corrientes</field>
+            <field name="description">IVA 10% Importaciones bienes corrientes</field>
+            <field eval="0.10" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_472000"/>
+            <field name="account_paid_id" ref="pgc_assoc_472000"/>
+            <field name="base_code_id" ref="iva_assoc_ded_26_10"/>
+            <field name="tax_code_id" ref="iva_assoc_ded_27_10"/>
+            <field name="ref_base_code_id" ref="iva_assoc_ded_26_10"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_ded_27_10"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_assoc_X10_compras_bi" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">IVA 10% Importaciones bienes de inversión</field>
+            <field name="description">IVA 10% Importaciones bienes de inversión</field>
+            <field eval="0.10" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_472000"/>
+            <field name="account_paid_id" ref="pgc_assoc_472000"/>
+            <field name="base_code_id" ref="iva_assoc_ded_28_10"/>
+            <field name="tax_code_id" ref="iva_assoc_ded_29_10"/>
+            <field name="ref_base_code_id" ref="iva_assoc_ded_28_10"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_ded_29_10"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="iva_assoc_X16_compras_bc" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">IVA 16% Importaciones bienes corrientes</field>
+            <field name="description">IVA 16% Importaciones bienes corrientes</field>
+            <field eval="0.16" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_472000"/>
+            <field name="account_paid_id" ref="pgc_assoc_472000"/>
+            <field name="base_code_id" ref="iva_assoc_ded_26_16"/>
+            <field name="tax_code_id" ref="iva_assoc_ded_27_16"/>
+            <field name="ref_base_code_id" ref="iva_assoc_ded_26_16"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_ded_27_16"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_assoc_X16_compras_bi" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">IVA 16% Importaciones bienes de inversión</field>
+            <field name="description">IVA 16% Importaciones bienes de inversión</field>
+            <field eval="0.16" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_472000"/>
+            <field name="account_paid_id" ref="pgc_assoc_472000"/>
+            <field name="base_code_id" ref="iva_assoc_ded_28_16"/>
+            <field name="tax_code_id" ref="iva_assoc_ded_29_16"/>
+            <field name="ref_base_code_id" ref="iva_assoc_ded_28_16"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_ded_29_16"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="iva_assoc_X18_compras_bc" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">IVA 18% Importaciones bienes corrientes</field>
+            <field name="description">IVA 18% Importaciones bienes corrientes</field>
+            <field eval="0.18" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_472000"/>
+            <field name="account_paid_id" ref="pgc_assoc_472000"/>
+            <field name="base_code_id" ref="iva_assoc_ded_26_18"/>
+            <field name="tax_code_id" ref="iva_assoc_ded_27_18"/>
+            <field name="ref_base_code_id" ref="iva_assoc_ded_26_18"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_ded_27_18"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_assoc_X18_compras_bi" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">IVA 18% Importaciones bienes de inversión</field>
+            <field name="description">IVA 18% Importaciones bienes de inversión</field>
+            <field eval="0.18" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_472000"/>
+            <field name="account_paid_id" ref="pgc_assoc_472000"/>
+            <field name="base_code_id" ref="iva_assoc_ded_28_18"/>
+            <field name="tax_code_id" ref="iva_assoc_ded_29_18"/>
+            <field name="ref_base_code_id" ref="iva_assoc_ded_28_18"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_ded_29_18"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="iva_assoc_X21_compras_bc" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">IVA 21% Importaciones bienes corrientes</field>
+            <field name="description">IVA 21% Importaciones bienes corrientes</field>
+            <field eval="0.21" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_472000"/>
+            <field name="account_paid_id" ref="pgc_assoc_472000"/>
+            <field name="base_code_id" ref="iva_assoc_ded_26_21"/>
+            <field name="tax_code_id" ref="iva_assoc_ded_27_21"/>
+            <field name="ref_base_code_id" ref="iva_assoc_ded_26_21"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_ded_27_21"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_assoc_X21_compras_bi" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">IVA 21% Importaciones bienes de inversión</field>
+            <field name="description">IVA 21% Importaciones bienes de inversión</field>
+            <field eval="0.21" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_472000"/>
+            <field name="account_paid_id" ref="pgc_assoc_472000"/>
+            <field name="base_code_id" ref="iva_assoc_ded_28_21"/>
+            <field name="tax_code_id" ref="iva_assoc_ded_29_21"/>
+            <field name="ref_base_code_id" ref="iva_assoc_ded_28_21"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_ded_29_21"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+
+        <!-- IVA EXPORTACIONES (VENTAS )-->
+        <record id="iva_assoc_X0" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">IVA 0% Exportaciones</field>
+            <field name="description">IVA 0% Exportaciones</field>
+            <field eval="0.00" name="amount"/>
+            <field name="type">percent</field>
+            <field name="base_code_id" ref="base_assoc_extra_43"/>
+            <field name="ref_base_code_id" ref="base_assoc_extra_43"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">sale</field>
+        </record>
+
+         <!-- Inversión del sujeto pasivo -->
+        <record id="iva_assoc_ISP_compras_16" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">IVA 16% Inversión del sujeto pasivo</field>
+            <field name="description">IVA 16% Inversión del sujeto pasivo</field>
+            <field name="amount" eval="1.00"/>
+            <field name="type">percent</field>
+            <field name="child_depend" eval="1"/>
+            <field name="base_sign" eval="1.0"/>
+            <field name="tax_sign" eval="1.0"/>
+            <field name="ref_base_sign" eval="-1.0"/>
+            <field name="ref_tax_sign" eval="-1.0"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_assoc_ISP_compras_16_1" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">IVA 16% Inversión del sujeto pasivo (1)</field>
+            <field name="parent_id" ref="iva_assoc_ISP_compras_16"/>
+            <field name="amount" eval="0.00"/>
+            <field name="type">percent</field>
+            <field name="base_code_id" ref="base_assoc_extra_44"/>
+            <field name="ref_base_code_id" ref="base_assoc_extra_44"/>
+            <field name="base_sign" eval="1.0"/>
+            <field name="tax_sign" eval="1.0"/>
+            <field name="ref_base_sign" eval="-1.0"/>
+            <field name="ref_tax_sign" eval="-1.0"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_assoc_ISP_compras_16_2" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">IVA 16% Inversión del sujeto pasivo (2)</field>
+            <field name="parent_id" ref="iva_assoc_ISP_compras_16"/>
+            <field name="amount" eval="-0.16"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_477000"/>
+            <field name="account_paid_id" ref="pgc_assoc_477000"/>
+            <field name="base_code_id" ref="iva_assoc_dev_07"/>
+            <field name="tax_code_id" ref="iva_assoc_dev_09"/>
+            <field name="ref_base_code_id" ref="iva_assoc_dev_07"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_dev_09"/>
+            <field name="tax_sign" eval="-1.0"/>
+            <field name="base_sign" eval="1.0"/>
+            <field name="ref_tax_sign" eval="1.0"/>
+            <field name="ref_base_sign" eval="-1.0"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_assoc_ISP_compras_16_3" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">IVA 16% Inversión del sujeto pasivo (3)</field>
+            <field name="parent_id" ref="iva_assoc_ISP_compras_16"/>
+            <field name="amount" eval="0.16"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_472000"/>
+            <field name="account_paid_id" ref="pgc_assoc_472000"/>
+            <field name="base_code_id" ref="iva_assoc_ded_22_16"/>
+            <field name="tax_code_id" ref="iva_assoc_ded_23_16"/>
+            <field name="ref_base_code_id" ref="iva_assoc_ded_22_16"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_ded_23_16"/>
+            <field name="tax_sign" eval="1.0"/>
+            <field name="base_sign" eval="1.0"/>
+            <field name="ref_tax_sign" eval="-1.0"/>
+            <field name="ref_base_sign" eval="-1.0"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="iva_assoc_ISP_compras_18" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">IVA 18% Inversión del sujeto pasivo</field>
+            <field name="description">IVA 18% Inversión del sujeto pasivo</field>
+            <field name="amount" eval="1.00"/>
+            <field name="type">percent</field>
+            <field name="child_depend" eval="1"/>
+            <field name="base_sign" eval="1.0"/>
+            <field name="tax_sign" eval="1.0"/>
+            <field name="ref_base_sign" eval="-1.0"/>
+            <field name="ref_tax_sign" eval="-1.0"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_assoc_ISP_compras_18_1" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">IVA 18% Inversión del sujeto pasivo (1)</field>
+            <field name="parent_id" ref="iva_assoc_ISP_compras_18"/>
+            <field name="amount" eval="0.00"/>
+            <field name="type">percent</field>
+            <field name="base_code_id" ref="base_assoc_extra_44"/>
+            <field name="ref_base_code_id" ref="base_assoc_extra_44"/>
+            <field name="base_sign" eval="1.0"/>
+            <field name="tax_sign" eval="1.0"/>
+            <field name="ref_base_sign" eval="-1.0"/>
+            <field name="ref_tax_sign" eval="-1.0"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_assoc_ISP_compras_18_2" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">IVA 18% Inversión del sujeto pasivo (2)</field>
+            <field name="parent_id" ref="iva_assoc_ISP_compras_18"/>
+            <field name="amount" eval="-0.18"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_477000"/>
+            <field name="account_paid_id" ref="pgc_assoc_477000"/>
+            <field name="base_code_id" ref="iva_assoc_dev_07_18"/>
+            <field name="tax_code_id" ref="iva_assoc_dev_09_18"/>
+            <field name="ref_base_code_id" ref="iva_assoc_dev_07_18"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_dev_09_18"/>
+            <field name="tax_sign" eval="-1.0"/>
+            <field name="base_sign" eval="1.0"/>
+            <field name="ref_tax_sign" eval="1.0"/>
+            <field name="ref_base_sign" eval="-1.0"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_assoc_ISP_compras_18_3" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">IVA 18% Inversión del sujeto pasivo (3)</field>
+            <field name="parent_id" ref="iva_assoc_ISP_compras_18"/>
+            <field name="amount" eval="0.18"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_472000"/>
+            <field name="account_paid_id" ref="pgc_assoc_472000"/>
+            <field name="base_code_id" ref="iva_assoc_ded_22_18"/>
+            <field name="tax_code_id" ref="iva_assoc_ded_23_18"/>
+            <field name="ref_base_code_id" ref="iva_assoc_ded_22_18"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_ded_23_18"/>
+            <field name="tax_sign" eval="1.0"/>
+            <field name="base_sign" eval="1.0"/>
+            <field name="ref_tax_sign" eval="-1.0"/>
+            <field name="ref_base_sign" eval="-1.0"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+<record id="iva_assoc_ISP_compras_21" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">IVA 21% Inversión del sujeto pasivo</field>
+            <field name="description">IVA 21% Inversión del sujeto pasivo</field>
+            <field name="amount" eval="1.00"/>
+            <field name="type">percent</field>
+            <field name="child_depend" eval="1"/>
+            <field name="base_sign" eval="1.0"/>
+            <field name="tax_sign" eval="1.0"/>
+            <field name="ref_base_sign" eval="-1.0"/>
+            <field name="ref_tax_sign" eval="-1.0"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_assoc_ISP_compras_21_1" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">IVA 21% Inversión del sujeto pasivo (1)</field>
+            <field name="parent_id" ref="iva_assoc_ISP_compras_21"/>
+            <field name="amount" eval="0.00"/>
+            <field name="type">percent</field>
+            <field name="base_code_id" ref="base_assoc_extra_44"/>
+            <field name="ref_base_code_id" ref="base_assoc_extra_44"/>
+            <field name="base_sign" eval="1.0"/>
+            <field name="tax_sign" eval="1.0"/>
+            <field name="ref_base_sign" eval="-1.0"/>
+            <field name="ref_tax_sign" eval="-1.0"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_assoc_ISP_compras_21_2" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">IVA 21% Inversión del sujeto pasivo (2)</field>
+            <field name="parent_id" ref="iva_assoc_ISP_compras_21"/>
+            <field name="amount" eval="-0.21"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_477000"/>
+            <field name="account_paid_id" ref="pgc_assoc_477000"/>
+            <field name="base_code_id" ref="iva_assoc_dev_07_21"/>
+            <field name="tax_code_id" ref="iva_assoc_dev_09_21"/>
+            <field name="ref_base_code_id" ref="iva_assoc_dev_07_21"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_dev_09_21"/>
+            <field name="tax_sign" eval="-1.0"/>
+            <field name="base_sign" eval="1.0"/>
+            <field name="ref_tax_sign" eval="1.0"/>
+            <field name="ref_base_sign" eval="-1.0"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_assoc_ISP_compras_21_3" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">IVA 21% Inversión del sujeto pasivo (3)</field>
+            <field name="parent_id" ref="iva_assoc_ISP_compras_21"/>
+            <field name="amount" eval="0.21"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_472000"/>
+            <field name="account_paid_id" ref="pgc_assoc_472000"/>
+            <field name="base_code_id" ref="iva_assoc_ded_22_21"/>
+            <field name="tax_code_id" ref="iva_assoc_ded_23_21"/>
+            <field name="ref_base_code_id" ref="iva_assoc_ded_22_21"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_ded_23_21"/>
+            <field name="tax_sign" eval="1.0"/>
+            <field name="base_sign" eval="1.0"/>
+            <field name="ref_tax_sign" eval="-1.0"/>
+            <field name="ref_base_sign" eval="-1.0"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <!-- IVA REPERCUTIDO-->
+        <record id="iva_assoc_rep_4" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">IVA 4%</field>
+            <field eval="0.04" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_477000"/>
+            <field name="account_paid_id" ref="pgc_assoc_477000"/>
+            <field name="base_code_id" ref="iva_assoc_dev_01"/>
+            <field name="tax_code_id" ref="iva_assoc_dev_03"/>
+            <field name="ref_base_code_id" ref="iva_assoc_dev_01"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_dev_03"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">sale</field>
+        </record>
+
+        <record id="iva_assoc_rep_7" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">IVA 7%</field>
+            <field eval="0.07" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_477000"/>
+            <field name="account_paid_id" ref="pgc_assoc_477000"/>
+            <field name="base_code_id" ref="iva_assoc_dev_04"/>
+            <field name="tax_code_id" ref="iva_assoc_dev_06"/>
+            <field name="ref_base_code_id" ref="iva_assoc_dev_04"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_dev_06"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">sale</field>
+        </record>
+
+        <record id="iva_assoc_rep_8" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">IVA 8%</field>
+            <field eval="0.08" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_477000"/>
+            <field name="account_paid_id" ref="pgc_assoc_477000"/>
+            <field name="base_code_id" ref="iva_assoc_dev_04_8"/>
+            <field name="tax_code_id" ref="iva_assoc_dev_06_8"/>
+            <field name="ref_base_code_id" ref="iva_assoc_dev_04_8"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_dev_06_8"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">sale</field>
+        </record>
+
+        <record id="iva_assoc_rep_10" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">IVA 10%</field>
+            <field eval="0.10" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_477000"/>
+            <field name="account_paid_id" ref="pgc_assoc_477000"/>
+            <field name="base_code_id" ref="iva_assoc_dev_04_10"/>
+            <field name="tax_code_id" ref="iva_assoc_dev_06_10"/>
+            <field name="ref_base_code_id" ref="iva_assoc_dev_04_10"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_dev_06_10"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">sale</field>
+        </record>
+
+        <record id="iva_assoc_rep_16" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">IVA 16%</field>
+            <field eval="0.16" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_477000"/>
+            <field name="account_paid_id" ref="pgc_assoc_477000"/>
+            <field name="base_code_id" ref="iva_assoc_dev_07"/>
+            <field name="tax_code_id" ref="iva_assoc_dev_09"/>
+            <field name="ref_base_code_id" ref="iva_assoc_dev_07"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_dev_09"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">sale</field>
+        </record>
+
+        <record id="iva_assoc_rep_18" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">IVA 18%</field>
+            <field eval="0.18" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_477000"/>
+            <field name="account_paid_id" ref="pgc_assoc_477000"/>
+            <field name="base_code_id" ref="iva_assoc_dev_07_18"/>
+            <field name="tax_code_id" ref="iva_assoc_dev_09_18"/>
+            <field name="ref_base_code_id" ref="iva_assoc_dev_07_18"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_dev_09_18"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">sale</field>
+        </record>
+
+        <record id="iva_assoc_rep_21" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">IVA 21%</field>
+            <field eval="0.21" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_477000"/>
+            <field name="account_paid_id" ref="pgc_assoc_477000"/>
+            <field name="base_code_id" ref="iva_assoc_dev_07_21"/>
+            <field name="tax_code_id" ref="iva_assoc_dev_09_21"/>
+            <field name="ref_base_code_id" ref="iva_assoc_dev_07_21"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_dev_09_21"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">sale</field>
+            <field eval="0" name="sequence"/>
+        </record>
+
+
+        <!-- Plantillas para recargo de equivalencia-->
+        <record id="re_assoc_05" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">0.50% Recargo Equivalencia</field>
+            <field eval="0.005" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_475000"/>
+            <field name="account_paid_id" ref="pgc_assoc_475000"/>
+            <field name="base_code_id" ref="iva_assoc_dev_10"/>
+            <field name="tax_code_id" ref="iva_assoc_dev_12"/>
+            <field name="ref_base_code_id" ref="iva_assoc_dev_10"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_dev_12"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">sale</field>
+        </record>
+
+        <record id="re_assoc_1" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">1% Recargo Equivalencia</field>
+            <field eval="0.01" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_475000"/>
+            <field name="account_paid_id" ref="pgc_assoc_475000"/>
+            <field name="base_code_id" ref="iva_assoc_dev_13"/>
+            <field name="tax_code_id" ref="iva_assoc_dev_15"/>
+            <field name="ref_base_code_id" ref="iva_assoc_dev_13"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_dev_15"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">sale</field>
+        </record>
+
+        <record id="re_assoc_14" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">1.4% Recargo Equivalencia</field>
+            <field eval="0.014" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_477000"/>
+            <field name="account_paid_id" ref="pgc_assoc_477000"/>
+            <field name="base_code_id" ref="iva_assoc_dev_13_14"/>
+            <field name="tax_code_id" ref="iva_assoc_dev_15_14"/>
+            <field name="ref_base_code_id" ref="iva_assoc_dev_13_14"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_dev_15_14"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">sale</field>
+        </record>
+
+        <record id="re_assoc_4" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">4% Recargo Equivalencia</field>
+            <field eval="0.04" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_475000"/>
+            <field name="account_paid_id" ref="pgc_assoc_475000"/>
+            <field name="base_code_id" ref="iva_assoc_dev_16"/>
+            <field name="tax_code_id" ref="iva_assoc_dev_18"/>
+            <field name="ref_base_code_id" ref="iva_assoc_dev_16"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_dev_18"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">sale</field>
+        </record>
+
+        <record id="re_assoc_52" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">5.2% Recargo Equivalencia</field>
+            <field eval="0.052" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_477000"/>
+            <field name="account_paid_id" ref="pgc_assoc_477000"/>
+            <field name="base_code_id" ref="iva_assoc_dev_16_52"/>
+            <field name="tax_code_id" ref="iva_assoc_dev_18_52"/>
+            <field name="ref_base_code_id" ref="iva_assoc_dev_16_52"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_dev_18_52"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">sale</field>
+        </record>
+
+        <record id="re_assoc_buy_05" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">0.50% Recargo Equivalencia Compras</field>
+            <field eval="0.005" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_472000"/>
+            <field name="account_paid_id" ref="pgc_assoc_472000"/>
+            <field name="base_code_id" ref="iva_assoc_ded_10"/>
+            <field name="tax_code_id" ref="iva_assoc_ded_12"/>
+            <field name="ref_base_code_id" ref="iva_assoc_ded_10"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_ded_12"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="re_assoc_buy_1" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">1% Recargo Equivalencia Compras</field>
+            <field eval="0.01" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_472000"/>
+            <field name="account_paid_id" ref="pgc_assoc_472000"/>
+            <field name="base_code_id" ref="iva_assoc_ded_13"/>
+            <field name="tax_code_id" ref="iva_assoc_ded_15"/>
+            <field name="ref_base_code_id" ref="iva_assoc_ded_13"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_ded_15"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="re_assoc_buy_14" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">1.4% Recargo Equivalencia Compras</field>
+            <field eval="0.014" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_472000"/>
+            <field name="account_paid_id" ref="pgc_assoc_472000"/>
+            <field name="base_code_id" ref="iva_assoc_ded_13_14"/>
+            <field name="tax_code_id" ref="iva_assoc_ded_15_14"/>
+            <field name="ref_base_code_id" ref="iva_assoc_ded_13_14"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_ded_15_14"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="re_assoc_buy_4" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">4% Recargo Equivalencia Compras</field>
+            <field eval="0.04" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_472000"/>
+            <field name="account_paid_id" ref="pgc_assoc_472000"/>
+            <field name="base_code_id" ref="iva_assoc_ded_16"/>
+            <field name="tax_code_id" ref="iva_assoc_ded_18"/>
+            <field name="ref_base_code_id" ref="iva_assoc_ded_16"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_ded_18"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="re_assoc_buy_52" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">5.2% Recargo Equivalencia Compras</field>
+            <field eval="0.052" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_472000"/>
+            <field name="account_paid_id" ref="pgc_assoc_472000"/>
+            <field name="base_code_id" ref="iva_assoc_ded_16_52"/>
+            <field name="tax_code_id" ref="iva_assoc_ded_18_52"/>
+            <field name="ref_base_code_id" ref="iva_assoc_ded_16_52"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_ded_18_52"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+
+<!-- OPERACIONES INTRACOMUNITARIAS -->
+
+        <!-- VENTAS -->
+        <record id="iva_assoc_IO" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">IVA 0% Intracomunitario</field>
+            <field name="description">IVA 0% Intracomunitario 0</field>
+            <field eval="0.00" name="amount"/>
+            <field name="type">percent</field>
+            <field name="base_code_id" ref="base_assoc_intra_42"/>
+            <field name="ref_base_code_id" ref="base_assoc_intra_42"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">sale</field>
+        </record>
+
+
+        <!-- COMPRAS -->
+        <record id="iva_assoc_IC_compras_16_bc" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">IVA 16% Intracomunitario. Bienes corrientes</field>
+            <field name="description">IVA 16% Intracomunitario. Bienes corrientes</field>
+            <field eval="1.00" name="amount"/>
+            <field name="type">percent</field>
+            <field eval="1" name="child_depend"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_assoc_IC_compras_16_bc_1" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="parent_id" ref="iva_assoc_IC_compras_16_bc"/>
+            <field name="name">IVA 16% Intracomunitario. Bienes corrientes (1)</field>
+            <field eval="0.16" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_assoc_472000"/>
+            <field name="account_collected_id" ref="pgc_assoc_472000"/>
+            <field name="base_code_id" ref="iva_assoc_ded_30_16"/>
+            <field name="tax_code_id" ref="iva_assoc_ded_31_16"/>
+            <field name="ref_base_code_id" ref="iva_assoc_ded_30_16"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_ded_31_16"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_assoc_IC_compras_16_bc_2" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="parent_id" ref="iva_assoc_IC_compras_16_bc"/>
+            <field name="name">IVA 16% Intracomunitario. Bienes corrientes (2)</field>
+            <field eval="-0.16" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_assoc_477000"/>
+            <field name="account_collected_id" ref="pgc_assoc_477000"/>
+            <field name="base_code_id" ref="iva_assoc_dev_19"/>
+            <field name="tax_code_id" ref="iva_assoc_dev_20"/>
+            <field eval="-1.0" name="tax_sign"/>
+            <field name="ref_base_code_id" ref="iva_assoc_dev_19"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <!--ATENCIÓN AQUÍ CON LOS SIGNOS. PENDIENTE DE PRUEBA EN PROFUNDIDAD-->
+            <field name="ref_tax_code_id" ref="iva_assoc_dev_20"/>
+            <field eval="1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="iva_assoc_IC_compras_18_bc" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">IVA 18% Intracomunitario. Bienes corrientes</field>
+            <field name="description">IVA 18% Intracomunitario. Bienes corrientes</field>
+            <field eval="1.00" name="amount"/>
+            <field name="type">percent</field>
+            <field eval="1" name="child_depend"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_assoc_IC_compras_18_bc_1" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="parent_id" ref="iva_assoc_IC_compras_18_bc"/>
+            <field name="name">IVA 18% Intracomunitario. Bienes corrientes (1)</field>
+            <field eval="0.18" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_assoc_472000"/>
+            <field name="account_collected_id" ref="pgc_assoc_472000"/>
+            <field name="base_code_id" ref="iva_assoc_ded_30_18"/>
+            <field name="tax_code_id" ref="iva_assoc_ded_31_18"/>
+            <field name="ref_base_code_id" ref="iva_assoc_ded_30_18"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_ded_31_18"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_assoc_IC_compras_18_bc_2" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="parent_id" ref="iva_assoc_IC_compras_18_bc"/>
+            <field name="name">IVA 18% Intracomunitario. Bienes corrientes (2)</field>
+            <field eval="-0.18" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_assoc_477000"/>
+            <field name="account_collected_id" ref="pgc_assoc_477000"/>
+            <field name="base_code_id" ref="iva_assoc_dev_19"/>
+            <field name="tax_code_id" ref="iva_assoc_dev_20"/>
+            <field eval="-1.0" name="tax_sign"/>
+            <field name="ref_base_code_id" ref="iva_assoc_dev_19"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <!--ATENCIÓN AQUÍ CON LOS SIGNOS. PENDIENTE DE PRUEBA EN PROFUNDIDAD-->
+            <field name="ref_tax_code_id" ref="iva_assoc_dev_20"/>
+            <field eval="1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <!--record id="vat_IO_buy_21b_3" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="parent_id" ref="vat_IO_buy_21b"/>
+            <field name="name">Biens Déductibles 21% (3)</field>
+            <field eval="0.00" name="amount"/>
+            <field name="type">percent</field>
+            <field name="ref_base_code_id" ref="vat_code_a86"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record-->
+<!-- ES NECESARIO ESTE ÚLTIMO REGISTRO????-->
+
+        <record id="iva_assoc_IC_compras_16_bi" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">IVA 16% Intracomunitario. Bienes de inversión</field>
+            <field name="description">IVA 16% Intracomunitario. Bienes de inversión</field>
+            <field eval="1.00" name="amount"/>
+            <field name="type">percent</field>
+            <field eval="1" name="child_depend"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_assoc_IC_compras_16_bi_1" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="parent_id" ref="iva_assoc_IC_compras_16_bi"/>
+            <field name="name">IVA 16% Intracomunitario. Bienes de inversión (1)</field>
+            <field eval="0.16" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_assoc_472000"/>
+            <field name="account_collected_id" ref="pgc_assoc_472000"/>
+            <field name="base_code_id" ref="iva_assoc_ded_32_16"/>
+            <field name="tax_code_id" ref="iva_assoc_ded_33_16"/>
+            <field name="ref_base_code_id" ref="iva_assoc_ded_32_16"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_ded_33_16"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_assoc_IC_compras_16_bi_2" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="parent_id" ref="iva_assoc_IC_compras_16_bi"/>
+            <field name="name">IVA 16% Intracomunitario. Bienes de inversión (2)</field>
+            <field eval="-0.16" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_assoc_477000"/>
+            <field name="account_collected_id" ref="pgc_assoc_477000"/>
+            <field name="base_code_id" ref="iva_assoc_dev_19"/>
+            <field name="tax_code_id" ref="iva_assoc_dev_20"/>
+            <field eval="-1.0" name="tax_sign"/>
+            <field name="ref_base_code_id" ref="iva_assoc_dev_19"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_dev_20"/>
+            <field eval="1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="iva_assoc_IC_compras_18_bi" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">IVA 18% Intracomunitario. Bienes de inversión</field>
+            <field name="description">IVA 18% Intracomunitario. Bienes de inversión</field>
+            <field eval="1.00" name="amount"/>
+            <field name="type">percent</field>
+            <field eval="1" name="child_depend"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_assoc_IC_compras_18_bi_1" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="parent_id" ref="iva_assoc_IC_compras_18_bi"/>
+            <field name="name">IVA 18% Intracomunitario. Bienes de inversión (1)</field>
+            <field eval="0.18" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_assoc_472000"/>
+            <field name="account_collected_id" ref="pgc_assoc_472000"/>
+            <field name="base_code_id" ref="iva_assoc_ded_32_18"/>
+            <field name="tax_code_id" ref="iva_assoc_ded_33_18"/>
+            <field name="ref_base_code_id" ref="iva_assoc_ded_32_18"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_ded_33_18"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_assoc_IC_compras_18_bi_2" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="parent_id" ref="iva_assoc_IC_compras_18_bi"/>
+            <field name="name">IVA 18% Intracomunitario. Bienes de inversión (2)</field>
+            <field eval="-0.18" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_assoc_477000"/>
+            <field name="account_collected_id" ref="pgc_assoc_477000"/>
+            <field name="base_code_id" ref="iva_assoc_dev_19"/>
+            <field name="tax_code_id" ref="iva_assoc_dev_20"/>
+            <field eval="-1.0" name="tax_sign"/>
+            <field name="ref_base_code_id" ref="iva_assoc_dev_19"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_dev_20"/>
+            <field eval="1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="iva_assoc_IC_compras_7_bc" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">IVA 7% Intracomunitario. Bienes corrientes</field>
+            <field name="description">IVA 7% Intracomunitario. Bienes corrientes</field>
+            <field eval="1.00" name="amount"/>
+            <field name="type">percent</field>
+            <field eval="1" name="child_depend"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_assoc_IC_compras_7_bc_1" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="parent_id" ref="iva_assoc_IC_compras_7_bc"/>
+            <field name="name">IVA 7% Intracomunitario. Bienes corrientes (1)</field>
+            <field eval="0.07" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_assoc_472000"/>
+            <field name="account_collected_id" ref="pgc_assoc_472000"/>
+            <field name="base_code_id" ref="iva_assoc_ded_30_7"/>
+            <field name="tax_code_id" ref="iva_assoc_ded_31_7"/>
+            <field name="ref_base_code_id" ref="iva_assoc_ded_30_7"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_ded_31_7"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_assoc_IC_compras_7_bc_2" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="parent_id" ref="iva_assoc_IC_compras_7_bc"/>
+            <field name="name">IVA 7% Intracomunitario. Bienes corrientes (2)</field>
+            <field eval="-0.07" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_assoc_477000"/>
+            <field name="account_collected_id" ref="pgc_assoc_477000"/>
+            <field name="base_code_id" ref="iva_assoc_dev_19"/>
+            <field name="tax_code_id" ref="iva_assoc_dev_20"/>
+            <field eval="-1.0" name="tax_sign"/>
+            <field name="ref_base_code_id" ref="iva_assoc_dev_19"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_dev_20"/>
+            <field eval="1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="iva_assoc_IC_compras_7_bi" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">IVA 7% Intracomunitario. Bienes de inversión</field>
+            <field name="description">IVA 7% Intracomunitario. Bienes de inversión</field>
+            <field eval="1.00" name="amount"/>
+            <field name="type">percent</field>
+            <field eval="1" name="child_depend"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_assoc_IC_compras_7_bi_1" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="parent_id" ref="iva_assoc_IC_compras_7_bi"/>
+            <field name="name">IVA 7% Intracomunitario. Bienes de inversión (1)</field>
+            <field eval="0.07" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_assoc_472000"/>
+            <field name="account_collected_id" ref="pgc_assoc_472000"/>
+            <field name="base_code_id" ref="iva_assoc_ded_32_7"/>
+            <field name="tax_code_id" ref="iva_assoc_ded_33_7"/>
+            <field name="ref_base_code_id" ref="iva_assoc_ded_32_7"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_ded_33_7"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_assoc_IC_compras_7_bi_2" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="parent_id" ref="iva_assoc_IC_compras_7_bi"/>
+            <field name="name">IVA 7% Intracomunitario. Bienes de inversión (2)</field>
+            <field eval="-0.07" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_assoc_477000"/>
+            <field name="account_collected_id" ref="pgc_assoc_477000"/>
+            <field name="base_code_id" ref="iva_assoc_dev_19"/>
+            <field name="tax_code_id" ref="iva_assoc_dev_20"/>
+            <field eval="-1.0" name="tax_sign"/>
+            <field name="ref_base_code_id" ref="iva_assoc_dev_19"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_dev_20"/>
+            <field eval="1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="iva_assoc_IC_compras_8_bc" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">IVA 8% Intracomunitario. Bienes corrientes</field>
+            <field name="description">IVA 8% Intracomunitario. Bienes corrientes</field>
+            <field eval="1.00" name="amount"/>
+            <field name="type">percent</field>
+            <field eval="1" name="child_depend"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_assoc_IC_compras_8_bc_1" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="parent_id" ref="iva_assoc_IC_compras_8_bc"/>
+            <field name="name">IVA 8% Intracomunitario. Bienes corrientes (1)</field>
+            <field eval="0.08" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_assoc_472000"/>
+            <field name="account_collected_id" ref="pgc_assoc_472000"/>
+            <field name="base_code_id" ref="iva_assoc_ded_30_8"/>
+            <field name="tax_code_id" ref="iva_assoc_ded_31_8"/>
+            <field name="ref_base_code_id" ref="iva_assoc_ded_30_8"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_ded_31_8"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_assoc_IC_compras_8_bc_2" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="parent_id" ref="iva_assoc_IC_compras_8_bc"/>
+            <field name="name">IVA 8% Intracomunitario. Bienes corrientes (2)</field>
+            <field eval="-0.08" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_assoc_477000"/>
+            <field name="account_collected_id" ref="pgc_assoc_477000"/>
+            <field name="base_code_id" ref="iva_assoc_dev_19"/>
+            <field name="tax_code_id" ref="iva_assoc_dev_20"/>
+            <field eval="-1.0" name="tax_sign"/>
+            <field name="ref_base_code_id" ref="iva_assoc_dev_19"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_dev_20"/>
+            <field eval="1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="iva_assoc_IC_compras_8_bi" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">IVA 8% Intracomunitario. Bienes de inversión</field>
+            <field name="description">IVA 8% Intracomunitario. Bienes de inversión</field>
+            <field eval="1.00" name="amount"/>
+            <field name="type">percent</field>
+            <field eval="1" name="child_depend"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_assoc_IC_compras_8_bi_1" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="parent_id" ref="iva_assoc_IC_compras_8_bi"/>
+            <field name="name">IVA 8% Intracomunitario. Bienes de inversión (1)</field>
+            <field eval="0.08" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_assoc_472000"/>
+            <field name="account_collected_id" ref="pgc_assoc_472000"/>
+            <field name="base_code_id" ref="iva_assoc_ded_32_8"/>
+            <field name="tax_code_id" ref="iva_assoc_ded_33_8"/>
+            <field name="ref_base_code_id" ref="iva_assoc_ded_32_8"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_ded_33_8"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_assoc_IC_compras_8_bi_2" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="parent_id" ref="iva_assoc_IC_compras_8_bi"/>
+            <field name="name">IVA 8% Intracomunitario. Bienes de inversión (2)</field>
+            <field eval="-0.08" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_assoc_477000"/>
+            <field name="account_collected_id" ref="pgc_assoc_477000"/>
+            <field name="base_code_id" ref="iva_assoc_dev_19"/>
+            <field name="tax_code_id" ref="iva_assoc_dev_20"/>
+            <field eval="-1.0" name="tax_sign"/>
+            <field name="ref_base_code_id" ref="iva_assoc_dev_19"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_dev_20"/>
+            <field eval="1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="iva_assoc_IC_compras_4_bc" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">IVA 4% Intracomunitario. Bienes corrientes</field>
+            <field name="description">IVA 4% Intracomunitario. Bienes corrientes</field>
+            <field eval="1.00" name="amount"/>
+            <field name="type">percent</field>
+            <field eval="1" name="child_depend"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_assoc_IC_compras_4_bc_1" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="parent_id" ref="iva_assoc_IC_compras_4_bc"/>
+            <field name="name">IVA 4% Intracomunitario. Bienes corrientes (1)</field>
+            <field eval="0.04" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_assoc_472000"/>
+            <field name="account_collected_id" ref="pgc_assoc_472000"/>
+            <field name="base_code_id" ref="iva_assoc_ded_30_4"/>
+            <field name="tax_code_id" ref="iva_assoc_ded_31_4"/>
+            <field name="ref_base_code_id" ref="iva_assoc_ded_30_4"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_ded_31_4"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_assoc_IC_compras_4_bc_2" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="parent_id" ref="iva_assoc_IC_compras_4_bc"/>
+            <field name="name">IVA 4% Intracomunitario. Bienes corrientes (2)</field>
+            <field eval="-0.04" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_assoc_477000"/>
+            <field name="account_collected_id" ref="pgc_assoc_477000"/>
+            <field name="base_code_id" ref="iva_assoc_dev_19"/>
+            <field name="tax_code_id" ref="iva_assoc_dev_20"/>
+            <field eval="-1.0" name="tax_sign"/>
+            <field name="ref_base_code_id" ref="iva_assoc_dev_19"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_dev_20"/>
+            <field eval="1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="iva_assoc_IC_compras_4_bi" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">IVA 4% Intracomunitario. Bienes de inversión</field>
+            <field name="description">IVA 4% Intracomunitario. Bienes de inversión</field>
+            <field eval="1.00" name="amount"/>
+            <field name="type">percent</field>
+            <field eval="1" name="child_depend"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_assoc_IC_compras_4_bi_1" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="parent_id" ref="iva_assoc_IC_compras_4_bi"/>
+            <field name="name">IVA 4% Intracomunitario. Bienes de inversión (1)</field>
+            <field eval="0.04" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_assoc_472000"/>
+            <field name="account_collected_id" ref="pgc_assoc_472000"/>
+            <field name="base_code_id" ref="iva_assoc_ded_32_4"/>
+            <field name="tax_code_id" ref="iva_assoc_ded_33_4"/>
+            <field name="ref_base_code_id" ref="iva_assoc_ded_32_4"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_ded_33_4"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_assoc_IC_compras_4_bi_2" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="parent_id" ref="iva_assoc_IC_compras_4_bi"/>
+            <field name="name">IVA 4% Intracomunitario. Bienes de inversión (2)</field>
+            <field eval="-0.04" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_assoc_477000"/>
+            <field name="account_collected_id" ref="pgc_assoc_477000"/>
+            <field name="base_code_id" ref="iva_assoc_dev_19"/>
+            <field name="tax_code_id" ref="iva_assoc_dev_20"/>
+            <field eval="-1.0" name="tax_sign"/>
+            <field name="ref_base_code_id" ref="iva_assoc_dev_19"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_dev_20"/>
+            <field eval="1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+         <record id="iva_assoc_IC_compras_10_bc" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">IVA 10% Intracomunitario. Bienes corrientes</field>
+            <field name="description">IVA 10% Intracomunitario. Bienes corrientes</field>
+            <field eval="1.00" name="amount"/>
+            <field name="type">percent</field>
+            <field eval="1" name="child_depend"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_assoc_IC_compras_10_bc_1" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="parent_id" ref="iva_assoc_IC_compras_10_bc"/>
+            <field name="name">IVA 10% Intracomunitario. Bienes corrientes (1)</field>
+            <field eval="0.10" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_assoc_472000"/>
+            <field name="account_collected_id" ref="pgc_assoc_472000"/>
+            <field name="base_code_id" ref="iva_assoc_ded_30_10"/>
+            <field name="tax_code_id" ref="iva_assoc_ded_31_10"/>
+            <field name="ref_base_code_id" ref="iva_assoc_ded_30_10"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_ded_31_8"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_assoc_IC_compras_10_bc_2" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="parent_id" ref="iva_assoc_IC_compras_10_bc"/>
+            <field name="name">IVA 10% Intracomunitario. Bienes corrientes (2)</field>
+            <field eval="-0.10" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_assoc_477000"/>
+            <field name="account_collected_id" ref="pgc_assoc_477000"/>
+            <field name="base_code_id" ref="iva_assoc_dev_19"/>
+            <field name="tax_code_id" ref="iva_assoc_dev_20"/>
+            <field eval="-1.0" name="tax_sign"/>
+            <field name="ref_base_code_id" ref="iva_assoc_dev_19"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_dev_20"/>
+            <field eval="1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="iva_assoc_IC_compras_10_bi" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">IVA 10% Intracomunitario. Bienes de inversión</field>
+            <field name="description">IVA 10% Intracomunitario. Bienes de inversión</field>
+            <field eval="1.00" name="amount"/>
+            <field name="type">percent</field>
+            <field eval="1" name="child_depend"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_assoc_IC_compras_10_bi_1" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="parent_id" ref="iva_assoc_IC_compras_10_bi"/>
+            <field name="name">IVA 10% Intracomunitario. Bienes de inversión (1)</field>
+            <field eval="0.10" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_assoc_472000"/>
+            <field name="account_collected_id" ref="pgc_assoc_472000"/>
+            <field name="base_code_id" ref="iva_assoc_ded_32_10"/>
+            <field name="tax_code_id" ref="iva_assoc_ded_33_10"/>
+            <field name="ref_base_code_id" ref="iva_assoc_ded_32_10"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_ded_33_10"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_assoc_IC_compras_10_bi_2" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="parent_id" ref="iva_assoc_IC_compras_10_bi"/>
+            <field name="name">IVA 10% Intracomunitario. Bienes de inversión (2)</field>
+            <field eval="-0.10" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_assoc_477000"/>
+            <field name="account_collected_id" ref="pgc_assoc_477000"/>
+            <field name="base_code_id" ref="iva_assoc_dev_19"/>
+            <field name="tax_code_id" ref="iva_assoc_dev_20"/>
+            <field eval="-1.0" name="tax_sign"/>
+            <field name="ref_base_code_id" ref="iva_assoc_dev_19"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_dev_20"/>
+            <field eval="1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="iva_assoc_IC_compras_21_bc" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">IVA 21% Intracomunitario. Bienes corrientes</field>
+            <field name="description">IVA 21% Intracomunitario. Bienes corrientes</field>
+            <field eval="1.00" name="amount"/>
+            <field name="type">percent</field>
+            <field eval="1" name="child_depend"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_assoc_IC_compras_21_bc_1" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="parent_id" ref="iva_assoc_IC_compras_21_bc"/>
+            <field name="name">IVA 21% Intracomunitario. Bienes corrientes (1)</field>
+            <field eval="0.21" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_assoc_472000"/>
+            <field name="account_collected_id" ref="pgc_assoc_472000"/>
+            <field name="base_code_id" ref="iva_assoc_ded_30_21"/>
+            <field name="tax_code_id" ref="iva_assoc_ded_31_21"/>
+            <field name="ref_base_code_id" ref="iva_assoc_ded_30_21"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_ded_31_21"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_assoc_IC_compras_21_bc_2" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="parent_id" ref="iva_assoc_IC_compras_21_bc"/>
+            <field name="name">IVA 21% Intracomunitario. Bienes corrientes (2)</field>
+            <field eval="-0.21" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_assoc_477000"/>
+            <field name="account_collected_id" ref="pgc_assoc_477000"/>
+            <field name="base_code_id" ref="iva_assoc_dev_19"/>
+            <field name="tax_code_id" ref="iva_assoc_dev_20"/>
+            <field eval="-1.0" name="tax_sign"/>
+            <field name="ref_base_code_id" ref="iva_assoc_dev_19"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <!--ATENCIÓN AQUÍ CON LOS SIGNOS. PENDIENTE DE PRUEBA EN PROFUNDIDAD-->
+            <field name="ref_tax_code_id" ref="iva_assoc_dev_20"/>
+            <field eval="1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="iva_assoc_IC_compras_21_bi" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">IVA 21% Intracomunitario. Bienes de inversión</field>
+            <field name="description">IVA 21% Intracomunitario. Bienes de inversión</field>
+            <field eval="1.00" name="amount"/>
+            <field name="type">percent</field>
+            <field eval="1" name="child_depend"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_assoc_IC_compras_21_bi_1" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="parent_id" ref="iva_assoc_IC_compras_21_bi"/>
+            <field name="name">IVA 21% Intracomunitario. Bienes de inversión (1)</field>
+            <field eval="0.21" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_assoc_472000"/>
+            <field name="account_collected_id" ref="pgc_assoc_472000"/>
+            <field name="base_code_id" ref="iva_assoc_ded_32_21"/>
+            <field name="tax_code_id" ref="iva_assoc_ded_33_21"/>
+            <field name="ref_base_code_id" ref="iva_assoc_ded_32_21"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_ded_33_21"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_assoc_IC_compras_21_bi_2" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="parent_id" ref="iva_assoc_IC_compras_21_bi"/>
+            <field name="name">IVA 21% Intracomunitario. Bienes de inversión (2)</field>
+            <field eval="-0.21" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_assoc_477000"/>
+            <field name="account_collected_id" ref="pgc_assoc_477000"/>
+            <field name="base_code_id" ref="iva_assoc_dev_19"/>
+            <field name="tax_code_id" ref="iva_assoc_dev_20"/>
+            <field eval="-1.0" name="tax_sign"/>
+            <field name="ref_base_code_id" ref="iva_assoc_dev_19"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_dev_20"/>
+            <field eval="1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <!-- RETENCIONES DE IRPF -->
+        <!--
+        - Novedad 2010: Los rendimientos derivados de rentas de capital mobiliario o inmobiliario, el tipo base de retención pasa del 18% al 19% para los primeros 6000 EUR y al 21% a partir de los 6000 EUR.
+        - Tipo general de retención IRPF al 18%. Se aplica a rendimientos por arrendamientos de inmuebles urbanos y ganancias patrimoniales sometidas a retención.
+        - Rendimientos de actividades profesionales: 15% (tipo general) y 7% (tipo especial reducido por inicio de actividad)
+        - Rendimientos de actividades agrícolas, ganaderas, forestales: 2%
+        - Retención del 1% a aplicar en el pago de rendimientos a empresarios en módulos.-->
+
+        <!-- RETENCIONES DE IRPF: Hacienda pública, acreedora por retenciones practicadas a proveedores -->
+
+        <!--Base imponible-->
+        <record id="irpf_assoc_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_assoc_root"/>
+        </record>
+
+        <record id="irpf_assoc_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_assoc_base"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="irpf_assoc_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_assoc_base"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="irpf_assoc_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_assoc_base"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="irpf_assoc_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_assoc_base"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="irpf_assoc_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_assoc_base"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="irpf_assoc_base_18" model="account.tax.code.template">
+            <field name="name">IRPF Retenciones practicadas Base Imponible 18%</field>
+            <field name="code">B.IRPF18</field>
+            <field name="parent_id" ref="irpf_assoc_base"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="irpf_assoc_base_19" model="account.tax.code.template">
+            <field name="name">IRPF Retenciones practicadas Base Imponible 19%</field>
+            <field name="code">B.IRPF19</field>
+            <field name="parent_id" ref="irpf_assoc_base"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="irpf_assoc_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_assoc_base"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="irpf_assoc_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_assoc_base"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <!--Cuotas-->
+        <record id="irpf_assoc_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_assoc_root"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="irpf_assoc_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_assoc_cuota_total"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="irpf_assoc_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_assoc_cuota_total"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="irpf_assoc_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_assoc_cuota_total"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="irpf_assoc_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_assoc_cuota_total"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="irpf_assoc_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_assoc_cuota_total"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="irpf_assoc_cuota_18" model="account.tax.code.template">
+            <field name="name">IRPF Retenciones practicadas Cuota 18%</field>
+            <field name="code">IRPF18</field>
+            <field name="parent_id" ref="irpf_assoc_cuota_total"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="irpf_assoc_cuota_19" model="account.tax.code.template">
+            <field name="name">IRPF Retenciones practicadas Cuota 19%</field>
+            <field name="code">IRPF19</field>
+            <field name="parent_id" ref="irpf_assoc_cuota_total"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="irpf_assoc_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_assoc_cuota_total"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="irpf_assoc_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_assoc_cuota_total"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <!--Cuentas para Retenciones-->
+        <record id="pgc_assoc_475101" model="account.account.template">
+            <field name="code">475101</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_4751"/>
+            <field name="type">other</field>
+            <field name="name">Hacienda Pública. Retenciones empresarios módulos 1%</field>
+            <field name="user_type" ref="tax"/>
+        </record>
+
+        <record id="pgc_assoc_475102" model="account.account.template">
+            <field name="code">475102</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_4751"/>
+            <field name="type">other</field>
+            <field name="name">Hacienda Pública. Retenciones act. agrícolas, ganaderas, forestales 2%</field>
+            <field name="user_type" ref="tax"/>
+        </record>
+
+        <record id="pgc_assoc_475107" model="account.account.template">
+            <field name="code">475107</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_4751"/>
+            <field name="type">other</field>
+            <field name="name">Hacienda Pública. Retenciones act. profesionales 7%</field>
+            <field name="user_type" ref="tax"/>
+        </record>
+
+        <record id="pgc_assoc_475109" model="account.account.template">
+            <field name="code">475109</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_4751"/>
+            <field name="type">other</field>
+            <field name="name">Hacienda Pública. Retenciones act. profesionales 9%</field>
+            <field name="user_type" ref="tax"/>
+        </record>
+
+        <record id="pgc_assoc_475115" model="account.account.template">
+            <field name="code">475115</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_4751"/>
+            <field name="type">other</field>
+            <field name="name">Hacienda Pública. Retenciones act. profesionales 15%</field>
+            <field name="user_type" ref="tax"/>
+        </record>
+
+        <record id="pgc_assoc_475118" model="account.account.template">
+            <field name="code">475118</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_4751"/>
+            <field name="type">other</field>
+            <field name="name">Hacienda Pública. Retenciones arrendamientos, cap. mobiliario 18%</field>
+            <field name="user_type" ref="tax"/>
+        </record>
+
+        <record id="pgc_assoc_475119" model="account.account.template">
+            <field name="code">475119</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_4751"/>
+            <field name="type">other</field>
+            <field name="name">Hacienda Pública. Retenciones arrendamientos, cap. mobiliario 19%</field>
+            <field name="user_type" ref="tax"/>
+        </record>
+
+        <record id="pgc_assoc_475120" model="account.account.template">
+            <field name="code">475120</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_4751"/>
+            <field name="type">other</field>
+            <field name="name">Hacienda Pública. Retenciones arrendamientos, cap. mobiliario 20%</field>
+            <field name="user_type" ref="tax"/>
+        </record>
+
+        <record id="pgc_assoc_475121" model="account.account.template">
+            <field name="code">475121</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_4751"/>
+            <field name="type">other</field>
+            <field name="name">Hacienda Pública. Retenciones arrendamientos, cap. mobiliario 21%</field>
+            <field name="user_type" ref="tax"/>
+        </record>
+
+        <!-- Plantillas de retenciones-->
+        <record id="irpf_assoc_1" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">Retenciones IRPF 1%</field>
+            <field eval="-0.01" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_475101"/>
+            <field name="account_paid_id" ref="pgc_assoc_475101"/>
+            <field name="base_code_id" ref="irpf_assoc_base_1"/>
+            <field name="tax_code_id" ref="irpf_assoc_cuota_1"/>
+            <field name="ref_base_code_id" ref="irpf_assoc_base_1"/>
+            <field name="ref_tax_code_id" ref="irpf_assoc_cuota_1"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="irpf_assoc_2" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">Retenciones IRPF 2%</field>
+            <field eval="-0.02" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_475102"/>
+            <field name="account_paid_id" ref="pgc_assoc_475102"/>
+            <field name="base_code_id" ref="irpf_assoc_base_2"/>
+            <field name="tax_code_id" ref="irpf_assoc_cuota_2"/>
+            <field name="ref_base_code_id" ref="irpf_assoc_base_2"/>
+            <field name="ref_tax_code_id" ref="irpf_assoc_cuota_2"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="irpf_assoc_7" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">Retenciones IRPF 7%</field>
+            <field eval="-0.07" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_475107"/>
+            <field name="account_paid_id" ref="pgc_assoc_475107"/>
+            <field name="base_code_id" ref="irpf_assoc_base_7"/>
+            <field name="tax_code_id" ref="irpf_assoc_cuota_7"/>
+            <field name="ref_base_code_id" ref="irpf_assoc_base_7"/>
+            <field name="ref_tax_code_id" ref="irpf_assoc_cuota_7"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="irpf_assoc_9" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">Retenciones IRPF 9%</field>
+            <field eval="-0.09" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_475109"/>
+            <field name="account_paid_id" ref="pgc_assoc_475109"/>
+            <field name="base_code_id" ref="irpf_assoc_base_9"/>
+            <field name="tax_code_id" ref="irpf_assoc_cuota_9"/>
+            <field name="ref_base_code_id" ref="irpf_assoc_base_9"/>
+            <field name="ref_tax_code_id" ref="irpf_assoc_cuota_9"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="irpf_assoc_15" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">Retenciones IRPF 15%</field>
+            <field eval="-0.15" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_475115"/>
+            <field name="account_paid_id" ref="pgc_assoc_475115"/>
+            <field name="base_code_id" ref="irpf_assoc_base_15"/>
+            <field name="tax_code_id" ref="irpf_assoc_cuota_15"/>
+            <field name="ref_base_code_id" ref="irpf_assoc_base_15"/>
+            <field name="ref_tax_code_id" ref="irpf_assoc_cuota_15"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="irpf_assoc_18" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">Retenciones IRPF 18%</field>
+            <field eval="-0.18" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_475118"/>
+            <field name="account_paid_id" ref="pgc_assoc_475118"/>
+            <field name="base_code_id" ref="irpf_assoc_base_18"/>
+            <field name="tax_code_id" ref="irpf_assoc_cuota_18"/>
+            <field name="ref_base_code_id" ref="irpf_assoc_base_18"/>
+            <field name="ref_tax_code_id" ref="irpf_assoc_cuota_18"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="irpf_assoc_19" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">Retenciones IRPF 19%</field>
+            <field eval="-0.19" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_475119"/>
+            <field name="account_paid_id" ref="pgc_assoc_475119"/>
+            <field name="base_code_id" ref="irpf_assoc_base_19"/>
+            <field name="tax_code_id" ref="irpf_assoc_cuota_19"/>
+            <field name="ref_base_code_id" ref="irpf_assoc_base_19"/>
+            <field name="ref_tax_code_id" ref="irpf_assoc_cuota_19"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="irpf_assoc_20" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">Retenciones IRPF 20%</field>
+            <field eval="-0.20" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_475120"/>
+            <field name="account_paid_id" ref="pgc_assoc_475120"/>
+            <field name="base_code_id" ref="irpf_assoc_base_20"/>
+            <field name="tax_code_id" ref="irpf_assoc_cuota_20"/>
+            <field name="ref_base_code_id" ref="irpf_assoc_base_20"/>
+            <field name="ref_tax_code_id" ref="irpf_assoc_cuota_20"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="irpf_assoc_21" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">Retenciones IRPF 21%</field>
+            <field eval="-0.21" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_475121"/>
+            <field name="account_paid_id" ref="pgc_assoc_475121"/>
+            <field name="base_code_id" ref="irpf_assoc_base_21"/>
+            <field name="tax_code_id" ref="irpf_assoc_cuota_21"/>
+            <field name="ref_base_code_id" ref="irpf_assoc_base_21"/>
+            <field name="ref_tax_code_id" ref="irpf_assoc_cuota_21"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <!-- RETENCIONES DE IRPF: Hacienda pública, retenciones a cuenta como clientes -->
+
+        <!--Base imponible-->
+        <record id="irpf_assoc_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_assoc_root"/>
+        </record>
+
+        <record id="irpf_assoc_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_assoc_base_sale"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="irpf_assoc_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_assoc_base_sale"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="irpf_assoc_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_assoc_base_sale"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="irpf_assoc_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_assoc_base_sale"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="irpf_assoc_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_assoc_base_sale"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="irpf_assoc_base_sale_18" model="account.tax.code.template">
+            <field name="name">IRPF Retenciones a cuenta Base Imponible 18%</field>
+            <field name="code">B.IRPF18 AC</field>
+            <field name="parent_id" ref="irpf_assoc_base_sale"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="irpf_assoc_base_sale_19" model="account.tax.code.template">
+            <field name="name">IRPF Retenciones a cuenta Base Imponible 19%</field>
+            <field name="code">B.IRPF19 AC</field>
+            <field name="parent_id" ref="irpf_assoc_base_sale"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="irpf_assoc_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_assoc_base_sale"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="irpf_assoc_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_assoc_base_sale"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <!--Cuotas-->
+        <record id="irpf_assoc_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_assoc_root"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="irpf_assoc_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_assoc_cuota_sale_total"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="irpf_assoc_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_assoc_cuota_sale_total"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="irpf_assoc_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_assoc_cuota_sale_total"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="irpf_assoc_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_assoc_cuota_sale_total"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="irpf_assoc_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_assoc_cuota_sale_total"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="irpf_assoc_cuota_sale_18" model="account.tax.code.template">
+            <field name="name">IRPF Retenciones a cuenta Cuota 18%</field>
+            <field name="code">IRPF18 AC</field>
+            <field name="parent_id" ref="irpf_assoc_cuota_sale_total"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="irpf_assoc_cuota_sale_19" model="account.tax.code.template">
+            <field name="name">IRPF Retenciones a cuenta Cuota 19%</field>
+            <field name="code">IRPF19 AC</field>
+            <field name="parent_id" ref="irpf_assoc_cuota_sale_total"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="irpf_assoc_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_assoc_cuota_sale_total"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="irpf_assoc_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_assoc_cuota_sale_total"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <!--Cuentas para Retenciones-->
+        <record id="pgc_assoc_473001" model="account.account.template">
+            <field name="code">473001</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_473"/>
+            <field name="type">other</field>
+            <field name="name">Hacienda Pública. Retenciones a cuenta empresarios módulos 1%</field>
+            <field name="user_type" ref="tax"/>
+        </record>
+
+        <record id="pgc_assoc_473002" model="account.account.template">
+            <field name="code">473002</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_473"/>
+            <field name="type">other</field>
+            <field name="name">Hacienda Pública. Retenciones a cuenta act. agrícolas, ganaderas, forestales 2%</field>
+            <field name="user_type" ref="tax"/>
+        </record>
+
+        <record id="pgc_assoc_473007" model="account.account.template">
+            <field name="code">473007</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_473"/>
+            <field name="type">other</field>
+            <field name="name">Hacienda Pública. Retenciones a cuenta act. profesionales 7%</field>
+            <field name="user_type" ref="tax"/>
+        </record>
+
+        <record id="pgc_assoc_473009" model="account.account.template">
+            <field name="code">473009</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_473"/>
+            <field name="type">other</field>
+            <field name="name">Hacienda Pública. Retenciones a cuenta act. profesionales 9%</field>
+            <field name="user_type" ref="tax"/>
+        </record>
+
+        <record id="pgc_assoc_473015" model="account.account.template">
+            <field name="code">473015</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_473"/>
+            <field name="type">other</field>
+            <field name="name">Hacienda Pública. Retenciones a cuenta act. profesionales 15%</field>
+            <field name="user_type" ref="tax"/>
+        </record>
+
+        <record id="pgc_assoc_473018" model="account.account.template">
+            <field name="code">473018</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_473"/>
+            <field name="type">other</field>
+            <field name="name">Hacienda Pública. Retenciones a cuenta arrendamientos, cap. mobiliario 18%</field>
+            <field name="user_type" ref="tax"/>
+        </record>
+
+        <record id="pgc_assoc_473019" model="account.account.template">
+            <field name="code">473019</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_473"/>
+            <field name="type">other</field>
+            <field name="name">Hacienda Pública. Retenciones a cuenta arrendamientos, cap. mobiliario 19%</field>
+            <field name="user_type" ref="tax"/>
+        </record>
+
+        <record id="pgc_assoc_473020" model="account.account.template">
+            <field name="code">473020</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_473"/>
+            <field name="type">other</field>
+            <field name="name">Hacienda Pública. Retenciones a cuenta arrendamientos, cap. mobiliario 20%</field>
+            <field name="user_type" ref="tax"/>
+        </record>
+
+        <record id="pgc_assoc_473021" model="account.account.template">
+            <field name="code">473021</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_473"/>
+            <field name="type">other</field>
+            <field name="name">Hacienda Pública. Retenciones a cuenta arrendamientos, cap. mobiliario 21%</field>
+            <field name="user_type" ref="tax"/>
+        </record>
+
+        <!-- Plantillas de retenciones-->
+        <record id="irpf_assoc_sale_1" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">Retenciones a cuenta IRPF 1%</field>
+            <field eval="-0.01" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_473001"/>
+            <field name="account_paid_id" ref="pgc_assoc_473001"/>
+            <field name="base_code_id" ref="irpf_assoc_base_sale_1"/>
+            <field name="tax_code_id" ref="irpf_assoc_cuota_sale_1"/>
+            <field name="ref_base_code_id" ref="irpf_assoc_base_sale_1"/>
+            <field name="ref_tax_code_id" ref="irpf_assoc_cuota_sale_1"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">sale</field>
+        </record>
+
+        <record id="irpf_assoc_sale_2" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">Retenciones a cuenta IRPF 2%</field>
+            <field eval="-0.02" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_473002"/>
+            <field name="account_paid_id" ref="pgc_assoc_473002"/>
+            <field name="base_code_id" ref="irpf_assoc_base_sale_2"/>
+            <field name="tax_code_id" ref="irpf_assoc_cuota_sale_2"/>
+            <field name="ref_base_code_id" ref="irpf_assoc_base_sale_2"/>
+            <field name="ref_tax_code_id" ref="irpf_assoc_cuota_sale_2"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">sale</field>
+        </record>
+
+        <record id="irpf_assoc_sale_7" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">Retenciones a cuenta IRPF 7%</field>
+            <field eval="-0.07" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_473007"/>
+            <field name="account_paid_id" ref="pgc_assoc_473007"/>
+            <field name="base_code_id" ref="irpf_assoc_base_sale_7"/>
+            <field name="tax_code_id" ref="irpf_assoc_cuota_sale_7"/>
+            <field name="ref_base_code_id" ref="irpf_assoc_base_sale_7"/>
+            <field name="ref_tax_code_id" ref="irpf_assoc_cuota_sale_7"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">sale</field>
+        </record>
+
+        <record id="irpf_assoc_sale_9" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">Retenciones a cuenta IRPF 9%</field>
+            <field eval="-0.09" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_473009"/>
+            <field name="account_paid_id" ref="pgc_assoc_473009"/>
+            <field name="base_code_id" ref="irpf_assoc_base_sale_9"/>
+            <field name="tax_code_id" ref="irpf_assoc_cuota_sale_9"/>
+            <field name="ref_base_code_id" ref="irpf_assoc_base_sale_9"/>
+            <field name="ref_tax_code_id" ref="irpf_assoc_cuota_sale_9"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">sale</field>
+        </record>
+
+        <record id="irpf_assoc_sale_15" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">Retenciones a cuenta IRPF 15%</field>
+            <field eval="-0.15" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_473015"/>
+            <field name="account_paid_id" ref="pgc_assoc_473015"/>
+            <field name="base_code_id" ref="irpf_assoc_base_sale_15"/>
+            <field name="tax_code_id" ref="irpf_assoc_cuota_sale_15"/>
+            <field name="ref_base_code_id" ref="irpf_assoc_base_sale_15"/>
+            <field name="ref_tax_code_id" ref="irpf_assoc_cuota_sale_15"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">sale</field>
+        </record>
+
+        <record id="irpf_assoc_sale_18" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">Retenciones a cuenta IRPF 18%</field>
+            <field eval="-0.18" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_473018"/>
+            <field name="account_paid_id" ref="pgc_assoc_473018"/>
+            <field name="base_code_id" ref="irpf_assoc_base_sale_18"/>
+            <field name="tax_code_id" ref="irpf_assoc_cuota_sale_18"/>
+            <field name="ref_base_code_id" ref="irpf_assoc_base_sale_18"/>
+            <field name="ref_tax_code_id" ref="irpf_assoc_cuota_sale_18"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">sale</field>
+        </record>
+
+        <record id="irpf_assoc_sale_19" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">Retenciones a cuenta IRPF 19%</field>
+            <field eval="-0.19" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_473019"/>
+            <field name="account_paid_id" ref="pgc_assoc_473019"/>
+            <field name="base_code_id" ref="irpf_assoc_base_sale_19"/>
+            <field name="tax_code_id" ref="irpf_assoc_cuota_sale_19"/>
+            <field name="ref_base_code_id" ref="irpf_assoc_base_sale_19"/>
+            <field name="ref_tax_code_id" ref="irpf_assoc_cuota_sale_19"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">sale</field>
+        </record>
+
+        <record id="irpf_assoc_sale_20" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">Retenciones a cuenta IRPF 20%</field>
+            <field eval="-0.20" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_473020"/>
+            <field name="account_paid_id" ref="pgc_assoc_473020"/>
+            <field name="base_code_id" ref="irpf_assoc_base_sale_20"/>
+            <field name="tax_code_id" ref="irpf_assoc_cuota_sale_20"/>
+            <field name="ref_base_code_id" ref="irpf_assoc_base_sale_20"/>
+            <field name="ref_tax_code_id" ref="irpf_assoc_cuota_sale_20"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">sale</field>
+        </record>
+
+        <record id="irpf_assoc_sale_21" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">Retenciones a cuenta IRPF 21%</field>
+            <field eval="-0.21" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_473021"/>
+            <field name="account_paid_id" ref="pgc_assoc_473021"/>
+            <field name="base_code_id" ref="irpf_assoc_base_sale_21"/>
+            <field name="tax_code_id" ref="irpf_assoc_cuota_sale_21"/>
+            <field name="ref_base_code_id" ref="irpf_assoc_base_sale_21"/>
+            <field name="ref_tax_code_id" ref="irpf_assoc_cuota_sale_21"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">sale</field>
+        </record>
+    </data>
+</openerp>
diff --git a/addons/l10n_es/taxes_data_pymes.xml b/addons/l10n_es/taxes_data_pymes.xml
index 7467dbb9596..f48d46d951a 100644
--- a/addons/l10n_es/taxes_data_pymes.xml
+++ b/addons/l10n_es/taxes_data_pymes.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data noupdate="1">
+    <data noupdate="0">
 
-      <!--
-      Plantillas de impuestos para el Plan General Contable PYMES 2008.
+    <!-- Definición de IVA y retenciones, códigos de impuestos y cuentas contables adicionales -->
+
+    <!-- Plantillas de impuestos para el Plan General Contable PYMES 2008.
 
       Basado en taxes_data.xml, con los siguientes cambios:
 
@@ -26,20 +27,25 @@
         Impuestos IRPF se les ha asignado el grupo others (Otros) en lugar del grupo vat (IVA) por defecto
 
       Jordi Esteve (Zikzakmedia) - jesteve@zikzakmedia.com (2010-02-18)
-           Añadido IRPF 2% (act. agrícolas, ganaderas, forestales), 19% y 21% (antiguo 18%)
+        Añadido IRPF 2% (act. agrícolas, ganaderas, forestales), 19% y 21% (antiguo 18%)
         Novedad 2010: Los rendimientos derivados de rentas de capital mobiliario o inmobiliario, el tipo base de retención pasa del 18% al 19% para los primeros 6000 EUR y al 21% a partir de los 6000 EUR.
-      -->
 
-        <!-- Definición de IVA y retenciones, códigos de impuestos y cuentas contables adicionales -->
-        
-        
+      Ignacio Ibeas (Acysos) - ignacio@acysos.com (2011-05-06)
+        Añadido Recargos de equivalencia para venta y compra
+
+      Pedro M. Baeza (Serv. Tecnol. Avanzados) - pedro.baeza@serviciosbaeza.com (2013-01-30)
+        Limpieza de subcuentas de impuestos y corrección de inversión de sujeto pasivo
+
+    -->
+
+
 <!-- Configuracion de codigos de impuesto-->
-        
-    
+
+
     <!-- *********************************************** -->
     <!--IVA DEVENGADO -->
     <!-- *********************************************** -->
-    
+
     <!--Base imponible-->
     <!-- *********************************************** -->
         <record id="iva_pymes_dev_base" model="account.tax.code.template">
@@ -48,44 +54,103 @@
             <field name="sign">1.0</field>
             <field name="parent_id" ref="vat_code_chart_pymes_root"/>
         </record>
-        
-        
-    
+
+    <!-- Exentas IVA -->
+        <record id="base_pymes_sop_ex" model="account.tax.code.template">
+            <field name="name">Base adquisiciones exentas</field>
+            <field name="parent_id" ref="vat_code_chart_pymes_root"/>
+            <field name="code">--</field>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="base_pymes_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_pymes_root"/>
+            <field name="sign">1.0</field>
+        </record>         	
+
+        <!-- IVA Soportado -->
+        <record id="iva_pymes_sop_ex" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+            <field name="name">IVA Soportado exento (operaciones corrientes)</field>
+            <field eval="0.0" name="amount"/>
+            <field name="type">percent</field>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field name="base_code_id" ref="base_pymes_sop_ex"/>
+            <field name="ref_base_code_id" ref="base_pymes_sop_ex"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <!-- IVA REPERCUTIDO-->
+        <record id="iva_pymes_rep_ex" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+            <field name="name">IVA Exento</field>
+            <field eval="0.0" name="amount"/>
+            <field name="type">percent</field>
+            <field name="base_code_id" ref="base_pymes_rep_ex"/>
+            <field name="ref_base_code_id" ref="base_pymes_rep_ex"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">sale</field>
+        </record>
+
     <!--Régimen general-->
-         
+
         <record id="iva_pymes_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_pymes_dev_base"/>
             <field name="sign">1.0</field>
         </record>
-        
+
         <record id="iva_pymes_dev_04" model="account.tax.code.template">
             <field name="name">Régimen general IVA Devengado. Base Imponible 7%</field>
             <field name="code">[04]</field>
             <field name="parent_id" ref="iva_pymes_dev_base"/>
             <field name="sign">1.0</field>
         </record>
+
         <record id="iva_pymes_dev_04_8" model="account.tax.code.template">
             <field name="name">Régimen general IVA Devengado. Base Imponible 8%</field>
             <field name="code">[04]</field>
             <field name="parent_id" ref="iva_pymes_dev_base"/>
             <field name="sign">1.0</field>
         </record>
-        
+
+		 <record id="iva_pymes_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_pymes_dev_base"/>
+            <field name="sign">1.0</field>
+        </record>
+
         <record id="iva_pymes_dev_07" model="account.tax.code.template">
             <field name="name">Régimen general IVA Devengado. Base Imponible 16%</field>
             <field name="code">[07]</field>
             <field name="parent_id" ref="iva_pymes_dev_base"/>
             <field name="sign">1.0</field>
         </record>
+
         <record id="iva_pymes_dev_07_18" model="account.tax.code.template">
             <field name="name">Régimen general IVA Devengado. Base Imponible 18%</field>
             <field name="code">[07]</field>
             <field name="parent_id" ref="iva_pymes_dev_base"/>
             <field name="sign">1.0</field>
         </record>
-    
+
+        <record id="iva_pymes_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_pymes_dev_base"/>
+            <field name="sign">1.0</field>
+        </record>
+
         <!-- RECARGO DE EQUIVALENCIA -->
         <!--record id="re_pymes_base" model="account.tax.code.template">
             <field name="name">Recargo Equivalencia Base Imponible</field>
@@ -93,73 +158,93 @@
             <field name="sign">1.0</field>
             <field name="parent_id" ref="iva_pymes_dev_base"/>
         </record-->
-        
+
         <record id="iva_pymes_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_pymes_dev_base"/>
             <field name="sign">1.0</field>
         </record>
-        
+
         <record id="iva_pymes_dev_13" model="account.tax.code.template">
             <field name="name">Recargo Equivalencia Base Imponible 1%</field>
             <field name="code">[13]</field>
             <field name="parent_id" ref="iva_pymes_dev_base"/>
             <field name="sign">1.0</field>
         </record>
-        
+
+        <record id="iva_pymes_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_pymes_dev_base"/>
+            <field name="sign">1.0</field>
+        </record>
+
         <record id="iva_pymes_dev_16" model="account.tax.code.template">
             <field name="name">Recargo Equivalencia Base Imponible 4%</field>
             <field name="code">[16]</field>
             <field name="parent_id" ref="iva_pymes_dev_base"/>
             <field name="sign">1.0</field>
         </record>
-        
-        
+
+        <record id="iva_pymes_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_pymes_dev_base"/>
+            <field name="sign">1.0</field>
+        </record>
+
         <!-- ADQUISICIONES INTRACOMUNITARIAS -->
-        
+
         <record id="iva_pymes_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_pymes_dev_base"/>
             <field name="sign">1.0</field>
         </record>
-        
+
     <!--IVA devengado cuota-->
     <!-- *********************************************** -->
-    
-    
+
+
     <!--Régimen general-->
-         
-         
+
+
         <record id="iva_pymes_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_pymes_root"/>
         </record>
-         
+
         <record id="iva_pymes_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_pymes_dev_21"/>
             <field name="sign">1.0</field>
         </record>
-        
+
         <record id="iva_pymes_dev_06" model="account.tax.code.template">
             <field name="name">Régimen general IVA Devengado. Cuota 7%</field>
             <field name="code">[06]</field>
             <field name="parent_id" ref="iva_pymes_dev_21"/>
             <field name="sign">1.0</field>
         </record>
-        
+
         <record id="iva_pymes_dev_06_8" model="account.tax.code.template">
             <field name="name">Régimen general IVA Devengado. Cuota 8%</field>
             <field name="code">[06]</field>
             <field name="parent_id" ref="iva_pymes_dev_21"/>
             <field name="sign">1.0</field>
         </record>
-        
+
+ 	<record id="iva_pymes_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_pymes_dev_21"/>
+            <field name="sign">1.0</field>
+        </record>
+
         <record id="iva_pymes_dev_09" model="account.tax.code.template">
             <field name="name">Régimen general IVA Devengado. Cuota 16%</field>
             <field name="code">[09]</field>
@@ -173,7 +258,14 @@
             <field name="parent_id" ref="iva_pymes_dev_21"/>
             <field name="sign">1.0</field>
         </record>
-    
+
+         <record id="iva_pymes_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_pymes_dev_21"/>
+            <field name="sign">1.0</field>
+        </record>
+
         <!-- RECARGO DE EQUIVALENCIA -->
         <!--record id="re_base" model="account.tax.code.template">
             <field name="name">Recargo Equivalencia Base Imponible</field>
@@ -181,47 +273,61 @@
             <field name="sign">1.0</field>
             <field name="parent_id" ref="iva_pymes_dev_base"/>
         </record-->
-        
+
         <record id="iva_pymes_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_pymes_dev_21"/>
             <field name="sign">1.0</field>
         </record>
-        
+
         <record id="iva_pymes_dev_15" model="account.tax.code.template">
             <field name="name">Recargo Equivalencia. Cuota 1%</field>
             <field name="code">[15]</field>
             <field name="parent_id" ref="iva_pymes_dev_21"/>
             <field name="sign">1.0</field>
         </record>
-        
+
+        <record id="iva_pymes_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_pymes_dev_21"/>
+            <field name="sign">1.0</field>
+        </record>
+
         <record id="iva_pymes_dev_18" model="account.tax.code.template">
             <field name="name">Recargo Equivalencia. Cuota 4%</field>
             <field name="code">[18]</field>
             <field name="parent_id" ref="iva_pymes_dev_21"/>
             <field name="sign">1.0</field>
         </record>
-        
-        
+
+        <record id="iva_pymes_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_pymes_dev_21"/>
+            <field name="sign">1.0</field>
+        </record>
+
+
         <!-- ADQUISICIONES INTRACOMUNITARIAS -->
-        
+
         <record id="iva_pymes_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_pymes_dev_21"/>
             <field name="sign">1.0</field>
         </record>
-        
-        
-        
-        
-            
+
+
+
+
+
     <!-- *********************************************** -->
     <!--IVA DEDUCIBLE -->
     <!-- *********************************************** -->
-        
-        
+
+
     <!--IVA Soportado (Deducible) Base Imponible-->
     <!-- *********************************************** -->
         <record id="iva_pymes_ded_base_total" model="account.tax.code.template">
@@ -230,7 +336,7 @@
             <field name="sign">1.0</field>
             <field name="parent_id" ref="vat_code_chart_pymes_root"/>
         </record>
-        
+
         <!-- Base en OPERACIONES INTERIORES CORRIENTES-->
         <record id="iva_pymes_ded_22" model="account.tax.code.template">
             <field name="name">Base operaciones interiores corrientes</field>
@@ -238,19 +344,12 @@
             <field name="parent_id" ref="iva_pymes_ded_base_total"/>
             <field name="sign">1.0</field>
         </record>
-        <record id="iva_pymes_ded_22_16" model="account.tax.code.template">
-            <field name="name">Base operaciones interiores corrientes (16%)</field>
+         <record id="iva_pymes_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_pymes_ded_22"/>
             <field name="sign">1.0</field>
         </record>
-        <record id="iva_pymes_ded_22_18" model="account.tax.code.template">
-            <field name="name">Base operaciones interiores corrientes (18%)</field>
-            <field name="code">--</field>
-            <field name="parent_id" ref="iva_pymes_ded_22"/>
-            <field name="sign">1.0</field>
-        </record>
-        
         <record id="iva_pymes_ded_22_7" model="account.tax.code.template">
             <field name="name">Base operaciones interiores corrientes (7%)</field>
             <field name="code">--</field>
@@ -263,13 +362,31 @@
             <field name="parent_id" ref="iva_pymes_ded_22"/>
             <field name="sign">1.0</field>
         </record>
-        <record id="iva_pymes_ded_22_4" model="account.tax.code.template">
-            <field name="name">Base operaciones interiores corrientes (4%)</field>
+       <record id="iva_pymes_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_pymes_ded_22"/>
             <field name="sign">1.0</field>
         </record>
-        
+		<record id="iva_pymes_ded_22_16" model="account.tax.code.template">
+            <field name="name">Base operaciones interiores corrientes (16%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_pymes_ded_22"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_pymes_ded_22_18" model="account.tax.code.template">
+            <field name="name">Base operaciones interiores corrientes (18%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_pymes_ded_22"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_pymes_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_pymes_ded_22"/>
+            <field name="sign">1.0</field>
+        </record>
+
         <!-- Base en OPERACIONES INTERIORES CON BIENES DE INVERSIÓN-->
         <record id="iva_pymes_ded_24" model="account.tax.code.template">
             <field name="name">Base operaciones interiores bienes inversión</field>
@@ -277,48 +394,79 @@
             <field name="parent_id" ref="iva_pymes_ded_base_total"/>
             <field name="sign">1.0</field>
         </record>
-        <record id="iva_pymes_ded_24_16" model="account.tax.code.template">
-            <field name="name">Base operaciones interiores bienes inversión (16%)</field>
-            <field name="code">--</field>
-            <field name="parent_id" ref="iva_pymes_ded_24"/>
-            <field name="sign">1.0</field>
-        </record>
-
-        <record id="iva_pymes_ded_24_18" model="account.tax.code.template">
-            <field name="name">Base operaciones interiores bienes inversión (18%)</field>
-            <field name="code">--</field>
-            <field name="parent_id" ref="iva_pymes_ded_24"/>
-            <field name="sign">1.0</field>
-        </record>
-        
-        <record id="iva_pymes_ded_24_7" model="account.tax.code.template">
-            <field name="name">Base operaciones interiores bienes inversión (7%)</field>
-            <field name="code">--</field>
-            <field name="parent_id" ref="iva_pymes_ded_24"/>
-            <field name="sign">1.0</field>
-        </record>
-
-        <record id="iva_pymes_ded_24_8" model="account.tax.code.template">
-            <field name="name">Base operaciones interiores bienes inversión (8%)</field>
-            <field name="code">--</field>
-            <field name="parent_id" ref="iva_pymes_ded_24"/>
-            <field name="sign">1.0</field>
-        </record>
-        
         <record id="iva_pymes_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_pymes_ded_24"/>
             <field name="sign">1.0</field>
         </record>
-        
-        
+        <record id="iva_pymes_ded_24_7" model="account.tax.code.template">
+            <field name="name">Base operaciones interiores bienes inversión (7%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_pymes_ded_24"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_pymes_ded_24_8" model="account.tax.code.template">
+            <field name="name">Base operaciones interiores bienes inversión (8%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_pymes_ded_24"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_pymes_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_pymes_ded_24"/>
+            <field name="sign">1.0</field>
+        </record>
+		<record id="iva_pymes_ded_24_16" model="account.tax.code.template">
+            <field name="name">Base operaciones interiores bienes inversión (16%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_pymes_ded_24"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_pymes_ded_24_18" model="account.tax.code.template">
+            <field name="name">Base operaciones interiores bienes inversión (18%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_pymes_ded_24"/>
+            <field name="sign">1.0</field>
+        </record>
+         <record id="iva_pymes_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_pymes_ded_24"/>
+            <field name="sign">1.0</field>
+        </record>
+
         <!-- Base EN LAS IMPORTACIONES DE BIENES CORRIENTES-->
         <record id="iva_pymes_ded_26" model="account.tax.code.template">
             <field name="name">Base importaciones bienes corrientes</field>
             <field name="code">[26]</field>
             <field name="parent_id" ref="iva_pymes_ded_base_total"/>
             <field name="sign">1.0</field>
+        </record>
+         <record id="iva_pymes_ded_26_4" model="account.tax.code.template">
+            <field name="name">Base importaciones bienes corrientes (4%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_pymes_ded_26"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_pymes_ded_26_7" model="account.tax.code.template">
+            <field name="name">Base importaciones bienes corrientes (7%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_pymes_ded_26"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_pymes_ded_26_8" model="account.tax.code.template">
+            <field name="name">Base importaciones bienes corrientes (8%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_pymes_ded_26"/>
+            <field name="sign">1.0</field>
+        </record>
+       <record id="iva_pymes_ded_26_10" model="account.tax.code.template">
+            <field name="name">Base importaciones bienes corrientes (10%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_pymes_ded_26"/>
+            <field name="sign">1.0</field>
         </record>
         <record id="iva_pymes_ded_26_16" model="account.tax.code.template">
             <field name="name">Base importaciones bienes corrientes (16%)</field>
@@ -332,26 +480,13 @@
             <field name="parent_id" ref="iva_pymes_ded_26"/>
             <field name="sign">1.0</field>
         </record>
-        
-        <record id="iva_pymes_ded_26_7" model="account.tax.code.template">
-            <field name="name">Base importaciones bienes corrientes (7%)</field>
+        <record id="iva_pymes_ded_26_21" model="account.tax.code.template">
+            <field name="name">Base importaciones bienes corrientes (21%)</field>
             <field name="code">--</field>
             <field name="parent_id" ref="iva_pymes_ded_26"/>
             <field name="sign">1.0</field>
         </record>
-        <record id="iva_pymes_ded_26_8" model="account.tax.code.template">
-            <field name="name">Base importaciones bienes corrientes (8%)</field>
-            <field name="code">--</field>
-            <field name="parent_id" ref="iva_pymes_ded_26"/>
-            <field name="sign">1.0</field>
-        </record>
-        <record id="iva_pymes_ded_26_4" model="account.tax.code.template">
-            <field name="name">Base importaciones bienes corrientes (4%)</field>
-            <field name="code">--</field>
-            <field name="parent_id" ref="iva_pymes_ded_26"/>
-            <field name="sign">1.0</field>
-        </record>
-        
+
         <!-- Base EN LAS IMPORTACIONES DE BIENES DE INVERSIÓN-->
         <record id="iva_pymes_ded_28" model="account.tax.code.template">
             <field name="name">Base importaciones bienes inversión</field>
@@ -359,19 +494,12 @@
             <field name="parent_id" ref="iva_pymes_ded_base_total"/>
             <field name="sign">1.0</field>
         </record>
-        <record id="iva_pymes_ded_28_16" model="account.tax.code.template">
-            <field name="name">Base importaciones bienes inversión (16%)</field>
+        <record id="iva_pymes_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_pymes_ded_28"/>
             <field name="sign">1.0</field>
         </record>
-        <record id="iva_pymes_ded_28_18" model="account.tax.code.template">
-            <field name="name">Base importaciones bienes inversión (18%)</field>
-            <field name="code">--</field>
-            <field name="parent_id" ref="iva_pymes_ded_28"/>
-            <field name="sign">1.0</field>
-        </record>
-        
         <record id="iva_pymes_ded_28_7" model="account.tax.code.template">
             <field name="name">Base importaciones bienes inversión (7%)</field>
             <field name="code">--</field>
@@ -384,13 +512,30 @@
             <field name="parent_id" ref="iva_pymes_ded_28"/>
             <field name="sign">1.0</field>
         </record>
-        <record id="iva_pymes_ded_28_4" model="account.tax.code.template">
-            <field name="name">Base importaciones bienes inversión (4%)</field>
+        <record id="iva_pymes_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_pymes_ded_28"/>
+            <field name="sign">1.0</field>
+        </record>
+		<record id="iva_pymes_ded_28_16" model="account.tax.code.template">
+            <field name="name">Base importaciones bienes inversión (16%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_pymes_ded_28"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_pymes_ded_28_18" model="account.tax.code.template">
+            <field name="name">Base importaciones bienes inversión (18%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_pymes_ded_28"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_pymes_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_pymes_ded_28"/>
             <field name="sign">1.0</field>
         </record>
-        
         <!-- ADQUISICIONES INTRACOMUNITARIAS DE BIENES CORRIENTES-->
         <record id="iva_pymes_ded_30" model="account.tax.code.template">
             <field name="name">Base adquisiciones intracomunitarias bienes corrientes</field>
@@ -398,19 +543,12 @@
             <field name="parent_id" ref="iva_pymes_ded_base_total"/>
             <field name="sign">1.0</field>
         </record>
-        <record id="iva_pymes_ded_30_16" model="account.tax.code.template">
-            <field name="name">Base adquisiciones intracomunitarias bienes corrientes (16%)</field>
+         <record id="iva_pymes_ded_30_4" model="account.tax.code.template">
+            <field name="name">Base adquisiciones intracomunitarias bienes corrientes (4%)</field>
             <field name="code">--</field>
             <field name="parent_id" ref="iva_pymes_ded_30"/>
             <field name="sign">1.0</field>
         </record>
-        <record id="iva_pymes_ded_30_18" model="account.tax.code.template">
-            <field name="name">Base adquisiciones intracomunitarias bienes corrientes (18%)</field>
-            <field name="code">--</field>
-            <field name="parent_id" ref="iva_pymes_ded_30"/>
-            <field name="sign">1.0</field>
-        </record>
-        
         <record id="iva_pymes_ded_30_7" model="account.tax.code.template">
             <field name="name">Base adquisiciones intracomunitarias bienes corrientes (7%)</field>
             <field name="code">--</field>
@@ -423,13 +561,30 @@
             <field name="parent_id" ref="iva_pymes_ded_30"/>
             <field name="sign">1.0</field>
         </record>
-        <record id="iva_pymes_ded_30_4" model="account.tax.code.template">
-            <field name="name">Base adquisiciones intracomunitarias bienes corrientes (4%)</field>
+        <record id="iva_pymes_ded_30_10" model="account.tax.code.template">
+            <field name="name">Base adquisiciones intracomunitarias bienes corrientes (10%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_pymes_ded_30"/>
+            <field name="sign">1.0</field>
+        </record>
+		<record id="iva_pymes_ded_30_16" model="account.tax.code.template">
+            <field name="name">Base adquisiciones intracomunitarias bienes corrientes (16%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_pymes_ded_30"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_pymes_ded_30_18" model="account.tax.code.template">
+            <field name="name">Base adquisiciones intracomunitarias bienes corrientes (18%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_pymes_ded_30"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_pymes_ded_30_21" model="account.tax.code.template">
+            <field name="name">Base adquisiciones intracomunitarias bienes corrientes (21%)</field>
             <field name="code">--</field>
             <field name="parent_id" ref="iva_pymes_ded_30"/>
             <field name="sign">1.0</field>
         </record>
-        
         <!-- ADQUISICIONES INTRACOMUNITARIAS DE BIENES DE INVERSIÓN-->
         <record id="iva_pymes_ded_32" model="account.tax.code.template">
             <field name="name">Base adquisiciones intracomunitarias bienes inversión</field>
@@ -437,6 +592,30 @@
             <field name="parent_id" ref="iva_pymes_ded_base_total"/>
             <field name="sign">1.0</field>
         </record>
+        <record id="iva_pymes_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_pymes_ded_32"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_pymes_ded_32_7" model="account.tax.code.template">
+            <field name="name">Base adquisiciones intracomunitarias bienes inversión (7%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_pymes_ded_32"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_pymes_ded_32_8" model="account.tax.code.template">
+            <field name="name">Base adquisiciones intracomunitarias bienes inversión (8%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_pymes_ded_32"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_pymes_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_pymes_ded_32"/>
+            <field name="sign">1.0</field>
+        </record>
         <record id="iva_pymes_ded_32_16" model="account.tax.code.template">
             <field name="name">Base adquisiciones intracomunitarias bienes inversión (16%)</field>
             <field name="code">--</field>
@@ -449,31 +628,53 @@
             <field name="parent_id" ref="iva_pymes_ded_32"/>
             <field name="sign">1.0</field>
         </record>
-        
-        <record id="iva_pymes_ded_32_7" model="account.tax.code.template">
-            <field name="name">Base adquisiciones intracomunitarias bienes inversión (7%)</field>
-            <field name="code">--</field>
-            <field name="parent_id" ref="iva_pymes_ded_32"/>
-            <field name="sign">1.0</field>
-        </record>
-        <record id="iva_pymes_ded_32_8" model="account.tax.code.template">
-            <field name="name">Base adquisiciones intracomunitarias bienes inversión (8%)</field>
-            <field name="code">--</field>
-            <field name="parent_id" ref="iva_pymes_ded_32"/>
-            <field name="sign">1.0</field>
-        </record>
-        <record id="iva_pymes_ded_32_4" model="account.tax.code.template">
-            <field name="name">Base adquisiciones intracomunitarias bienes inversión (4%)</field>
+        <record id="iva_pymes_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_pymes_ded_32"/>
             <field name="sign">1.0</field>
         </record>
 
-        
-        
+        <!-- BASE RECARGO DE EQUIVALENCIA-->
+        <record id="iva_pymes_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_pymes_ded_base_total"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="iva_pymes_ded_13" model="account.tax.code.template">
+            <field name="name">Recargo Equivalencia Ded. Base Imponible 1%</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_pymes_ded_base_total"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="iva_pymes_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_pymes_ded_base_total"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="iva_pymes_ded_16" model="account.tax.code.template">
+            <field name="name">Recargo Equivalencia Ded. Base Imponible 4%</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_pymes_ded_base_total"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="iva_pymes_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_pymes_ded_base_total"/>
+            <field name="sign">1.0</field>
+        </record>
+
+
     <!-- IVA DEDUCIBLE Cuotas-->
     <!-- *********************************************** -->
-    
+
         <record id="iva_pymes_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>
@@ -488,19 +689,12 @@
             <field name="parent_id" ref="iva_pymes_ded_cuota_total"/>
             <field name="sign">1.0</field>
         </record>
-        <record id="iva_pymes_ded_23_16" model="account.tax.code.template">
-            <field name="name">Cuotas soportadas operaciones interiores corrientes (16%)</field>
+        <record id="iva_pymes_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_pymes_ded_23"/>
             <field name="sign">1.0</field>
         </record>
-        <record id="iva_pymes_ded_23_18" model="account.tax.code.template">
-            <field name="name">Cuotas soportadas operaciones interiores corrientes (18%)</field>
-            <field name="code">--</field>
-            <field name="parent_id" ref="iva_pymes_ded_23"/>
-            <field name="sign">1.0</field>
-        </record>
-        
         <record id="iva_pymes_ded_23_7" model="account.tax.code.template">
             <field name="name">Cuotas soportadas operaciones interiores corrientes (7%)</field>
             <field name="code">--</field>
@@ -513,13 +707,30 @@
             <field name="parent_id" ref="iva_pymes_ded_23"/>
             <field name="sign">1.0</field>
         </record>
-        <record id="iva_pymes_ded_23_4" model="account.tax.code.template">
-            <field name="name">Cuotas soportadas operaciones interiores corrientes (4%)</field>
+        <record id="iva_pymes_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_pymes_ded_23"/>
+            <field name="sign">1.0</field>
+        </record>
+		<record id="iva_pymes_ded_23_16" model="account.tax.code.template">
+            <field name="name">Cuotas soportadas operaciones interiores corrientes (16%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_pymes_ded_23"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_pymes_ded_23_18" model="account.tax.code.template">
+            <field name="name">Cuotas soportadas operaciones interiores corrientes (18%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_pymes_ded_23"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_pymes_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_pymes_ded_23"/>
             <field name="sign">1.0</field>
         </record>
-        
         <!-- Cuotas en OPERACIONES INTERIORES CON BIENES DE INVERSIÓN-->
         <record id="iva_pymes_ded_25" model="account.tax.code.template">
             <field name="name">Cuotas soportadas operaciones interiores bienes inversión</field>
@@ -527,19 +738,12 @@
             <field name="parent_id" ref="iva_pymes_ded_cuota_total"/>
             <field name="sign">1.0</field>
         </record>
-        <record id="iva_pymes_ded_25_16" model="account.tax.code.template">
-            <field name="name">Cuotas soportadas operaciones interiores bienes inversión (16%)</field>
+        <record id="iva_pymes_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_pymes_ded_25"/>
             <field name="sign">1.0</field>
         </record>
-        <record id="iva_pymes_ded_25_18" model="account.tax.code.template">
-            <field name="name">Cuotas soportadas operaciones interiores bienes inversión (18%)</field>
-            <field name="code">--</field>
-            <field name="parent_id" ref="iva_pymes_ded_25"/>
-            <field name="sign">1.0</field>
-        </record>
-        
         <record id="iva_pymes_ded_25_7" model="account.tax.code.template">
             <field name="name">Cuotas soportadas operaciones interiores bienes inversión (7%)</field>
             <field name="code">--</field>
@@ -552,13 +756,30 @@
             <field name="parent_id" ref="iva_pymes_ded_25"/>
             <field name="sign">1.0</field>
         </record>
-        <record id="iva_pymes_ded_25_4" model="account.tax.code.template">
-            <field name="name">Cuotas soportadas operaciones interiores bienes inversión (4%)</field>
+        <record id="iva_pymes_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_pymes_ded_25"/>
+            <field name="sign">1.0</field>
+        </record>
+		<record id="iva_pymes_ded_25_16" model="account.tax.code.template">
+            <field name="name">Cuotas soportadas operaciones interiores bienes inversión (16%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_pymes_ded_25"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_pymes_ded_25_18" model="account.tax.code.template">
+            <field name="name">Cuotas soportadas operaciones interiores bienes inversión (18%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_pymes_ded_25"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_pymes_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_pymes_ded_25"/>
             <field name="sign">1.0</field>
         </record>
-        
         <!-- Cuotas devengadas EN LAS IMPORTACIONES DE BIENES CORRIENTES-->
         <record id="iva_pymes_ded_27" model="account.tax.code.template">
             <field name="name">Cuotas devengadas importaciones bienes corrientes</field>
@@ -566,19 +787,12 @@
             <field name="parent_id" ref="iva_pymes_ded_cuota_total"/>
             <field name="sign">1.0</field>
         </record>
-        <record id="iva_pymes_ded_27_16" model="account.tax.code.template">
-            <field name="name">Cuotas devengadas importaciones bienes corrientes (16%)</field>
+        <record id="iva_pymes_ded_27_4" model="account.tax.code.template">
+            <field name="name">Cuotas devengadas importaciones bienes corrientes (4%)</field>
             <field name="code">--</field>
             <field name="parent_id" ref="iva_pymes_ded_27"/>
             <field name="sign">1.0</field>
         </record>
-        <record id="iva_pymes_ded_27_18" model="account.tax.code.template">
-            <field name="name">Cuotas devengadas importaciones bienes corrientes (18%)</field>
-            <field name="code">--</field>
-            <field name="parent_id" ref="iva_pymes_ded_27"/>
-            <field name="sign">1.0</field>
-        </record>
-        
         <record id="iva_pymes_ded_27_7" model="account.tax.code.template">
             <field name="name">Cuotas devengadas importaciones bienes corrientes (7%)</field>
             <field name="code">--</field>
@@ -591,13 +805,30 @@
             <field name="parent_id" ref="iva_pymes_ded_27"/>
             <field name="sign">1.0</field>
         </record>
-        <record id="iva_pymes_ded_27_4" model="account.tax.code.template">
-            <field name="name">Cuotas devengadas importaciones bienes corrientes (4%)</field>
+        <record id="iva_pymes_ded_27_10" model="account.tax.code.template">
+            <field name="name">Cuotas devengadas importaciones bienes corrientes (10%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_pymes_ded_27"/>
+            <field name="sign">1.0</field>
+        </record>
+		<record id="iva_pymes_ded_27_16" model="account.tax.code.template">
+            <field name="name">Cuotas devengadas importaciones bienes corrientes (16%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_pymes_ded_27"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_pymes_ded_27_18" model="account.tax.code.template">
+            <field name="name">Cuotas devengadas importaciones bienes corrientes (18%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_pymes_ded_27"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_pymes_ded_27_21" model="account.tax.code.template">
+            <field name="name">Cuotas devengadas importaciones bienes corrientes (21%)</field>
             <field name="code">--</field>
             <field name="parent_id" ref="iva_pymes_ded_27"/>
             <field name="sign">1.0</field>
         </record>
-        
         <!-- Cuotas devengadas EN LAS IMPORTACIONES DE BIENES DE INVERSIÓN-->
         <record id="iva_pymes_ded_29" model="account.tax.code.template">
             <field name="name">Cuotas devengadas importaciones bienes inversión</field>
@@ -605,19 +836,12 @@
             <field name="parent_id" ref="iva_pymes_ded_cuota_total"/>
             <field name="sign">1.0</field>
         </record>
-        <record id="iva_pymes_ded_29_16" model="account.tax.code.template">
-            <field name="name">Cuotas devengadas importaciones bienes inversión (16%)</field>
+        <record id="iva_pymes_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_pymes_ded_29"/>
             <field name="sign">1.0</field>
         </record>
-        <record id="iva_pymes_ded_29_18" model="account.tax.code.template">
-            <field name="name">Cuotas devengadas importaciones bienes inversión (18%)</field>
-            <field name="code">--</field>
-            <field name="parent_id" ref="iva_pymes_ded_29"/>
-            <field name="sign">1.0</field>
-        </record>
-        
         <record id="iva_pymes_ded_29_7" model="account.tax.code.template">
             <field name="name">Cuotas devengadas importaciones bienes inversión (7%)</field>
             <field name="code">--</field>
@@ -630,13 +854,30 @@
             <field name="parent_id" ref="iva_pymes_ded_29"/>
             <field name="sign">1.0</field>
         </record>
-        <record id="iva_pymes_ded_29_4" model="account.tax.code.template">
-            <field name="name">Cuotas devengadas importaciones bienes inversión (4%)</field>
+        <record id="iva_pymes_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_pymes_ded_29"/>
+            <field name="sign">1.0</field>
+        </record>
+		<record id="iva_pymes_ded_29_16" model="account.tax.code.template">
+            <field name="name">Cuotas devengadas importaciones bienes inversión (16%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_pymes_ded_29"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_pymes_ded_29_18" model="account.tax.code.template">
+            <field name="name">Cuotas devengadas importaciones bienes inversión (18%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_pymes_ded_29"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_pymes_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_pymes_ded_29"/>
             <field name="sign">1.0</field>
         </record>
-        
         <!-- ADQUISICIONES INTRACOMUNITARIAS DE BIENES CORRIENTES-->
         <record id="iva_pymes_ded_31" model="account.tax.code.template">
             <field name="name">En adquisiciones intracomunitarias bienes corrientes</field>
@@ -644,19 +885,12 @@
             <field name="parent_id" ref="iva_pymes_ded_cuota_total"/>
             <field name="sign">1.0</field>
         </record>
-        <record id="iva_pymes_ded_31_16" model="account.tax.code.template">
-            <field name="name">En adquisiciones intracomunitarias bienes corrientes (16%)</field>
+        <record id="iva_pymes_ded_31_4" model="account.tax.code.template">
+            <field name="name">En adquisiciones intracomunitarias bienes corrientes (4%)</field>
             <field name="code">--</field>
             <field name="parent_id" ref="iva_pymes_ded_31"/>
             <field name="sign">1.0</field>
         </record>
-        <record id="iva_pymes_ded_31_18" model="account.tax.code.template">
-            <field name="name">En adquisiciones intracomunitarias bienes corrientes (18%)</field>
-            <field name="code">--</field>
-            <field name="parent_id" ref="iva_pymes_ded_31"/>
-            <field name="sign">1.0</field>
-        </record>
-        
         <record id="iva_pymes_ded_31_7" model="account.tax.code.template">
             <field name="name">En adquisiciones intracomunitarias bienes corrientes (7%)</field>
             <field name="code">--</field>
@@ -669,13 +903,30 @@
             <field name="parent_id" ref="iva_pymes_ded_31"/>
             <field name="sign">1.0</field>
         </record>
-        <record id="iva_pymes_ded_31_4" model="account.tax.code.template">
-            <field name="name">En adquisiciones intracomunitarias bienes corrientes (4%)</field>
+        <record id="iva_pymes_ded_31_10" model="account.tax.code.template">
+            <field name="name">En adquisiciones intracomunitarias bienes corrientes (10%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_pymes_ded_31"/>
+            <field name="sign">1.0</field>
+        </record>
+		<record id="iva_pymes_ded_31_16" model="account.tax.code.template">
+            <field name="name">En adquisiciones intracomunitarias bienes corrientes (16%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_pymes_ded_31"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_pymes_ded_31_18" model="account.tax.code.template">
+            <field name="name">En adquisiciones intracomunitarias bienes corrientes (18%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_pymes_ded_31"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_pymes_ded_31_21" model="account.tax.code.template">
+            <field name="name">En adquisiciones intracomunitarias bienes corrientes (21%)</field>
             <field name="code">--</field>
             <field name="parent_id" ref="iva_pymes_ded_31"/>
             <field name="sign">1.0</field>
         </record>
-        
         <!-- ADQUISICIONES INTRACOMUNITARIAS DE BIENES DE INVERSIÓN-->
         <record id="iva_pymes_ded_33" model="account.tax.code.template">
             <field name="name">En adquisiciones intracomunitarias bienes inversión</field>
@@ -683,19 +934,12 @@
             <field name="parent_id" ref="iva_pymes_ded_cuota_total"/>
             <field name="sign">1.0</field>
         </record>
-        <record id="iva_pymes_ded_33_16" model="account.tax.code.template">
-            <field name="name">En adquisiciones intracomunitarias bienes inversión (16%)</field>
+        <record id="iva_pymes_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_pymes_ded_33"/>
             <field name="sign">1.0</field>
         </record>
-        <record id="iva_pymes_ded_33_18" model="account.tax.code.template">
-            <field name="name">En adquisiciones intracomunitarias bienes inversión (18%)</field>
-            <field name="code">--</field>
-            <field name="parent_id" ref="iva_pymes_ded_33"/>
-            <field name="sign">1.0</field>
-        </record>
-        
         <record id="iva_pymes_ded_33_7" model="account.tax.code.template">
             <field name="name">En adquisiciones intracomunitarias bienes inversión (7%)</field>
             <field name="code">--</field>
@@ -708,13 +952,30 @@
             <field name="parent_id" ref="iva_pymes_ded_33"/>
             <field name="sign">1.0</field>
         </record>
-        <record id="iva_pymes_ded_33_4" model="account.tax.code.template">
-            <field name="name">En adquisiciones intracomunitarias bienes inversión (4%)</field>
+        <record id="iva_pymes_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_pymes_ded_33"/>
+            <field name="sign">1.0</field>
+        </record>
+		<record id="iva_pymes_ded_33_16" model="account.tax.code.template">
+            <field name="name">En adquisiciones intracomunitarias bienes inversión (16%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_pymes_ded_33"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_pymes_ded_33_18" model="account.tax.code.template">
+            <field name="name">En adquisiciones intracomunitarias bienes inversión (18%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_pymes_ded_33"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_pymes_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_pymes_ded_33"/>
             <field name="sign">1.0</field>
         </record>
-
         <!--Otros Códigos de Impuestos-->
         <record id="base_pymes_intra_42" model="account.tax.code.template">
             <field name="name">Entregas Intracomunitarias</field>
@@ -737,109 +998,42 @@
             <field name="sign">1.0</field>
         </record>
 
-<!-- ********************************* -->
-<!--Cuentas para IVA-->
-<!-- ********************************* -->
+        <!--Cuota Recargo de Equivalencia-->
+        <record id="iva_pymes_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_pymes_ded_cuota_total"/>
+            <field name="sign">1.0</field>
+        </record>
 
-        <record id="pgc_pymes_472004" model="account.account.template">
-            <field name="code">472004</field>
-            <field name="reconcile" eval="True"/>
-            <field name="parent_id" ref="pgc_pymes_472"/>
-            <field name="type">other</field>
-            <field name="name">Hacienda Pública. IVA soportado 4%</field>
-            <field name="user_type" ref="tax"/>
+        <record id="iva_pymes_ded_15" model="account.tax.code.template">
+            <field name="name">Recargo Equivalencia Ded. Cuota 1%</field>
+            <field name="code">[15]</field>
+            <field name="parent_id" ref="iva_pymes_ded_cuota_total"/>
+            <field name="sign">1.0</field>
         </record>
-        
-        <record id="pgc_pymes_472007" model="account.account.template">
-            <field name="code">472007</field>
-            <field name="reconcile" eval="True"/>
-            <field name="parent_id" ref="pgc_pymes_472"/>
-            <field name="type">other</field>
-            <field name="name">Hacienda Pública. IVA soportado 7%</field>
-            <field name="user_type" ref="tax"/>
+
+        <record id="iva_pymes_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_pymes_ded_cuota_total"/>
+            <field name="sign">1.0</field>
         </record>
-        
-        <record id="pgc_pymes_472008" model="account.account.template">
-            <field name="code">472008</field>
-            <field name="reconcile" eval="True"/>
-            <field name="parent_id" ref="pgc_pymes_472"/>
-            <field name="type">other</field>
-            <field name="name">Hacienda Pública. IVA soportado 8%</field>
-            <field name="user_type" ref="tax"/>
+
+        <record id="iva_pymes_ded_18" model="account.tax.code.template">
+            <field name="name">Recargo Equivalencia Ded. Cuota 4%</field>
+            <field name="code">[18]</field>
+            <field name="parent_id" ref="iva_pymes_ded_cuota_total"/>
+            <field name="sign">1.0</field>
         </record>
-        
-        <record id="pgc_pymes_472016" model="account.account.template">
-            <field name="code">472016</field>
-            <field name="reconcile" eval="True"/>
-            <field name="parent_id" ref="pgc_pymes_472"/>
-            <field name="type">other</field>
-            <field name="name">Hacienda Pública. IVA soportado 16%</field>
-            <field name="user_type" ref="tax"/>
+
+        <record id="iva_pymes_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_pymes_ded_cuota_total"/>
+            <field name="sign">1.0</field>
         </record>
-        
-        <record id="pgc_pymes_472018" model="account.account.template">
-            <field name="code">472018</field>
-            <field name="reconcile" eval="True"/>
-            <field name="parent_id" ref="pgc_pymes_472"/>
-            <field name="type">other</field>
-            <field name="name">Hacienda Pública. IVA soportado 18%</field>
-            <field name="user_type" ref="tax"/>
-        </record>
-        
-        <record id="pgc_pymes_477004" model="account.account.template">
-            <field name="code">477004</field>
-            <field name="reconcile" eval="True"/>
-            <field name="parent_id" ref="pgc_pymes_477"/>
-            <field name="type">other</field>
-            <field name="name">Hacienda Pública. IVA repercutido 4%</field>
-            <field name="user_type" ref="tax"/>
-        </record>
-        
-        <record id="pgc_pymes_477007" model="account.account.template">
-            <field name="code">477007</field>
-            <field name="reconcile" eval="True"/>
-            <field name="parent_id" ref="pgc_pymes_477"/>
-            <field name="type">other</field>
-            <field name="name">Hacienda Pública. IVA repercutido 7%</field>
-            <field name="user_type" ref="tax"/>
-        </record>
-        <record id="pgc_pymes_477008" model="account.account.template">
-            <field name="code">477008</field>
-            <field name="reconcile" eval="True"/>
-            <field name="parent_id" ref="pgc_pymes_477"/>
-            <field name="type">other</field>
-            <field name="name">Hacienda Pública. IVA repercutido 8%</field>
-            <field name="user_type" ref="tax"/>
-        </record>
-        
-        <record id="pgc_pymes_477016" model="account.account.template">
-            <field name="code">477016</field>
-            <field name="reconcile" eval="True"/>
-            <field name="parent_id" ref="pgc_pymes_477"/>
-            <field name="type">other</field>
-            <field name="name">Hacienda Pública. IVA repercutido 16%</field>
-            <field name="user_type" ref="tax"/>
-        </record>
-        
-        <record id="pgc_pymes_477018" model="account.account.template">
-            <field name="code">477018</field>
-            <field name="reconcile" eval="True"/>
-            <field name="parent_id" ref="pgc_pymes_477"/>
-            <field name="type">other</field>
-            <field name="name">Hacienda Pública. IVA repercutido 18%</field>
-            <field name="user_type" ref="tax"/>
-        </record>
-        
-        <record id="pgc_pymes_475001" model="account.account.template">
-            <field name="code">475001</field>
-            <field name="reconcile" eval="True"/>
-            <field name="parent_id" ref="pgc_pymes_4750"/>
-            <field name="type">payable</field>
-            <field name="name">Hacienda acreedora IVA</field>
-            <field name="user_type" ref="tax"/>
-        </record>
-        
-        
+
 <!-- ********************************* -->
 <!-- Plantillas de Impuestos IVA       -->
 <!-- ********************************* -->
@@ -851,8 +1045,8 @@
             <field name="name">4% IVA Soportado (operaciones corrientes)</field>
             <field eval="0.04" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_pymes_472004"/>
-            <field name="account_paid_id" ref="pgc_pymes_472004"/>
+            <field name="account_collected_id" ref="pgc_pymes_472000"/>
+            <field name="account_paid_id" ref="pgc_pymes_472000"/>
             <field name="base_code_id" ref="iva_pymes_ded_22_4"/>
             <field name="tax_code_id" ref="iva_pymes_ded_23_4"/>
             <field name="ref_base_code_id" ref="iva_pymes_ded_22_4"/>
@@ -863,14 +1057,14 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
         </record>
-        
+
         <record id="iva_pymes_sop_4_inv" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
             <field name="name">4% IVA Soportado (bienes de inversión)</field>
             <field eval="0.04" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_pymes_472004"/>
-            <field name="account_paid_id" ref="pgc_pymes_472004"/>
+            <field name="account_collected_id" ref="pgc_pymes_472000"/>
+            <field name="account_paid_id" ref="pgc_pymes_472000"/>
             <field name="base_code_id" ref="iva_pymes_ded_24_4"/>
             <field name="tax_code_id" ref="iva_pymes_ded_25_4"/>
             <field name="ref_base_code_id" ref="iva_pymes_ded_24_4"/>
@@ -881,14 +1075,14 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
         </record>
-        
+
         <record id="iva_pymes_sop_7" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
             <field name="name">7% IVA Soportado (operaciones corrientes)</field>
             <field eval="0.07" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_pymes_472007"/>
-            <field name="account_paid_id" ref="pgc_pymes_472007"/>
+            <field name="account_collected_id" ref="pgc_pymes_472000"/>
+            <field name="account_paid_id" ref="pgc_pymes_472000"/>
             <field name="base_code_id" ref="iva_pymes_ded_22_7"/>
             <field name="tax_code_id" ref="iva_pymes_ded_23_7"/>
             <field name="ref_base_code_id" ref="iva_pymes_ded_22_7"/>
@@ -899,14 +1093,14 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
         </record>
-        
+
         <record id="iva_pymes_sop_7_inv" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
             <field name="name">7% IVA Soportado (bienes de inversión)</field>
             <field eval="0.07" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_pymes_472007"/>
-            <field name="account_paid_id" ref="pgc_pymes_472007"/>
+            <field name="account_collected_id" ref="pgc_pymes_472000"/>
+            <field name="account_paid_id" ref="pgc_pymes_472000"/>
             <field name="base_code_id" ref="iva_pymes_ded_24_7"/>
             <field name="tax_code_id" ref="iva_pymes_ded_25_7"/>
             <field name="ref_base_code_id" ref="iva_pymes_ded_24_7"/>
@@ -917,14 +1111,14 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
         </record>
-        
+
         <record id="iva_pymes_sop_8" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
             <field name="name">8% IVA Soportado (operaciones corrientes)</field>
             <field eval="0.08" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_pymes_472008"/>
-            <field name="account_paid_id" ref="pgc_pymes_472008"/>
+            <field name="account_collected_id" ref="pgc_pymes_472000"/>
+            <field name="account_paid_id" ref="pgc_pymes_472000"/>
             <field name="base_code_id" ref="iva_pymes_ded_22_8"/>
             <field name="tax_code_id" ref="iva_pymes_ded_23_8"/>
             <field name="ref_base_code_id" ref="iva_pymes_ded_22_8"/>
@@ -935,14 +1129,14 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
         </record>
-        
+
         <record id="iva_pymes_sop_8_inv" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
             <field name="name">8% IVA Soportado (bienes de inversión)</field>
             <field eval="0.08" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_pymes_472008"/>
-            <field name="account_paid_id" ref="pgc_pymes_472008"/>
+            <field name="account_collected_id" ref="pgc_pymes_472000"/>
+            <field name="account_paid_id" ref="pgc_pymes_472000"/>
             <field name="base_code_id" ref="iva_pymes_ded_24_8"/>
             <field name="tax_code_id" ref="iva_pymes_ded_25_8"/>
             <field name="ref_base_code_id" ref="iva_pymes_ded_24_8"/>
@@ -953,14 +1147,50 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
         </record>
-        
+
+		<record id="iva_pymes_sop_10" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+            <field name="name">10% IVA Soportado (operaciones corrientes)</field>
+            <field eval="0.10" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_pymes_472000"/>
+            <field name="account_paid_id" ref="pgc_pymes_472000"/>
+            <field name="base_code_id" ref="iva_pymes_ded_22_10"/>
+            <field name="tax_code_id" ref="iva_pymes_ded_23_10"/>
+            <field name="ref_base_code_id" ref="iva_pymes_ded_22_10"/>
+            <field name="ref_tax_code_id" ref="iva_pymes_ded_23_10"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="iva_pymes_sop_10_inv" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+            <field name="name">10% IVA Soportado (bienes de inversión)</field>
+            <field eval="0.10" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_pymes_472000"/>
+            <field name="account_paid_id" ref="pgc_pymes_472000"/>
+            <field name="base_code_id" ref="iva_pymes_ded_24_10"/>
+            <field name="tax_code_id" ref="iva_pymes_ded_25_10"/>
+            <field name="ref_base_code_id" ref="iva_pymes_ded_24_10"/>
+            <field name="ref_tax_code_id" ref="iva_pymes_ded_25_10"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
         <record id="iva_pymes_sop_16" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
             <field name="name">16% IVA Soportado (operaciones corrientes)</field>
             <field eval="0.16" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_pymes_472016"/>
-            <field name="account_paid_id" ref="pgc_pymes_472016"/>
+            <field name="account_collected_id" ref="pgc_pymes_472000"/>
+            <field name="account_paid_id" ref="pgc_pymes_472000"/>
             <field name="base_code_id" ref="iva_pymes_ded_22_16"/>
             <field name="tax_code_id" ref="iva_pymes_ded_23_16"/>
             <field name="ref_base_code_id" ref="iva_pymes_ded_22_16"/>
@@ -971,14 +1201,14 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
         </record>
-        
+
         <record id="iva_pymes_sop_16_inv" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
             <field name="name">16% IVA Soportado (bienes de inversión)</field>
             <field eval="0.16" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_pymes_472016"/>
-            <field name="account_paid_id" ref="pgc_pymes_472016"/>
+            <field name="account_collected_id" ref="pgc_pymes_472000"/>
+            <field name="account_paid_id" ref="pgc_pymes_472000"/>
             <field name="base_code_id" ref="iva_pymes_ded_24_16"/>
             <field name="tax_code_id" ref="iva_pymes_ded_25_16"/>
             <field name="ref_base_code_id" ref="iva_pymes_ded_24_16"/>
@@ -989,14 +1219,14 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
         </record>
-        
+
         <record id="iva_pymes_sop_18" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
             <field name="name">18% IVA Soportado (operaciones corrientes)</field>
             <field eval="0.18" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_pymes_472018"/>
-            <field name="account_paid_id" ref="pgc_pymes_472018"/>
+            <field name="account_collected_id" ref="pgc_pymes_472000"/>
+            <field name="account_paid_id" ref="pgc_pymes_472000"/>
             <field name="base_code_id" ref="iva_pymes_ded_22_18"/>
             <field name="tax_code_id" ref="iva_pymes_ded_23_18"/>
             <field name="ref_base_code_id" ref="iva_pymes_ded_22_18"/>
@@ -1006,15 +1236,16 @@
             <field eval="-1.0" name="ref_tax_sign"/>
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
+            <field eval="0" name="sequence"/>
         </record>
-        
+
         <record id="iva_pymes_sop_18_inv" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
             <field name="name">18% IVA Soportado (bienes de inversión)</field>
             <field eval="0.18" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_pymes_472018"/>
-            <field name="account_paid_id" ref="pgc_pymes_472018"/>
+            <field name="account_collected_id" ref="pgc_pymes_472000"/>
+            <field name="account_paid_id" ref="pgc_pymes_472000"/>
             <field name="base_code_id" ref="iva_pymes_ded_24_18"/>
             <field name="tax_code_id" ref="iva_pymes_ded_25_18"/>
             <field name="ref_base_code_id" ref="iva_pymes_ded_24_18"/>
@@ -1025,7 +1256,44 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
         </record>
-        
+
+ 		<record id="iva_pymes_sop_21" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+            <field name="name">21% IVA Soportado (operaciones corrientes)</field>
+            <field eval="0.21" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_pymes_472000"/>
+            <field name="account_paid_id" ref="pgc_pymes_472000"/>
+            <field name="base_code_id" ref="iva_pymes_ded_22_21"/>
+            <field name="tax_code_id" ref="iva_pymes_ded_23_21"/>
+            <field name="ref_base_code_id" ref="iva_pymes_ded_22_21"/>
+            <field name="ref_tax_code_id" ref="iva_pymes_ded_23_21"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+            <field eval="0" name="sequence"/>
+        </record>
+
+        <record id="iva_pymes_sop_21_inv" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+            <field name="name">21% IVA Soportado (bienes de inversión)</field>
+            <field eval="0.21" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_pymes_472000"/>
+            <field name="account_paid_id" ref="pgc_pymes_472000"/>
+            <field name="base_code_id" ref="iva_pymes_ded_24_21"/>
+            <field name="tax_code_id" ref="iva_pymes_ded_25_21"/>
+            <field name="ref_base_code_id" ref="iva_pymes_ded_24_21"/>
+            <field name="ref_tax_code_id" ref="iva_pymes_ded_25_21"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
         <!-- Plantillas para Extracomunitario-->
         <!-- IVA compras -->
         <record id="iva_pymes_X0_compras_bc" model="account.tax.template">
@@ -1056,15 +1324,15 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
         </record>
-        
+
         <record id="iva_pymes_X4_compras_bc" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
             <field name="name">IVA 4% Importaciones bienes corrientes</field>
             <field name="description">IVA 4% Importaciones bienes corrientes</field>
             <field eval="0.04" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_pymes_472004"/>
-            <field name="account_paid_id" ref="pgc_pymes_472004"/>
+            <field name="account_collected_id" ref="pgc_pymes_472000"/>
+            <field name="account_paid_id" ref="pgc_pymes_472000"/>
             <field name="base_code_id" ref="iva_pymes_ded_26_4"/>
             <field name="tax_code_id" ref="iva_pymes_ded_27_4"/>
             <field name="ref_base_code_id" ref="iva_pymes_ded_26_4"/>
@@ -1081,8 +1349,8 @@
             <field name="description">IVA 4% Importaciones bienes de inversión</field>
             <field eval="0.04" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_pymes_472004"/>
-            <field name="account_paid_id" ref="pgc_pymes_472004"/>
+            <field name="account_collected_id" ref="pgc_pymes_472000"/>
+            <field name="account_paid_id" ref="pgc_pymes_472000"/>
             <field name="base_code_id" ref="iva_pymes_ded_28_4"/>
             <field name="tax_code_id" ref="iva_pymes_ded_29_4"/>
             <field name="ref_base_code_id" ref="iva_pymes_ded_28_4"/>
@@ -1093,15 +1361,15 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
         </record>
-         
+
         <record id="iva_pymes_X7_compras_bc" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
             <field name="name">IVA 7% Importaciones bienes corrientes</field>
             <field name="description">IVA 7% Importaciones bienes corrientes</field>
             <field eval="0.07" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_pymes_472007"/>
-            <field name="account_paid_id" ref="pgc_pymes_472007"/>
+            <field name="account_collected_id" ref="pgc_pymes_472000"/>
+            <field name="account_paid_id" ref="pgc_pymes_472000"/>
             <field name="base_code_id" ref="iva_pymes_ded_26_7"/>
             <field name="tax_code_id" ref="iva_pymes_ded_27_7"/>
             <field name="ref_base_code_id" ref="iva_pymes_ded_26_7"/>
@@ -1118,8 +1386,8 @@
             <field name="description">IVA 7% Importaciones bienes de inversión</field>
             <field eval="0.07" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_pymes_472007"/>
-            <field name="account_paid_id" ref="pgc_pymes_472007"/>
+            <field name="account_collected_id" ref="pgc_pymes_472000"/>
+            <field name="account_paid_id" ref="pgc_pymes_472000"/>
             <field name="base_code_id" ref="iva_pymes_ded_28_7"/>
             <field name="tax_code_id" ref="iva_pymes_ded_29_7"/>
             <field name="ref_base_code_id" ref="iva_pymes_ded_28_7"/>
@@ -1130,15 +1398,15 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
         </record>
-        
+
         <record id="iva_pymes_X8_compras_bc" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
             <field name="name">IVA 8% Importaciones bienes corrientes</field>
             <field name="description">IVA 8% Importaciones bienes corrientes</field>
             <field eval="0.08" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_pymes_472008"/>
-            <field name="account_paid_id" ref="pgc_pymes_472008"/>
+            <field name="account_collected_id" ref="pgc_pymes_472000"/>
+            <field name="account_paid_id" ref="pgc_pymes_472000"/>
             <field name="base_code_id" ref="iva_pymes_ded_26_8"/>
             <field name="tax_code_id" ref="iva_pymes_ded_27_8"/>
             <field name="ref_base_code_id" ref="iva_pymes_ded_26_8"/>
@@ -1155,8 +1423,8 @@
             <field name="description">IVA 8% Importaciones bienes de inversión</field>
             <field eval="0.08" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_pymes_472008"/>
-            <field name="account_paid_id" ref="pgc_pymes_472008"/>
+            <field name="account_collected_id" ref="pgc_pymes_472000"/>
+            <field name="account_paid_id" ref="pgc_pymes_472000"/>
             <field name="base_code_id" ref="iva_pymes_ded_28_8"/>
             <field name="tax_code_id" ref="iva_pymes_ded_29_8"/>
             <field name="ref_base_code_id" ref="iva_pymes_ded_28_8"/>
@@ -1167,15 +1435,52 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
         </record>
-        
+
+        <record id="iva_pymes_X10_compras_bc" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+            <field name="name">IVA 10% Importaciones bienes corrientes</field>
+            <field name="description">IVA 10% Importaciones bienes corrientes</field>
+            <field eval="0.10" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_pymes_472000"/>
+            <field name="account_paid_id" ref="pgc_pymes_472000"/>
+            <field name="base_code_id" ref="iva_pymes_ded_26_10"/>
+            <field name="tax_code_id" ref="iva_pymes_ded_27_10"/>
+            <field name="ref_base_code_id" ref="iva_pymes_ded_26_10"/>
+            <field name="ref_tax_code_id" ref="iva_pymes_ded_27_10"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_pymes_X10_compras_bi" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+            <field name="name">IVA 10% Importaciones bienes de inversión</field>
+            <field name="description">IVA 10% Importaciones bienes de inversión</field>
+            <field eval="0.10" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_pymes_472000"/>
+            <field name="account_paid_id" ref="pgc_pymes_472000"/>
+            <field name="base_code_id" ref="iva_pymes_ded_28_10"/>
+            <field name="tax_code_id" ref="iva_pymes_ded_29_10"/>
+            <field name="ref_base_code_id" ref="iva_pymes_ded_28_10"/>
+            <field name="ref_tax_code_id" ref="iva_pymes_ded_29_10"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
         <record id="iva_pymes_X16_compras_bc" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
             <field name="name">IVA 16% Importaciones bienes corrientes</field>
             <field name="description">IVA 16% Importaciones bienes corrientes</field>
             <field eval="0.16" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_pymes_472016"/>
-            <field name="account_paid_id" ref="pgc_pymes_472016"/>
+            <field name="account_collected_id" ref="pgc_pymes_472000"/>
+            <field name="account_paid_id" ref="pgc_pymes_472000"/>
             <field name="base_code_id" ref="iva_pymes_ded_26_16"/>
             <field name="tax_code_id" ref="iva_pymes_ded_27_16"/>
             <field name="ref_base_code_id" ref="iva_pymes_ded_26_16"/>
@@ -1192,8 +1497,8 @@
             <field name="description">IVA 16% Importaciones bienes de inversión</field>
             <field eval="0.16" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_pymes_472016"/>
-            <field name="account_paid_id" ref="pgc_pymes_472016"/>
+            <field name="account_collected_id" ref="pgc_pymes_472000"/>
+            <field name="account_paid_id" ref="pgc_pymes_472000"/>
             <field name="base_code_id" ref="iva_pymes_ded_28_16"/>
             <field name="tax_code_id" ref="iva_pymes_ded_29_16"/>
             <field name="ref_base_code_id" ref="iva_pymes_ded_28_16"/>
@@ -1204,15 +1509,15 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
         </record>
-        
+
         <record id="iva_pymes_X18_compras_bc" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
             <field name="name">IVA 18% Importaciones bienes corrientes</field>
             <field name="description">IVA 18% Importaciones bienes corrientes</field>
             <field eval="0.18" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_pymes_472018"/>
-            <field name="account_paid_id" ref="pgc_pymes_472018"/>
+            <field name="account_collected_id" ref="pgc_pymes_472000"/>
+            <field name="account_paid_id" ref="pgc_pymes_472000"/>
             <field name="base_code_id" ref="iva_pymes_ded_26_18"/>
             <field name="tax_code_id" ref="iva_pymes_ded_27_18"/>
             <field name="ref_base_code_id" ref="iva_pymes_ded_26_18"/>
@@ -1229,8 +1534,8 @@
             <field name="description">IVA 18% Importaciones bienes de inversión</field>
             <field eval="0.18" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_pymes_472018"/>
-            <field name="account_paid_id" ref="pgc_pymes_472018"/>
+            <field name="account_collected_id" ref="pgc_pymes_472000"/>
+            <field name="account_paid_id" ref="pgc_pymes_472000"/>
             <field name="base_code_id" ref="iva_pymes_ded_28_18"/>
             <field name="tax_code_id" ref="iva_pymes_ded_29_18"/>
             <field name="ref_base_code_id" ref="iva_pymes_ded_28_18"/>
@@ -1241,7 +1546,42 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
         </record>
-        
+        <record id="iva_pymes_X21_compras_bc" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+            <field name="name">IVA 21% Importaciones bienes corrientes</field>
+            <field name="description">IVA 21% Importaciones bienes corrientes</field>
+            <field eval="0.21" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_pymes_472000"/>
+            <field name="account_paid_id" ref="pgc_pymes_472000"/>
+            <field name="base_code_id" ref="iva_pymes_ded_26_21"/>
+            <field name="tax_code_id" ref="iva_pymes_ded_27_21"/>
+            <field name="ref_base_code_id" ref="iva_pymes_ded_26_21"/>
+            <field name="ref_tax_code_id" ref="iva_pymes_ded_27_21"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_pymes_X21_compras_bi" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+            <field name="name">IVA 21% Importaciones bienes de inversión</field>
+            <field name="description">IVA 21% Importaciones bienes de inversión</field>
+            <field eval="0.21" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_pymes_472000"/>
+            <field name="account_paid_id" ref="pgc_pymes_472000"/>
+            <field name="base_code_id" ref="iva_pymes_ded_28_21"/>
+            <field name="tax_code_id" ref="iva_pymes_ded_29_21"/>
+            <field name="ref_base_code_id" ref="iva_pymes_ded_28_21"/>
+            <field name="ref_tax_code_id" ref="iva_pymes_ded_29_21"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
 
         <!-- IVA EXPORTACIONES (VENTAS )-->
         <record id="iva_pymes_X0" model="account.tax.template">
@@ -1255,7 +1595,7 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">sale</field>
         </record>
-        
+
          <!-- Inversión del sujeto pasivo -->
         <record id="iva_pymes_ISP_compras_16" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
@@ -1290,16 +1630,16 @@
             <field name="parent_id" ref="iva_pymes_ISP_compras_16"/>
             <field name="amount" eval="-0.16"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_pymes_477016"/>
-            <field name="account_paid_id" ref="pgc_pymes_477016"/>
+            <field name="account_collected_id" ref="pgc_pymes_477000"/>
+            <field name="account_paid_id" ref="pgc_pymes_477000"/>
             <field name="base_code_id" ref="iva_pymes_dev_07"/>
             <field name="tax_code_id" ref="iva_pymes_dev_09"/>
             <field name="ref_base_code_id" ref="iva_pymes_dev_07"/>
             <field name="ref_tax_code_id" ref="iva_pymes_dev_09"/>
             <field name="tax_sign" eval="-1.0"/>
-            <field name="base_sign" eval="-1.0"/>
+            <field name="base_sign" eval="1.0"/>
             <field name="ref_tax_sign" eval="1.0"/>
-            <field name="ref_base_sign" eval="1.0"/>
+            <field name="ref_base_sign" eval="-1.0"/>
             <field name="type_tax_use">purchase</field>
         </record>
         <record id="iva_pymes_ISP_compras_16_3" model="account.tax.template">
@@ -1308,8 +1648,8 @@
             <field name="parent_id" ref="iva_pymes_ISP_compras_16"/>
             <field name="amount" eval="0.16"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_pymes_472016"/>
-            <field name="account_paid_id" ref="pgc_pymes_472016"/>
+            <field name="account_collected_id" ref="pgc_pymes_472000"/>
+            <field name="account_paid_id" ref="pgc_pymes_472000"/>
             <field name="base_code_id" ref="iva_pymes_ded_22_16"/>
             <field name="tax_code_id" ref="iva_pymes_ded_23_16"/>
             <field name="ref_base_code_id" ref="iva_pymes_ded_22_16"/>
@@ -1320,7 +1660,7 @@
             <field name="ref_base_sign" eval="-1.0"/>
             <field name="type_tax_use">purchase</field>
         </record>
-        
+
         <record id="iva_pymes_ISP_compras_18" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
             <field name="name">IVA 18% Inversión del sujeto pasivo</field>
@@ -1354,16 +1694,16 @@
             <field name="parent_id" ref="iva_pymes_ISP_compras_18"/>
             <field name="amount" eval="-0.18"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_pymes_477018"/>
-            <field name="account_paid_id" ref="pgc_pymes_477018"/>
+            <field name="account_collected_id" ref="pgc_pymes_477000"/>
+            <field name="account_paid_id" ref="pgc_pymes_477000"/>
             <field name="base_code_id" ref="iva_pymes_dev_07_18"/>
             <field name="tax_code_id" ref="iva_pymes_dev_09_18"/>
             <field name="ref_base_code_id" ref="iva_pymes_dev_07_18"/>
             <field name="ref_tax_code_id" ref="iva_pymes_dev_09_18"/>
             <field name="tax_sign" eval="-1.0"/>
-            <field name="base_sign" eval="-1.0"/>
+            <field name="base_sign" eval="1.0"/>
             <field name="ref_tax_sign" eval="1.0"/>
-            <field name="ref_base_sign" eval="1.0"/>
+            <field name="ref_base_sign" eval="-1.0"/>
             <field name="type_tax_use">purchase</field>
         </record>
         <record id="iva_pymes_ISP_compras_18_3" model="account.tax.template">
@@ -1372,8 +1712,8 @@
             <field name="parent_id" ref="iva_pymes_ISP_compras_18"/>
             <field name="amount" eval="0.18"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_pymes_472018"/>
-            <field name="account_paid_id" ref="pgc_pymes_472018"/>
+            <field name="account_collected_id" ref="pgc_pymes_472000"/>
+            <field name="account_paid_id" ref="pgc_pymes_472000"/>
             <field name="base_code_id" ref="iva_pymes_ded_22_18"/>
             <field name="tax_code_id" ref="iva_pymes_ded_23_18"/>
             <field name="ref_base_code_id" ref="iva_pymes_ded_22_18"/>
@@ -1384,15 +1724,79 @@
             <field name="ref_base_sign" eval="-1.0"/>
             <field name="type_tax_use">purchase</field>
         </record>
-        
+<record id="iva_pymes_ISP_compras_21" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+            <field name="name">IVA 21% Inversión del sujeto pasivo</field>
+            <field name="description">IVA 21% Inversión del sujeto pasivo</field>
+            <field name="amount" eval="1.00"/>
+            <field name="type">percent</field>
+            <field name="child_depend" eval="1"/>
+            <field name="base_sign" eval="1.0"/>
+            <field name="tax_sign" eval="1.0"/>
+            <field name="ref_base_sign" eval="-1.0"/>
+            <field name="ref_tax_sign" eval="-1.0"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_pymes_ISP_compras_21_1" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+            <field name="name">IVA 21% Inversión del sujeto pasivo (1)</field>
+            <field name="parent_id" ref="iva_pymes_ISP_compras_21"/>
+            <field name="amount" eval="0.00"/>
+            <field name="type">percent</field>
+            <field name="base_code_id" ref="base_pymes_extra_44"/>
+            <field name="ref_base_code_id" ref="base_pymes_extra_44"/>
+            <field name="base_sign" eval="1.0"/>
+            <field name="tax_sign" eval="1.0"/>
+            <field name="ref_base_sign" eval="-1.0"/>
+            <field name="ref_tax_sign" eval="-1.0"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_pymes_ISP_compras_21_2" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+            <field name="name">IVA 21% Inversión del sujeto pasivo (2)</field>
+            <field name="parent_id" ref="iva_pymes_ISP_compras_21"/>
+            <field name="amount" eval="-0.21"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_pymes_477000"/>
+            <field name="account_paid_id" ref="pgc_pymes_477000"/>
+            <field name="base_code_id" ref="iva_pymes_dev_07_21"/>
+            <field name="tax_code_id" ref="iva_pymes_dev_09_21"/>
+            <field name="ref_base_code_id" ref="iva_pymes_dev_07_21"/>
+            <field name="ref_tax_code_id" ref="iva_pymes_dev_09_21"/>
+            <field name="tax_sign" eval="-1.0"/>
+            <field name="base_sign" eval="1.0"/>
+            <field name="ref_tax_sign" eval="1.0"/>
+            <field name="ref_base_sign" eval="-1.0"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_pymes_ISP_compras_21_3" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+            <field name="name">IVA 21% Inversión del sujeto pasivo (3)</field>
+            <field name="parent_id" ref="iva_pymes_ISP_compras_21"/>
+            <field name="amount" eval="0.21"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_pymes_472000"/>
+            <field name="account_paid_id" ref="pgc_pymes_472000"/>
+            <field name="base_code_id" ref="iva_pymes_ded_22_21"/>
+            <field name="tax_code_id" ref="iva_pymes_ded_23_21"/>
+            <field name="ref_base_code_id" ref="iva_pymes_ded_22_21"/>
+            <field name="ref_tax_code_id" ref="iva_pymes_ded_23_21"/>
+            <field name="tax_sign" eval="1.0"/>
+            <field name="base_sign" eval="1.0"/>
+            <field name="ref_tax_sign" eval="-1.0"/>
+            <field name="ref_base_sign" eval="-1.0"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+
         <!-- IVA REPERCUTIDO-->
         <record id="iva_pymes_rep_4" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
             <field name="name">IVA 4%</field>
             <field eval="0.04" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_pymes_477004"/>
-            <field name="account_paid_id" ref="pgc_pymes_477004"/>
+            <field name="account_collected_id" ref="pgc_pymes_477000"/>
+            <field name="account_paid_id" ref="pgc_pymes_477000"/>
             <field name="base_code_id" ref="iva_pymes_dev_01"/>
             <field name="tax_code_id" ref="iva_pymes_dev_03"/>
             <field name="ref_base_code_id" ref="iva_pymes_dev_01"/>
@@ -1403,14 +1807,14 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">sale</field>
         </record>
-        
+
         <record id="iva_pymes_rep_7" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
             <field name="name">IVA 7%</field>
             <field eval="0.07" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_pymes_477007"/>
-            <field name="account_paid_id" ref="pgc_pymes_477007"/>
+            <field name="account_collected_id" ref="pgc_pymes_477000"/>
+            <field name="account_paid_id" ref="pgc_pymes_477000"/>
             <field name="base_code_id" ref="iva_pymes_dev_04"/>
             <field name="tax_code_id" ref="iva_pymes_dev_06"/>
             <field name="ref_base_code_id" ref="iva_pymes_dev_04"/>
@@ -1421,14 +1825,14 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">sale</field>
         </record>
-        
+
         <record id="iva_pymes_rep_8" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
             <field name="name">IVA 8%</field>
             <field eval="0.08" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_pymes_477008"/>
-            <field name="account_paid_id" ref="pgc_pymes_477008"/>
+            <field name="account_collected_id" ref="pgc_pymes_477000"/>
+            <field name="account_paid_id" ref="pgc_pymes_477000"/>
             <field name="base_code_id" ref="iva_pymes_dev_04_8"/>
             <field name="tax_code_id" ref="iva_pymes_dev_06_8"/>
             <field name="ref_base_code_id" ref="iva_pymes_dev_04_8"/>
@@ -1439,14 +1843,32 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">sale</field>
         </record>
-        
+
+        <record id="iva_pymes_rep_10" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+            <field name="name">IVA 10%</field>
+            <field eval="0.10" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_pymes_477000"/>
+            <field name="account_paid_id" ref="pgc_pymes_477000"/>
+            <field name="base_code_id" ref="iva_pymes_dev_04_10"/>
+            <field name="tax_code_id" ref="iva_pymes_dev_06_10"/>
+            <field name="ref_base_code_id" ref="iva_pymes_dev_04_10"/>
+            <field name="ref_tax_code_id" ref="iva_pymes_dev_06_10"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">sale</field>
+        </record>
+
         <record id="iva_pymes_rep_16" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
             <field name="name">IVA 16%</field>
             <field eval="0.16" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_pymes_477016"/>
-            <field name="account_paid_id" ref="pgc_pymes_477016"/>
+            <field name="account_collected_id" ref="pgc_pymes_477000"/>
+            <field name="account_paid_id" ref="pgc_pymes_477000"/>
             <field name="base_code_id" ref="iva_pymes_dev_07"/>
             <field name="tax_code_id" ref="iva_pymes_dev_09"/>
             <field name="ref_base_code_id" ref="iva_pymes_dev_07"/>
@@ -1457,14 +1879,14 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">sale</field>
         </record>
-        
+
         <record id="iva_pymes_rep_18" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
             <field name="name">IVA 18%</field>
             <field eval="0.18" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_pymes_477018"/>
-            <field name="account_paid_id" ref="pgc_pymes_477018"/>
+            <field name="account_collected_id" ref="pgc_pymes_477000"/>
+            <field name="account_paid_id" ref="pgc_pymes_477000"/>
             <field name="base_code_id" ref="iva_pymes_dev_07_18"/>
             <field name="tax_code_id" ref="iva_pymes_dev_09_18"/>
             <field name="ref_base_code_id" ref="iva_pymes_dev_07_18"/>
@@ -1474,17 +1896,36 @@
             <field eval="-1.0" name="ref_tax_sign"/>
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">sale</field>
+            <field eval="0" name="sequence"/>
         </record>
-        
-        
+
+		<record id="iva_pymes_rep_21" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+            <field name="name">IVA 21%</field>
+            <field eval="0.21" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_pymes_477000"/>
+            <field name="account_paid_id" ref="pgc_pymes_477000"/>
+            <field name="base_code_id" ref="iva_pymes_dev_07_21"/>
+            <field name="tax_code_id" ref="iva_pymes_dev_09_21"/>
+            <field name="ref_base_code_id" ref="iva_pymes_dev_07_21"/>
+            <field name="ref_tax_code_id" ref="iva_pymes_dev_09_21"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">sale</field>
+            <field eval="0" name="sequence"/>
+        </record>
+
         <!-- Plantillas para recargo de equivalencia-->
         <record id="re_pymes_05" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
-            <field name="name">0.50% Recargo Equivalencia</field>
+            <field name="name">0.50% Recargo Equivalencia Ventas</field>
             <field eval="0.005" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_pymes_475001"/>
-            <field name="account_paid_id" ref="pgc_pymes_475001"/>
+            <field name="account_collected_id" ref="pgc_pymes_477000"/>
+            <field name="account_paid_id" ref="pgc_pymes_477000"/>
             <field name="base_code_id" ref="iva_pymes_dev_10"/>
             <field name="tax_code_id" ref="iva_pymes_dev_12"/>
             <field name="ref_base_code_id" ref="iva_pymes_dev_10"/>
@@ -1495,14 +1936,14 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">sale</field>
         </record>
-        
+
         <record id="re_pymes_1" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
-            <field name="name">1% Recargo Equivalencia</field>
+            <field name="name">1% Recargo Equivalencia Ventas</field>
             <field eval="0.01" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_pymes_475001"/>
-            <field name="account_paid_id" ref="pgc_pymes_475001"/>
+            <field name="account_collected_id" ref="pgc_pymes_477000"/>
+            <field name="account_paid_id" ref="pgc_pymes_477000"/>
             <field name="base_code_id" ref="iva_pymes_dev_13"/>
             <field name="tax_code_id" ref="iva_pymes_dev_15"/>
             <field name="ref_base_code_id" ref="iva_pymes_dev_13"/>
@@ -1513,14 +1954,32 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">sale</field>
         </record>
-        
+
+        <record id="re_pymes_14" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+            <field name="name">1.4% Recargo Equivalencia Ventas</field>
+            <field eval="0.014" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_pymes_477000"/>
+            <field name="account_paid_id" ref="pgc_pymes_477000"/>
+            <field name="base_code_id" ref="iva_pymes_dev_13_14"/>
+            <field name="tax_code_id" ref="iva_pymes_dev_15_14"/>
+            <field name="ref_base_code_id" ref="iva_pymes_dev_13_14"/>
+            <field name="ref_tax_code_id" ref="iva_pymes_dev_15_14"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">sale</field>
+        </record>
+
         <record id="re_pymes_4" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
-            <field name="name">4% Recargo Equivalencia</field>
+            <field name="name">4% Recargo Equivalencia Ventas</field>
             <field eval="0.04" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_pymes_475001"/>
-            <field name="account_paid_id" ref="pgc_pymes_475001"/>
+            <field name="account_collected_id" ref="pgc_pymes_477000"/>
+            <field name="account_paid_id" ref="pgc_pymes_477000"/>
             <field name="base_code_id" ref="iva_pymes_dev_16"/>
             <field name="tax_code_id" ref="iva_pymes_dev_18"/>
             <field name="ref_base_code_id" ref="iva_pymes_dev_16"/>
@@ -1531,10 +1990,117 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">sale</field>
         </record>
-        
-        
+
+        <record id="re_pymes_52" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+            <field name="name">5.2% Recargo Equivalencia Ventas</field>
+            <field eval="0.052" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_pymes_477000"/>
+            <field name="account_paid_id" ref="pgc_pymes_477000"/>
+            <field name="base_code_id" ref="iva_pymes_dev_16_52"/>
+            <field name="tax_code_id" ref="iva_pymes_dev_18_52"/>
+            <field name="ref_base_code_id" ref="iva_pymes_dev_16_52"/>
+            <field name="ref_tax_code_id" ref="iva_pymes_dev_18_52"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">sale</field>
+        </record>
+        <record id="re_pymes_buy_05" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+            <field name="name">0.50% Recargo Equivalencia Compras</field>
+            <field eval="0.005" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_pymes_472000"/>
+            <field name="account_paid_id" ref="pgc_pymes_472000"/>
+            <field name="base_code_id" ref="iva_pymes_ded_10"/>
+            <field name="tax_code_id" ref="iva_pymes_ded_12"/>
+            <field name="ref_base_code_id" ref="iva_pymes_ded_10"/>
+            <field name="ref_tax_code_id" ref="iva_pymes_ded_12"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="re_pymes_buy_1" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+            <field name="name">1% Recargo Equivalencia Compras</field>
+            <field eval="0.01" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_pymes_472000"/>
+            <field name="account_paid_id" ref="pgc_pymes_472000"/>
+            <field name="base_code_id" ref="iva_pymes_ded_13"/>
+            <field name="tax_code_id" ref="iva_pymes_ded_15"/>
+            <field name="ref_base_code_id" ref="iva_pymes_ded_13"/>
+            <field name="ref_tax_code_id" ref="iva_pymes_ded_15"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="re_pymes_buy_14" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+            <field name="name">1.4% Recargo Equivalencia Compras</field>
+            <field eval="0.014" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_pymes_472000"/>
+            <field name="account_paid_id" ref="pgc_pymes_472000"/>
+            <field name="base_code_id" ref="iva_pymes_ded_13_14"/>
+            <field name="tax_code_id" ref="iva_pymes_ded_15_14"/>
+            <field name="ref_base_code_id" ref="iva_pymes_ded_13_14"/>
+            <field name="ref_tax_code_id" ref="iva_pymes_ded_15_14"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="re_pymes_buy_4" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+            <field name="name">4% Recargo Equivalencia Compras</field>
+            <field eval="0.04" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_pymes_472000"/>
+            <field name="account_paid_id" ref="pgc_pymes_472000"/>
+            <field name="base_code_id" ref="iva_pymes_ded_16"/>
+            <field name="tax_code_id" ref="iva_pymes_ded_18"/>
+            <field name="ref_base_code_id" ref="iva_pymes_ded_16"/>
+            <field name="ref_tax_code_id" ref="iva_pymes_ded_18"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="re_pymes_buy_52" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+            <field name="name">5.2% Recargo Equivalencia Compras</field>
+            <field eval="0.052" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_pymes_472000"/>
+            <field name="account_paid_id" ref="pgc_pymes_472000"/>
+            <field name="base_code_id" ref="iva_pymes_ded_16_52"/>
+            <field name="tax_code_id" ref="iva_pymes_ded_18_52"/>
+            <field name="ref_base_code_id" ref="iva_pymes_ded_16_52"/>
+            <field name="ref_tax_code_id" ref="iva_pymes_ded_18_52"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+
 <!-- OPERACIONES INTRACOMUNITARIAS -->
-        
+
         <!-- VENTAS -->
         <record id="iva_pymes_IO" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
@@ -1548,365 +2114,9 @@
             <field eval="-1.0" name="ref_tax_sign"/>
             <field name="type_tax_use">sale</field>
         </record>
-        
-        
+
+
         <!-- COMPRAS -->
-        <record id="iva_pymes_IC_compras_16_bc" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
-            <field name="name">IVA 16% Intracomunitario. Bienes corrientes</field>
-            <field name="description">IVA 16% Intracomunitario. Bienes corrientes</field>
-            <field eval="1.00" name="amount"/>
-            <field name="type">percent</field>
-            <field eval="1" name="child_depend"/>
-            <field name="type_tax_use">purchase</field>
-        </record>
-        <record id="iva_pymes_IC_compras_16_bc_1" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
-            <field name="parent_id" ref="iva_pymes_IC_compras_16_bc"/>
-            <field name="name">IVA 16% Intracomunitario. Bienes corrientes (1)</field>
-            <field eval="0.16" name="amount"/>
-            <field name="type">percent</field>
-            <field name="account_paid_id" ref="pgc_pymes_472016"/>
-            <field name="account_collected_id" ref="pgc_pymes_472016"/>
-            <field name="base_code_id" ref="iva_pymes_ded_30_16"/>
-            <field name="tax_code_id" ref="iva_pymes_ded_31_16"/>
-            <field name="ref_base_code_id" ref="iva_pymes_ded_30_16"/>
-            <field name="ref_tax_code_id" ref="iva_pymes_ded_31_16"/>
-            <field eval="-1.0" name="ref_base_sign"/>
-            <field eval="-1.0" name="ref_tax_sign"/>
-            <field name="type_tax_use">purchase</field>
-        </record>
-        <record id="iva_pymes_IC_compras_16_bc_2" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
-            <field name="parent_id" ref="iva_pymes_IC_compras_16_bc"/>
-            <field name="name">IVA 16% Intracomunitario. Bienes corrientes (2)</field>
-            <field eval="-0.16" name="amount"/>
-            <field name="type">percent</field>
-            <field name="account_paid_id" ref="pgc_pymes_477016"/>
-            <field name="account_collected_id" ref="pgc_pymes_477016"/>
-            <field name="base_code_id" ref="iva_pymes_dev_19"/>
-            <field name="tax_code_id" ref="iva_pymes_dev_20"/>
-            <field eval="-1.0" name="tax_sign"/>
-            <field name="ref_base_code_id" ref="iva_pymes_dev_19"/>
-            <field eval="-1.0" name="ref_base_sign"/>
-            <!--ATENCIÓN AQUÍ CON LOS SIGNOS. PENDIENTE DE PRUEBA EN PROFUNDIDAD-->
-            <field name="ref_tax_code_id" ref="iva_pymes_dev_20"/>
-            <field eval="1.0" name="ref_tax_sign"/>
-            <field name="type_tax_use">purchase</field>
-        </record>
-        
-        <record id="iva_pymes_IC_compras_18_bc" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
-            <field name="name">IVA 18% Intracomunitario. Bienes corrientes</field>
-            <field name="description">IVA 18% Intracomunitario. Bienes corrientes</field>
-            <field eval="1.00" name="amount"/>
-            <field name="type">percent</field>
-            <field eval="1" name="child_depend"/>
-            <field name="type_tax_use">purchase</field>
-        </record>
-        <record id="iva_pymes_IC_compras_18_bc_1" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
-            <field name="parent_id" ref="iva_pymes_IC_compras_18_bc"/>
-            <field name="name">IVA 18% Intracomunitario. Bienes corrientes (1)</field>
-            <field eval="0.18" name="amount"/>
-            <field name="type">percent</field>
-            <field name="account_paid_id" ref="pgc_pymes_472018"/>
-            <field name="account_collected_id" ref="pgc_pymes_472018"/>
-            <field name="base_code_id" ref="iva_pymes_ded_30_18"/>
-            <field name="tax_code_id" ref="iva_pymes_ded_31_18"/>
-            <field name="ref_base_code_id" ref="iva_pymes_ded_30_18"/>
-            <field name="ref_tax_code_id" ref="iva_pymes_ded_31_18"/>
-            <field eval="-1.0" name="ref_base_sign"/>
-            <field eval="-1.0" name="ref_tax_sign"/>
-            <field name="type_tax_use">purchase</field>
-        </record>
-        <record id="iva_pymes_IC_compras_18_bc_2" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
-            <field name="parent_id" ref="iva_pymes_IC_compras_18_bc"/>
-            <field name="name">IVA 18% Intracomunitario. Bienes corrientes (2)</field>
-            <field eval="-0.18" name="amount"/>
-            <field name="type">percent</field>
-            <field name="account_paid_id" ref="pgc_pymes_477018"/>
-            <field name="account_collected_id" ref="pgc_pymes_477018"/>
-            <field name="base_code_id" ref="iva_pymes_dev_19"/>
-            <field name="tax_code_id" ref="iva_pymes_dev_20"/>
-            <field eval="-1.0" name="tax_sign"/>
-            <field name="ref_base_code_id" ref="iva_pymes_dev_19"/>
-            <field eval="-1.0" name="ref_base_sign"/>
-            <!--ATENCIÓN AQUÍ CON LOS SIGNOS. PENDIENTE DE PRUEBA EN PROFUNDIDAD-->
-            <field name="ref_tax_code_id" ref="iva_pymes_dev_20"/>
-            <field eval="1.0" name="ref_tax_sign"/>
-            <field name="type_tax_use">purchase</field>
-        </record>
-        <!--record id="vat_IO_buy_21b_3" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
-            <field name="parent_id" ref="vat_IO_buy_21b"/>
-            <field name="name">Biens Déductibles 21% (3)</field>
-            <field eval="0.00" name="amount"/>
-            <field name="type">percent</field>
-            <field name="ref_base_code_id" ref="vat_code_a86"/>
-            <field eval="-1.0" name="ref_base_sign"/>
-            <field name="type_tax_use">purchase</field>
-        </record-->
-<!-- ES NECESARIO ESTE ÚLTIMO REGISTRO????-->
-
-        <record id="iva_pymes_IC_compras_16_bi" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
-            <field name="name">IVA 16% Intracomunitario. Bienes de inversión</field>
-            <field name="description">IVA 16% Intracomunitario. Bienes de inversión</field>
-            <field eval="1.00" name="amount"/>
-            <field name="type">percent</field>
-            <field eval="1" name="child_depend"/>
-            <field name="type_tax_use">purchase</field>
-        </record>
-        <record id="iva_pymes_IC_compras_16_bi_1" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
-            <field name="parent_id" ref="iva_pymes_IC_compras_16_bi"/>
-            <field name="name">IVA 16% Intracomunitario. Bienes de inversión (1)</field>
-            <field eval="0.16" name="amount"/>
-            <field name="type">percent</field>
-            <field name="account_paid_id" ref="pgc_pymes_472016"/>
-            <field name="account_collected_id" ref="pgc_pymes_472016"/>
-            <field name="base_code_id" ref="iva_pymes_ded_32_16"/>
-            <field name="tax_code_id" ref="iva_pymes_ded_33_16"/>
-            <field name="ref_base_code_id" ref="iva_pymes_ded_32_16"/>
-            <field eval="-1.0" name="ref_base_sign"/>
-            <field name="ref_tax_code_id" ref="iva_pymes_ded_33_16"/>
-            <field eval="-1.0" name="ref_tax_sign"/>
-            <field name="type_tax_use">purchase</field>
-        </record>
-        <record id="iva_pymes_IC_compras_16_bi_2" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
-            <field name="parent_id" ref="iva_pymes_IC_compras_16_bi"/>
-            <field name="name">IVA 16% Intracomunitario. Bienes de inversión (2)</field>
-            <field eval="-0.16" name="amount"/>
-            <field name="type">percent</field>
-            <field name="account_paid_id" ref="pgc_pymes_477016"/>
-            <field name="account_collected_id" ref="pgc_pymes_477016"/>
-            <field name="base_code_id" ref="iva_pymes_dev_19"/>
-            <field name="tax_code_id" ref="iva_pymes_dev_20"/>
-            <field eval="-1.0" name="tax_sign"/>
-            <field name="ref_base_code_id" ref="iva_pymes_dev_19"/>
-            <field eval="-1.0" name="ref_base_sign"/>
-            <field name="ref_tax_code_id" ref="iva_pymes_dev_20"/>
-            <field eval="1.0" name="ref_tax_sign"/>
-            <field name="type_tax_use">purchase</field>
-        </record>
-        
-        <record id="iva_pymes_IC_compras_18_bi" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
-            <field name="name">IVA 18% Intracomunitario. Bienes de inversión</field>
-            <field name="description">IVA 18% Intracomunitario. Bienes de inversión</field>
-            <field eval="1.00" name="amount"/>
-            <field name="type">percent</field>
-            <field eval="1" name="child_depend"/>
-            <field name="type_tax_use">purchase</field>
-        </record>
-        <record id="iva_pymes_IC_compras_18_bi_1" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
-            <field name="parent_id" ref="iva_pymes_IC_compras_18_bi"/>
-            <field name="name">IVA 18% Intracomunitario. Bienes de inversión (1)</field>
-            <field eval="0.18" name="amount"/>
-            <field name="type">percent</field>
-            <field name="account_paid_id" ref="pgc_pymes_472018"/>
-            <field name="account_collected_id" ref="pgc_pymes_472018"/>
-            <field name="base_code_id" ref="iva_pymes_ded_32_18"/>
-            <field name="tax_code_id" ref="iva_pymes_ded_33_18"/>
-            <field name="ref_base_code_id" ref="iva_pymes_ded_32_18"/>
-            <field eval="-1.0" name="ref_base_sign"/>
-            <field name="ref_tax_code_id" ref="iva_pymes_ded_33_18"/>
-            <field eval="-1.0" name="ref_tax_sign"/>
-            <field name="type_tax_use">purchase</field>
-        </record>
-        <record id="iva_pymes_IC_compras_18_bi_2" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
-            <field name="parent_id" ref="iva_pymes_IC_compras_18_bi"/>
-            <field name="name">IVA 18% Intracomunitario. Bienes de inversión (2)</field>
-            <field eval="-0.18" name="amount"/>
-            <field name="type">percent</field>
-            <field name="account_paid_id" ref="pgc_pymes_477018"/>
-            <field name="account_collected_id" ref="pgc_pymes_477018"/>
-            <field name="base_code_id" ref="iva_pymes_dev_19"/>
-            <field name="tax_code_id" ref="iva_pymes_dev_20"/>
-            <field eval="-1.0" name="tax_sign"/>
-            <field name="ref_base_code_id" ref="iva_pymes_dev_19"/>
-            <field eval="-1.0" name="ref_base_sign"/>
-            <field name="ref_tax_code_id" ref="iva_pymes_dev_20"/>
-            <field eval="1.0" name="ref_tax_sign"/>
-            <field name="type_tax_use">purchase</field>
-        </record>
-
-        <record id="iva_pymes_IC_compras_7_bc" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
-            <field name="name">IVA 7% Intracomunitario. Bienes corrientes</field>
-            <field name="description">IVA 7% Intracomunitario. Bienes corrientes</field>
-            <field eval="1.00" name="amount"/>
-            <field name="type">percent</field>
-            <field eval="1" name="child_depend"/>
-            <field name="type_tax_use">purchase</field>
-        </record>
-        <record id="iva_pymes_IC_compras_7_bc_1" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
-            <field name="parent_id" ref="iva_pymes_IC_compras_7_bc"/>
-            <field name="name">IVA 7% Intracomunitario. Bienes corrientes (1)</field>
-            <field eval="0.07" name="amount"/>
-            <field name="type">percent</field>
-            <field name="account_paid_id" ref="pgc_pymes_472007"/>
-            <field name="account_collected_id" ref="pgc_pymes_472007"/>
-            <field name="base_code_id" ref="iva_pymes_ded_30_7"/>
-            <field name="tax_code_id" ref="iva_pymes_ded_31_7"/>
-            <field name="ref_base_code_id" ref="iva_pymes_ded_30_7"/>
-            <field eval="-1.0" name="ref_base_sign"/>
-            <field name="ref_tax_code_id" ref="iva_pymes_ded_31_7"/>
-            <field eval="-1.0" name="ref_tax_sign"/>
-            <field name="type_tax_use">purchase</field>
-        </record>
-        <record id="iva_pymes_IC_compras_7_bc_2" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
-            <field name="parent_id" ref="iva_pymes_IC_compras_7_bc"/>
-            <field name="name">IVA 7% Intracomunitario. Bienes corrientes (2)</field>
-            <field eval="-0.07" name="amount"/>
-            <field name="type">percent</field>
-            <field name="account_paid_id" ref="pgc_pymes_477007"/>
-            <field name="account_collected_id" ref="pgc_pymes_477007"/>
-            <field name="base_code_id" ref="iva_pymes_dev_19"/>
-            <field name="tax_code_id" ref="iva_pymes_dev_20"/>
-            <field eval="-1.0" name="tax_sign"/>
-            <field name="ref_base_code_id" ref="iva_pymes_dev_19"/>
-            <field eval="-1.0" name="ref_base_sign"/>
-            <field name="ref_tax_code_id" ref="iva_pymes_dev_20"/>
-            <field eval="1.0" name="ref_tax_sign"/>
-            <field name="type_tax_use">purchase</field>
-        </record>
-
-        <record id="iva_pymes_IC_compras_7_bi" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
-            <field name="name">IVA 7% Intracomunitario. Bienes de inversión</field>
-            <field name="description">IVA 7% Intracomunitario. Bienes de inversión</field>
-            <field eval="1.00" name="amount"/>
-            <field name="type">percent</field>
-            <field eval="1" name="child_depend"/>
-            <field name="type_tax_use">purchase</field>
-        </record>
-        <record id="iva_pymes_IC_compras_7_bi_1" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
-            <field name="parent_id" ref="iva_pymes_IC_compras_7_bi"/>
-            <field name="name">IVA 7% Intracomunitario. Bienes de inversión (1)</field>
-            <field eval="0.07" name="amount"/>
-            <field name="type">percent</field>
-            <field name="account_paid_id" ref="pgc_pymes_472007"/>
-            <field name="account_collected_id" ref="pgc_pymes_472007"/>
-            <field name="base_code_id" ref="iva_pymes_ded_32_7"/>
-            <field name="tax_code_id" ref="iva_pymes_ded_33_7"/>
-            <field name="ref_base_code_id" ref="iva_pymes_ded_32_7"/>
-            <field eval="-1.0" name="ref_base_sign"/>
-            <field name="ref_tax_code_id" ref="iva_pymes_ded_33_7"/>
-            <field eval="-1.0" name="ref_tax_sign"/>
-            <field name="type_tax_use">purchase</field>
-        </record>
-        <record id="iva_pymes_IC_compras_7_bi_2" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
-            <field name="parent_id" ref="iva_pymes_IC_compras_7_bi"/>
-            <field name="name">IVA 7% Intracomunitario. Bienes de inversión (2)</field>
-            <field eval="-0.07" name="amount"/>
-            <field name="type">percent</field>
-            <field name="account_paid_id" ref="pgc_pymes_477007"/>
-            <field name="account_collected_id" ref="pgc_pymes_477007"/>
-            <field name="base_code_id" ref="iva_pymes_dev_19"/>
-            <field name="tax_code_id" ref="iva_pymes_dev_20"/>
-            <field eval="-1.0" name="tax_sign"/>
-            <field name="ref_base_code_id" ref="iva_pymes_dev_19"/>
-            <field eval="-1.0" name="ref_base_sign"/>
-            <field name="ref_tax_code_id" ref="iva_pymes_dev_20"/>
-            <field eval="1.0" name="ref_tax_sign"/>
-            <field name="type_tax_use">purchase</field>
-        </record>
-        
-        <record id="iva_pymes_IC_compras_8_bc" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
-            <field name="name">IVA 8% Intracomunitario. Bienes corrientes</field>
-            <field name="description">IVA 8% Intracomunitario. Bienes corrientes</field>
-            <field eval="1.00" name="amount"/>
-            <field name="type">percent</field>
-            <field eval="1" name="child_depend"/>
-            <field name="type_tax_use">purchase</field>
-        </record>
-        <record id="iva_pymes_IC_compras_8_bc_1" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
-            <field name="parent_id" ref="iva_pymes_IC_compras_8_bc"/>
-            <field name="name">IVA 8% Intracomunitario. Bienes corrientes (1)</field>
-            <field eval="0.08" name="amount"/>
-            <field name="type">percent</field>
-            <field name="account_paid_id" ref="pgc_pymes_472008"/>
-            <field name="account_collected_id" ref="pgc_pymes_472008"/>
-            <field name="base_code_id" ref="iva_pymes_ded_30_8"/>
-            <field name="tax_code_id" ref="iva_pymes_ded_31_8"/>
-            <field name="ref_base_code_id" ref="iva_pymes_ded_30_8"/>
-            <field eval="-1.0" name="ref_base_sign"/>
-            <field name="ref_tax_code_id" ref="iva_pymes_ded_31_8"/>
-            <field eval="-1.0" name="ref_tax_sign"/>
-            <field name="type_tax_use">purchase</field>
-        </record>
-        <record id="iva_pymes_IC_compras_8_bc_2" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
-            <field name="parent_id" ref="iva_pymes_IC_compras_8_bc"/>
-            <field name="name">IVA 8% Intracomunitario. Bienes corrientes (2)</field>
-            <field eval="-0.08" name="amount"/>
-            <field name="type">percent</field>
-            <field name="account_paid_id" ref="pgc_pymes_477008"/>
-            <field name="account_collected_id" ref="pgc_pymes_477008"/>
-            <field name="base_code_id" ref="iva_pymes_dev_19"/>
-            <field name="tax_code_id" ref="iva_pymes_dev_20"/>
-            <field eval="-1.0" name="tax_sign"/>
-            <field name="ref_base_code_id" ref="iva_pymes_dev_19"/>
-            <field eval="-1.0" name="ref_base_sign"/>
-            <field name="ref_tax_code_id" ref="iva_pymes_dev_20"/>
-            <field eval="1.0" name="ref_tax_sign"/>
-            <field name="type_tax_use">purchase</field>
-        </record>
-
-        <record id="iva_pymes_IC_compras_8_bi" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
-            <field name="name">IVA 8% Intracomunitario. Bienes de inversión</field>
-            <field name="description">IVA 8% Intracomunitario. Bienes de inversión</field>
-            <field eval="1.00" name="amount"/>
-            <field name="type">percent</field>
-            <field eval="1" name="child_depend"/>
-            <field name="type_tax_use">purchase</field>
-        </record>
-        <record id="iva_pymes_IC_compras_8_bi_1" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
-            <field name="parent_id" ref="iva_pymes_IC_compras_8_bi"/>
-            <field name="name">IVA 8% Intracomunitario. Bienes de inversión (1)</field>
-            <field eval="0.08" name="amount"/>
-            <field name="type">percent</field>
-            <field name="account_paid_id" ref="pgc_pymes_472008"/>
-            <field name="account_collected_id" ref="pgc_pymes_472008"/>
-            <field name="base_code_id" ref="iva_pymes_ded_32_8"/>
-            <field name="tax_code_id" ref="iva_pymes_ded_33_8"/>
-            <field name="ref_base_code_id" ref="iva_pymes_ded_32_8"/>
-            <field eval="-1.0" name="ref_base_sign"/>
-            <field name="ref_tax_code_id" ref="iva_pymes_ded_33_8"/>
-            <field eval="-1.0" name="ref_tax_sign"/>
-            <field name="type_tax_use">purchase</field>
-        </record>
-        <record id="iva_pymes_IC_compras_8_bi_2" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
-            <field name="parent_id" ref="iva_pymes_IC_compras_8_bi"/>
-            <field name="name">IVA 8% Intracomunitario. Bienes de inversión (2)</field>
-            <field eval="-0.08" name="amount"/>
-            <field name="type">percent</field>
-            <field name="account_paid_id" ref="pgc_pymes_477008"/>
-            <field name="account_collected_id" ref="pgc_pymes_477008"/>
-            <field name="base_code_id" ref="iva_pymes_dev_19"/>
-            <field name="tax_code_id" ref="iva_pymes_dev_20"/>
-            <field eval="-1.0" name="tax_sign"/>
-            <field name="ref_base_code_id" ref="iva_pymes_dev_19"/>
-            <field eval="-1.0" name="ref_base_sign"/>
-            <field name="ref_tax_code_id" ref="iva_pymes_dev_20"/>
-            <field eval="1.0" name="ref_tax_sign"/>
-            <field name="type_tax_use">purchase</field>
-        </record>
 
         <record id="iva_pymes_IC_compras_4_bc" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
@@ -1923,8 +2133,8 @@
             <field name="name">IVA 4% Intracomunitario. Bienes corrientes (1)</field>
             <field eval="0.04" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_paid_id" ref="pgc_pymes_472004"/>
-            <field name="account_collected_id" ref="pgc_pymes_472004"/>
+            <field name="account_paid_id" ref="pgc_pymes_472000"/>
+            <field name="account_collected_id" ref="pgc_pymes_472000"/>
             <field name="base_code_id" ref="iva_pymes_ded_30_4"/>
             <field name="tax_code_id" ref="iva_pymes_ded_31_4"/>
             <field name="ref_base_code_id" ref="iva_pymes_ded_30_4"/>
@@ -1939,8 +2149,8 @@
             <field name="name">IVA 4% Intracomunitario. Bienes corrientes (2)</field>
             <field eval="-0.04" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_paid_id" ref="pgc_pymes_477004"/>
-            <field name="account_collected_id" ref="pgc_pymes_477004"/>
+            <field name="account_paid_id" ref="pgc_pymes_477000"/>
+            <field name="account_collected_id" ref="pgc_pymes_477000"/>
             <field name="base_code_id" ref="iva_pymes_dev_19"/>
             <field name="tax_code_id" ref="iva_pymes_dev_20"/>
             <field eval="-1.0" name="tax_sign"/>
@@ -1966,8 +2176,8 @@
             <field name="name">IVA 4% Intracomunitario. Bienes de inversión (1)</field>
             <field eval="0.04" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_paid_id" ref="pgc_pymes_472004"/>
-            <field name="account_collected_id" ref="pgc_pymes_472004"/>
+            <field name="account_paid_id" ref="pgc_pymes_472000"/>
+            <field name="account_collected_id" ref="pgc_pymes_472000"/>
             <field name="base_code_id" ref="iva_pymes_ded_32_4"/>
             <field name="tax_code_id" ref="iva_pymes_ded_33_4"/>
             <field name="ref_base_code_id" ref="iva_pymes_ded_32_4"/>
@@ -1982,8 +2192,8 @@
             <field name="name">IVA 4% Intracomunitario. Bienes de inversión (2)</field>
             <field eval="-0.04" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_paid_id" ref="pgc_pymes_477004"/>
-            <field name="account_collected_id" ref="pgc_pymes_477004"/>
+            <field name="account_paid_id" ref="pgc_pymes_477000"/>
+            <field name="account_collected_id" ref="pgc_pymes_477000"/>
             <field name="base_code_id" ref="iva_pymes_dev_19"/>
             <field name="tax_code_id" ref="iva_pymes_dev_20"/>
             <field eval="-1.0" name="tax_sign"/>
@@ -1993,7 +2203,539 @@
             <field eval="1.0" name="ref_tax_sign"/>
             <field name="type_tax_use">purchase</field>
         </record>
-        
+        <record id="iva_pymes_IC_compras_7_bc" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+            <field name="name">IVA 7% Intracomunitario. Bienes corrientes</field>
+            <field name="description">IVA 7% Intracomunitario. Bienes corrientes</field>
+            <field eval="1.00" name="amount"/>
+            <field name="type">percent</field>
+            <field eval="1" name="child_depend"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_pymes_IC_compras_7_bc_1" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+            <field name="parent_id" ref="iva_pymes_IC_compras_7_bc"/>
+            <field name="name">IVA 7% Intracomunitario. Bienes corrientes (1)</field>
+            <field eval="0.07" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_pymes_472000"/>
+            <field name="account_collected_id" ref="pgc_pymes_472000"/>
+            <field name="base_code_id" ref="iva_pymes_ded_30_7"/>
+            <field name="tax_code_id" ref="iva_pymes_ded_31_7"/>
+            <field name="ref_base_code_id" ref="iva_pymes_ded_30_7"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="ref_tax_code_id" ref="iva_pymes_ded_31_7"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_pymes_IC_compras_7_bc_2" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+            <field name="parent_id" ref="iva_pymes_IC_compras_7_bc"/>
+            <field name="name">IVA 7% Intracomunitario. Bienes corrientes (2)</field>
+            <field eval="-0.07" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_pymes_477000"/>
+            <field name="account_collected_id" ref="pgc_pymes_477000"/>
+            <field name="base_code_id" ref="iva_pymes_dev_19"/>
+            <field name="tax_code_id" ref="iva_pymes_dev_20"/>
+            <field eval="-1.0" name="tax_sign"/>
+            <field name="ref_base_code_id" ref="iva_pymes_dev_19"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="ref_tax_code_id" ref="iva_pymes_dev_20"/>
+            <field eval="1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="iva_pymes_IC_compras_7_bi" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+            <field name="name">IVA 7% Intracomunitario. Bienes de inversión</field>
+            <field name="description">IVA 7% Intracomunitario. Bienes de inversión</field>
+            <field eval="1.00" name="amount"/>
+            <field name="type">percent</field>
+            <field eval="1" name="child_depend"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="iva_pymes_IC_compras_7_bi_1" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+            <field name="parent_id" ref="iva_pymes_IC_compras_7_bi"/>
+            <field name="name">IVA 7% Intracomunitario. Bienes de inversión (1)</field>
+            <field eval="0.07" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_pymes_472000"/>
+            <field name="account_collected_id" ref="pgc_pymes_472000"/>
+            <field name="base_code_id" ref="iva_pymes_ded_32_7"/>
+            <field name="tax_code_id" ref="iva_pymes_ded_33_7"/>
+            <field name="ref_base_code_id" ref="iva_pymes_ded_32_7"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="ref_tax_code_id" ref="iva_pymes_ded_33_7"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="iva_pymes_IC_compras_7_bi_2" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+            <field name="parent_id" ref="iva_pymes_IC_compras_7_bi"/>
+            <field name="name">IVA 7% Intracomunitario. Bienes de inversión (2)</field>
+            <field eval="-0.07" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_pymes_477000"/>
+            <field name="account_collected_id" ref="pgc_pymes_477000"/>
+            <field name="base_code_id" ref="iva_pymes_dev_19"/>
+            <field name="tax_code_id" ref="iva_pymes_dev_20"/>
+            <field eval="-1.0" name="tax_sign"/>
+            <field name="ref_base_code_id" ref="iva_pymes_dev_19"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="ref_tax_code_id" ref="iva_pymes_dev_20"/>
+            <field eval="1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="iva_pymes_IC_compras_8_bc" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+            <field name="name">IVA 8% Intracomunitario. Bienes corrientes</field>
+            <field name="description">IVA 8% Intracomunitario. Bienes corrientes</field>
+            <field eval="1.00" name="amount"/>
+            <field name="type">percent</field>
+            <field eval="1" name="child_depend"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_pymes_IC_compras_8_bc_1" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+            <field name="parent_id" ref="iva_pymes_IC_compras_8_bc"/>
+            <field name="name">IVA 8% Intracomunitario. Bienes corrientes (1)</field>
+            <field eval="0.08" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_pymes_472000"/>
+            <field name="account_collected_id" ref="pgc_pymes_472000"/>
+            <field name="base_code_id" ref="iva_pymes_ded_30_8"/>
+            <field name="tax_code_id" ref="iva_pymes_ded_31_8"/>
+            <field name="ref_base_code_id" ref="iva_pymes_ded_30_8"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="ref_tax_code_id" ref="iva_pymes_ded_31_8"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_pymes_IC_compras_8_bc_2" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+            <field name="parent_id" ref="iva_pymes_IC_compras_8_bc"/>
+            <field name="name">IVA 8% Intracomunitario. Bienes corrientes (2)</field>
+            <field eval="-0.08" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_pymes_477000"/>
+            <field name="account_collected_id" ref="pgc_pymes_477000"/>
+            <field name="base_code_id" ref="iva_pymes_dev_19"/>
+            <field name="tax_code_id" ref="iva_pymes_dev_20"/>
+            <field eval="-1.0" name="tax_sign"/>
+            <field name="ref_base_code_id" ref="iva_pymes_dev_19"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="ref_tax_code_id" ref="iva_pymes_dev_20"/>
+            <field eval="1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="iva_pymes_IC_compras_8_bi" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+            <field name="name">IVA 8% Intracomunitario. Bienes de inversión</field>
+            <field name="description">IVA 8% Intracomunitario. Bienes de inversión</field>
+            <field eval="1.00" name="amount"/>
+            <field name="type">percent</field>
+            <field eval="1" name="child_depend"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_pymes_IC_compras_8_bi_1" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+            <field name="parent_id" ref="iva_pymes_IC_compras_8_bi"/>
+            <field name="name">IVA 8% Intracomunitario. Bienes de inversión (1)</field>
+            <field eval="0.08" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_pymes_472000"/>
+            <field name="account_collected_id" ref="pgc_pymes_472000"/>
+            <field name="base_code_id" ref="iva_pymes_ded_32_8"/>
+            <field name="tax_code_id" ref="iva_pymes_ded_33_8"/>
+            <field name="ref_base_code_id" ref="iva_pymes_ded_32_8"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="ref_tax_code_id" ref="iva_pymes_ded_33_8"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_pymes_IC_compras_8_bi_2" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+            <field name="parent_id" ref="iva_pymes_IC_compras_8_bi"/>
+            <field name="name">IVA 8% Intracomunitario. Bienes de inversión (2)</field>
+            <field eval="-0.08" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_pymes_477000"/>
+            <field name="account_collected_id" ref="pgc_pymes_477000"/>
+            <field name="base_code_id" ref="iva_pymes_dev_19"/>
+            <field name="tax_code_id" ref="iva_pymes_dev_20"/>
+            <field eval="-1.0" name="tax_sign"/>
+            <field name="ref_base_code_id" ref="iva_pymes_dev_19"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="ref_tax_code_id" ref="iva_pymes_dev_20"/>
+            <field eval="1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="iva_pymes_IC_compras_10_bc" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+            <field name="name">IVA 10% Intracomunitario. Bienes corrientes</field>
+            <field name="description">IVA 10% Intracomunitario. Bienes corrientes</field>
+            <field eval="1.00" name="amount"/>
+            <field name="type">percent</field>
+            <field eval="1" name="child_depend"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_pymes_IC_compras_10_bc_1" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+            <field name="parent_id" ref="iva_pymes_IC_compras_10_bc"/>
+            <field name="name">IVA 10% Intracomunitario. Bienes corrientes (1)</field>
+            <field eval="0.10" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_pymes_472000"/>
+            <field name="account_collected_id" ref="pgc_pymes_472000"/>
+            <field name="base_code_id" ref="iva_pymes_ded_30_10"/>
+            <field name="tax_code_id" ref="iva_pymes_ded_31_10"/>
+            <field name="ref_base_code_id" ref="iva_pymes_ded_30_10"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="ref_tax_code_id" ref="iva_pymes_ded_31_8"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_pymes_IC_compras_10_bc_2" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+            <field name="parent_id" ref="iva_pymes_IC_compras_10_bc"/>
+            <field name="name">IVA 10% Intracomunitario. Bienes corrientes (2)</field>
+            <field eval="-0.10" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_pymes_477000"/>
+            <field name="account_collected_id" ref="pgc_pymes_477000"/>
+            <field name="base_code_id" ref="iva_pymes_dev_19"/>
+            <field name="tax_code_id" ref="iva_pymes_dev_20"/>
+            <field eval="-1.0" name="tax_sign"/>
+            <field name="ref_base_code_id" ref="iva_pymes_dev_19"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="ref_tax_code_id" ref="iva_pymes_dev_20"/>
+            <field eval="1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="iva_pymes_IC_compras_10_bi" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+            <field name="name">IVA 10% Intracomunitario. Bienes de inversión</field>
+            <field name="description">IVA 10% Intracomunitario. Bienes de inversión</field>
+            <field eval="1.00" name="amount"/>
+            <field name="type">percent</field>
+            <field eval="1" name="child_depend"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_pymes_IC_compras_10_bi_1" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+            <field name="parent_id" ref="iva_pymes_IC_compras_10_bi"/>
+            <field name="name">IVA 10% Intracomunitario. Bienes de inversión (1)</field>
+            <field eval="0.10" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_pymes_472000"/>
+            <field name="account_collected_id" ref="pgc_pymes_472000"/>
+            <field name="base_code_id" ref="iva_pymes_ded_32_10"/>
+            <field name="tax_code_id" ref="iva_pymes_ded_33_10"/>
+            <field name="ref_base_code_id" ref="iva_pymes_ded_32_10"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="ref_tax_code_id" ref="iva_pymes_ded_33_10"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_pymes_IC_compras_10_bi_2" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+            <field name="parent_id" ref="iva_pymes_IC_compras_10_bi"/>
+            <field name="name">IVA 10% Intracomunitario. Bienes de inversión (2)</field>
+            <field eval="-0.10" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_pymes_477000"/>
+            <field name="account_collected_id" ref="pgc_pymes_477000"/>
+            <field name="base_code_id" ref="iva_pymes_dev_19"/>
+            <field name="tax_code_id" ref="iva_pymes_dev_20"/>
+            <field eval="-1.0" name="tax_sign"/>
+            <field name="ref_base_code_id" ref="iva_pymes_dev_19"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="ref_tax_code_id" ref="iva_pymes_dev_20"/>
+            <field eval="1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="iva_pymes_IC_compras_16_bc" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+            <field name="name">IVA 16% Intracomunitario. Bienes corrientes</field>
+            <field name="description">IVA 16% Intracomunitario. Bienes corrientes</field>
+            <field eval="1.00" name="amount"/>
+            <field name="type">percent</field>
+            <field eval="1" name="child_depend"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_pymes_IC_compras_16_bc_1" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+            <field name="parent_id" ref="iva_pymes_IC_compras_16_bc"/>
+            <field name="name">IVA 16% Intracomunitario. Bienes corrientes (1)</field>
+            <field eval="0.16" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_pymes_472000"/>
+            <field name="account_collected_id" ref="pgc_pymes_472000"/>
+            <field name="base_code_id" ref="iva_pymes_ded_30_16"/>
+            <field name="tax_code_id" ref="iva_pymes_ded_31_16"/>
+            <field name="ref_base_code_id" ref="iva_pymes_ded_30_16"/>
+            <field name="ref_tax_code_id" ref="iva_pymes_ded_31_16"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_pymes_IC_compras_16_bc_2" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+            <field name="parent_id" ref="iva_pymes_IC_compras_16_bc"/>
+            <field name="name">IVA 16% Intracomunitario. Bienes corrientes (2)</field>
+            <field eval="-0.16" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_pymes_477000"/>
+            <field name="account_collected_id" ref="pgc_pymes_477000"/>
+            <field name="base_code_id" ref="iva_pymes_dev_19"/>
+            <field name="tax_code_id" ref="iva_pymes_dev_20"/>
+            <field eval="-1.0" name="tax_sign"/>
+            <field name="ref_base_code_id" ref="iva_pymes_dev_19"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <!--ATENCIÓN AQUÍ CON LOS SIGNOS. PENDIENTE DE PRUEBA EN PROFUNDIDAD-->
+            <field name="ref_tax_code_id" ref="iva_pymes_dev_20"/>
+            <field eval="1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="iva_pymes_IC_compras_16_bi" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+            <field name="name">IVA 16% Intracomunitario. Bienes de inversión</field>
+            <field name="description">IVA 16% Intracomunitario. Bienes de inversión</field>
+            <field eval="1.00" name="amount"/>
+            <field name="type">percent</field>
+            <field eval="1" name="child_depend"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_pymes_IC_compras_16_bi_1" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+            <field name="parent_id" ref="iva_pymes_IC_compras_16_bi"/>
+            <field name="name">IVA 16% Intracomunitario. Bienes de inversión (1)</field>
+            <field eval="0.16" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_pymes_472000"/>
+            <field name="account_collected_id" ref="pgc_pymes_472000"/>
+            <field name="base_code_id" ref="iva_pymes_ded_32_16"/>
+            <field name="tax_code_id" ref="iva_pymes_ded_33_16"/>
+            <field name="ref_base_code_id" ref="iva_pymes_ded_32_16"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="ref_tax_code_id" ref="iva_pymes_ded_33_16"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_pymes_IC_compras_16_bi_2" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+            <field name="parent_id" ref="iva_pymes_IC_compras_16_bi"/>
+            <field name="name">IVA 16% Intracomunitario. Bienes de inversión (2)</field>
+            <field eval="-0.16" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_pymes_477000"/>
+            <field name="account_collected_id" ref="pgc_pymes_477000"/>
+            <field name="base_code_id" ref="iva_pymes_dev_19"/>
+            <field name="tax_code_id" ref="iva_pymes_dev_20"/>
+            <field eval="-1.0" name="tax_sign"/>
+            <field name="ref_base_code_id" ref="iva_pymes_dev_19"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="ref_tax_code_id" ref="iva_pymes_dev_20"/>
+            <field eval="1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="iva_pymes_IC_compras_18_bc" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+            <field name="name">IVA 18% Intracomunitario. Bienes corrientes</field>
+            <field name="description">IVA 18% Intracomunitario. Bienes corrientes</field>
+            <field eval="1.00" name="amount"/>
+            <field name="type">percent</field>
+            <field eval="1" name="child_depend"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_pymes_IC_compras_18_bc_1" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+            <field name="parent_id" ref="iva_pymes_IC_compras_18_bc"/>
+            <field name="name">IVA 18% Intracomunitario. Bienes corrientes (1)</field>
+            <field eval="0.18" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_pymes_472000"/>
+            <field name="account_collected_id" ref="pgc_pymes_472000"/>
+            <field name="base_code_id" ref="iva_pymes_ded_30_18"/>
+            <field name="tax_code_id" ref="iva_pymes_ded_31_18"/>
+            <field name="ref_base_code_id" ref="iva_pymes_ded_30_18"/>
+            <field name="ref_tax_code_id" ref="iva_pymes_ded_31_18"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_pymes_IC_compras_18_bc_2" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+            <field name="parent_id" ref="iva_pymes_IC_compras_18_bc"/>
+            <field name="name">IVA 18% Intracomunitario. Bienes corrientes (2)</field>
+            <field eval="-0.18" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_pymes_477000"/>
+            <field name="account_collected_id" ref="pgc_pymes_477000"/>
+            <field name="base_code_id" ref="iva_pymes_dev_19"/>
+            <field name="tax_code_id" ref="iva_pymes_dev_20"/>
+            <field eval="-1.0" name="tax_sign"/>
+            <field name="ref_base_code_id" ref="iva_pymes_dev_19"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <!--ATENCIÓN AQUÍ CON LOS SIGNOS. PENDIENTE DE PRUEBA EN PROFUNDIDAD-->
+            <field name="ref_tax_code_id" ref="iva_pymes_dev_20"/>
+            <field eval="1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <!--record id="vat_IO_buy_21b_3" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+            <field name="parent_id" ref="vat_IO_buy_21b"/>
+            <field name="name">Biens Déductibles 21% (3)</field>
+            <field eval="0.00" name="amount"/>
+            <field name="type">percent</field>
+            <field name="ref_base_code_id" ref="vat_code_a86"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record-->
+<!-- ES NECESARIO ESTE ÚLTIMO REGISTRO????-->
+
+		<record id="iva_pymes_IC_compras_18_bi" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+            <field name="name">IVA 18% Intracomunitario. Bienes de inversión</field>
+            <field name="description">IVA 18% Intracomunitario. Bienes de inversión</field>
+            <field eval="1.00" name="amount"/>
+            <field name="type">percent</field>
+            <field eval="1" name="child_depend"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_pymes_IC_compras_18_bi_1" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+            <field name="parent_id" ref="iva_pymes_IC_compras_18_bi"/>
+            <field name="name">IVA 18% Intracomunitario. Bienes de inversión (1)</field>
+            <field eval="0.18" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_pymes_472000"/>
+            <field name="account_collected_id" ref="pgc_pymes_472000"/>
+            <field name="base_code_id" ref="iva_pymes_ded_32_18"/>
+            <field name="tax_code_id" ref="iva_pymes_ded_33_18"/>
+            <field name="ref_base_code_id" ref="iva_pymes_ded_32_18"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="ref_tax_code_id" ref="iva_pymes_ded_33_18"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_pymes_IC_compras_18_bi_2" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+            <field name="parent_id" ref="iva_pymes_IC_compras_18_bi"/>
+            <field name="name">IVA 18% Intracomunitario. Bienes de inversión (2)</field>
+            <field eval="-0.18" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_pymes_477000"/>
+            <field name="account_collected_id" ref="pgc_pymes_477000"/>
+            <field name="base_code_id" ref="iva_pymes_dev_19"/>
+            <field name="tax_code_id" ref="iva_pymes_dev_20"/>
+            <field eval="-1.0" name="tax_sign"/>
+            <field name="ref_base_code_id" ref="iva_pymes_dev_19"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="ref_tax_code_id" ref="iva_pymes_dev_20"/>
+            <field eval="1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+
+		<record id="iva_pymes_IC_compras_21_bc" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+            <field name="name">IVA 21% Intracomunitario. Bienes corrientes</field>
+            <field name="description">IVA 21% Intracomunitario. Bienes corrientes</field>
+            <field eval="1.00" name="amount"/>
+            <field name="type">percent</field>
+            <field eval="1" name="child_depend"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_pymes_IC_compras_21_bc_1" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+            <field name="parent_id" ref="iva_pymes_IC_compras_21_bc"/>
+            <field name="name">IVA 21% Intracomunitario. Bienes corrientes (1)</field>
+            <field eval="0.21" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_pymes_472000"/>
+            <field name="account_collected_id" ref="pgc_pymes_472000"/>
+            <field name="base_code_id" ref="iva_pymes_ded_30_21"/>
+            <field name="tax_code_id" ref="iva_pymes_ded_31_21"/>
+            <field name="ref_base_code_id" ref="iva_pymes_ded_30_21"/>
+            <field name="ref_tax_code_id" ref="iva_pymes_ded_31_21"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_pymes_IC_compras_21_bc_2" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+            <field name="parent_id" ref="iva_pymes_IC_compras_21_bc"/>
+            <field name="name">IVA 21% Intracomunitario. Bienes corrientes (2)</field>
+            <field eval="-0.21" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_pymes_477000"/>
+            <field name="account_collected_id" ref="pgc_pymes_477000"/>
+            <field name="base_code_id" ref="iva_pymes_dev_19"/>
+            <field name="tax_code_id" ref="iva_pymes_dev_20"/>
+            <field eval="-1.0" name="tax_sign"/>
+            <field name="ref_base_code_id" ref="iva_pymes_dev_19"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <!--ATENCIÓN AQUÍ CON LOS SIGNOS. PENDIENTE DE PRUEBA EN PROFUNDIDAD-->
+            <field name="ref_tax_code_id" ref="iva_pymes_dev_20"/>
+            <field eval="1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+		<record id="iva_pymes_IC_compras_21_bi" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+            <field name="name">IVA 21% Intracomunitario. Bienes de inversión</field>
+            <field name="description">IVA 21% Intracomunitario. Bienes de inversión</field>
+            <field eval="1.00" name="amount"/>
+            <field name="type">percent</field>
+            <field eval="1" name="child_depend"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_pymes_IC_compras_21_bi_1" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+            <field name="parent_id" ref="iva_pymes_IC_compras_21_bi"/>
+            <field name="name">IVA 21% Intracomunitario. Bienes de inversión (1)</field>
+            <field eval="0.21" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_pymes_472000"/>
+            <field name="account_collected_id" ref="pgc_pymes_472000"/>
+            <field name="base_code_id" ref="iva_pymes_ded_32_21"/>
+            <field name="tax_code_id" ref="iva_pymes_ded_33_21"/>
+            <field name="ref_base_code_id" ref="iva_pymes_ded_32_21"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="ref_tax_code_id" ref="iva_pymes_ded_33_21"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_pymes_IC_compras_21_bi_2" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+            <field name="parent_id" ref="iva_pymes_IC_compras_21_bi"/>
+            <field name="name">IVA 21% Intracomunitario. Bienes de inversión (2)</field>
+            <field eval="-0.21" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_pymes_477000"/>
+            <field name="account_collected_id" ref="pgc_pymes_477000"/>
+            <field name="base_code_id" ref="iva_pymes_dev_19"/>
+            <field name="tax_code_id" ref="iva_pymes_dev_20"/>
+            <field eval="-1.0" name="tax_sign"/>
+            <field name="ref_base_code_id" ref="iva_pymes_dev_19"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="ref_tax_code_id" ref="iva_pymes_dev_20"/>
+            <field eval="1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
         <!-- RETENCIONES DE IRPF -->
         <!--
         - Novedad 2010: Los rendimientos derivados de rentas de capital mobiliario o inmobiliario, el tipo base de retención pasa del 18% al 19% para los primeros 6000 EUR y al 21% a partir de los 6000 EUR.
@@ -2001,9 +2743,9 @@
         - Rendimientos de actividades profesionales: 15% (tipo general) y 7% (tipo especial reducido por inicio de actividad)
         - Rendimientos de actividades agrícolas, ganaderas, forestales: 2%
         - Retención del 1% a aplicar en el pago de rendimientos a empresarios en módulos.-->
-        
+
         <!-- RETENCIONES DE IRPF: Hacienda pública, acreedora por retenciones practicadas a proveedores -->
-        
+
         <!--Base imponible-->
         <record id="irpf_pymes_base" model="account.tax.code.template">
             <field name="name">IRPF Retenciones practicadas Base Imponible</field>
@@ -2011,56 +2753,70 @@
             <field name="sign">1.0</field>
             <field name="parent_id" ref="vat_code_chart_pymes_root"/>
         </record>
-        
+
         <record id="irpf_pymes_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_pymes_base"/>
             <field name="sign">1.0</field>
         </record>
-        
+
         <record id="irpf_pymes_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_pymes_base"/>
             <field name="sign">1.0</field>
         </record>
-        
+
         <record id="irpf_pymes_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_pymes_base"/>
             <field name="sign">1.0</field>
         </record>
-        
+
+        <record id="irpf_pymes_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_pymes_base"/>
+            <field name="sign">1.0</field>
+        </record>
+
         <record id="irpf_pymes_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_pymes_base"/>
             <field name="sign">1.0</field>
         </record>
-        
+
         <record id="irpf_pymes_base_18" model="account.tax.code.template">
             <field name="name">IRPF Retenciones practicadas Base Imponible 18%</field>
             <field name="code">B.IRPF18</field>
             <field name="parent_id" ref="irpf_pymes_base"/>
             <field name="sign">1.0</field>
         </record>
-        
+
         <record id="irpf_pymes_base_19" model="account.tax.code.template">
             <field name="name">IRPF Retenciones practicadas Base Imponible 19%</field>
             <field name="code">B.IRPF19</field>
             <field name="parent_id" ref="irpf_pymes_base"/>
             <field name="sign">1.0</field>
         </record>
-        
+
+        <record id="irpf_pymes_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_pymes_base"/>
+            <field name="sign">1.0</field>
+        </record>
+
         <record id="irpf_pymes_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_pymes_base"/>
             <field name="sign">1.0</field>
         </record>
-        
+
         <!--Cuotas-->
         <record id="irpf_pymes_cuota_total" model="account.tax.code.template">
             <field name="name">IRPF Retenciones practicadas Total Cuota</field>
@@ -2068,56 +2824,70 @@
             <field name="parent_id" ref="vat_code_chart_pymes_root"/>
             <field name="sign">1.0</field>
         </record>
-        
+
         <record id="irpf_pymes_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_pymes_cuota_total"/>
             <field name="sign">1.0</field>
         </record>
-        
+
         <record id="irpf_pymes_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_pymes_cuota_total"/>
             <field name="sign">1.0</field>
         </record>
-        
+
         <record id="irpf_pymes_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_pymes_cuota_total"/>
             <field name="sign">1.0</field>
         </record>
-        
+
+        <record id="irpf_pymes_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_pymes_cuota_total"/>
+            <field name="sign">1.0</field>
+        </record>
+
         <record id="irpf_pymes_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_pymes_cuota_total"/>
             <field name="sign">1.0</field>
         </record>
-        
+
         <record id="irpf_pymes_cuota_18" model="account.tax.code.template">
             <field name="name">IRPF Retenciones practicadas Cuota 18%</field>
             <field name="code">IRPF18</field>
             <field name="parent_id" ref="irpf_pymes_cuota_total"/>
             <field name="sign">1.0</field>
         </record>
-        
+
         <record id="irpf_pymes_cuota_19" model="account.tax.code.template">
             <field name="name">IRPF Retenciones practicadas Cuota 19%</field>
             <field name="code">IRPF19</field>
             <field name="parent_id" ref="irpf_pymes_cuota_total"/>
             <field name="sign">1.0</field>
         </record>
-        
+
+        <record id="irpf_pymes_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_pymes_cuota_total"/>
+            <field name="sign">1.0</field>
+        </record>
+
         <record id="irpf_pymes_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_pymes_cuota_total"/>
             <field name="sign">1.0</field>
         </record>
-        
+
         <!--Cuentas para Retenciones-->
         <record id="pgc_pymes_475101" model="account.account.template">
             <field name="code">475101</field>
@@ -2127,7 +2897,7 @@
             <field name="name">Hacienda Pública. Retenciones empresarios módulos 1%</field>
             <field name="user_type" ref="tax"/>
         </record>
-        
+
         <record id="pgc_pymes_475102" model="account.account.template">
             <field name="code">475102</field>
             <field name="reconcile" eval="True"/>
@@ -2136,7 +2906,7 @@
             <field name="name">Hacienda Pública. Retenciones act. agrícolas, ganaderas, forestales 2%</field>
             <field name="user_type" ref="tax"/>
         </record>
-        
+
         <record id="pgc_pymes_475107" model="account.account.template">
             <field name="code">475107</field>
             <field name="reconcile" eval="True"/>
@@ -2145,7 +2915,16 @@
             <field name="name">Hacienda Pública. Retenciones act. profesionales 7%</field>
             <field name="user_type" ref="tax"/>
         </record>
-        
+
+        <record id="pgc_pymes_475109" model="account.account.template">
+            <field name="code">475109</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_pymes_4751"/>
+            <field name="type">other</field>
+            <field name="name">Hacienda Pública. Retenciones act. profesionales 9%</field>
+            <field name="user_type" ref="tax"/>
+        </record>
+
         <record id="pgc_pymes_475115" model="account.account.template">
             <field name="code">475115</field>
             <field name="reconcile" eval="True"/>
@@ -2154,7 +2933,7 @@
             <field name="name">Hacienda Pública. Retenciones act. profesionales 15%</field>
             <field name="user_type" ref="tax"/>
         </record>
-        
+
         <record id="pgc_pymes_475118" model="account.account.template">
             <field name="code">475118</field>
             <field name="reconcile" eval="True"/>
@@ -2163,7 +2942,7 @@
             <field name="name">Hacienda Pública. Retenciones arrendamientos, cap. mobiliario 18%</field>
             <field name="user_type" ref="tax"/>
         </record>
-        
+
         <record id="pgc_pymes_475119" model="account.account.template">
             <field name="code">475119</field>
             <field name="reconcile" eval="True"/>
@@ -2172,7 +2951,16 @@
             <field name="name">Hacienda Pública. Retenciones arrendamientos, cap. mobiliario 19%</field>
             <field name="user_type" ref="tax"/>
         </record>
-        
+
+        <record id="pgc_pymes_475120" model="account.account.template">
+            <field name="code">475120</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_pymes_4751"/>
+            <field name="type">other</field>
+            <field name="name">Hacienda Pública. Retenciones arrendamientos, cap. mobiliario 20%</field>
+            <field name="user_type" ref="tax"/>
+        </record>
+
         <record id="pgc_pymes_475121" model="account.account.template">
             <field name="code">475121</field>
             <field name="reconcile" eval="True"/>
@@ -2181,7 +2969,7 @@
             <field name="name">Hacienda Pública. Retenciones arrendamientos, cap. mobiliario 21%</field>
             <field name="user_type" ref="tax"/>
         </record>
-        
+
         <!-- Plantillas de retenciones-->
         <record id="irpf_pymes_1" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
@@ -2200,7 +2988,7 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
         </record>
-        
+
         <record id="irpf_pymes_2" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
             <field name="name">Retenciones IRPF 2%</field>
@@ -2218,7 +3006,7 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
         </record>
-        
+
         <record id="irpf_pymes_7" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
             <field name="name">Retenciones IRPF 7%</field>
@@ -2236,7 +3024,25 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
         </record>
-        
+
+        <record id="irpf_pymes_9" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+            <field name="name">Retenciones IRPF 9%</field>
+            <field eval="-0.09" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_pymes_475109"/>
+            <field name="account_paid_id" ref="pgc_pymes_475109"/>
+            <field name="base_code_id" ref="irpf_pymes_base_9"/>
+            <field name="tax_code_id" ref="irpf_pymes_cuota_9"/>
+            <field name="ref_base_code_id" ref="irpf_pymes_base_9"/>
+            <field name="ref_tax_code_id" ref="irpf_pymes_cuota_9"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
         <record id="irpf_pymes_15" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
             <field name="name">Retenciones IRPF 15%</field>
@@ -2254,7 +3060,7 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
         </record>
-        
+
         <record id="irpf_pymes_18" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
             <field name="name">Retenciones IRPF 18%</field>
@@ -2272,7 +3078,7 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
         </record>
-                
+
         <record id="irpf_pymes_19" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
             <field name="name">Retenciones IRPF 19%</field>
@@ -2291,6 +3097,24 @@
             <field name="type_tax_use">purchase</field>
         </record>
 
+        <record id="irpf_pymes_20" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+            <field name="name">Retenciones IRPF 20%</field>
+            <field eval="-0.20" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_pymes_475120"/>
+            <field name="account_paid_id" ref="pgc_pymes_475120"/>
+            <field name="base_code_id" ref="irpf_pymes_base_20"/>
+            <field name="tax_code_id" ref="irpf_pymes_cuota_20"/>
+            <field name="ref_base_code_id" ref="irpf_pymes_base_20"/>
+            <field name="ref_tax_code_id" ref="irpf_pymes_cuota_20"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
         <record id="irpf_pymes_21" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
             <field name="name">Retenciones IRPF 21%</field>
@@ -2308,9 +3132,9 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
         </record>
-        
+
         <!-- RETENCIONES DE IRPF: Hacienda pública, retenciones a cuenta como clientes -->
-        
+
         <!--Base imponible-->
         <record id="irpf_pymes_base_sale" model="account.tax.code.template">
             <field name="name">IRPF Retenciones a cuenta Base Imponible</field>
@@ -2318,56 +3142,70 @@
             <field name="sign">1.0</field>
             <field name="parent_id" ref="vat_code_chart_pymes_root"/>
         </record>
-        
+
         <record id="irpf_pymes_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_pymes_base_sale"/>
             <field name="sign">1.0</field>
         </record>
-        
+
         <record id="irpf_pymes_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_pymes_base_sale"/>
             <field name="sign">1.0</field>
         </record>
-        
+
         <record id="irpf_pymes_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_pymes_base_sale"/>
             <field name="sign">1.0</field>
         </record>
-        
+
+        <record id="irpf_pymes_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_pymes_base_sale"/>
+            <field name="sign">1.0</field>
+        </record>
+
         <record id="irpf_pymes_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_pymes_base_sale"/>
             <field name="sign">1.0</field>
         </record>
-        
+
         <record id="irpf_pymes_base_sale_18" model="account.tax.code.template">
             <field name="name">IRPF Retenciones a cuenta Base Imponible 18%</field>
             <field name="code">B.IRPF18 AC</field>
             <field name="parent_id" ref="irpf_pymes_base_sale"/>
             <field name="sign">1.0</field>
         </record>
-        
+
         <record id="irpf_pymes_base_sale_19" model="account.tax.code.template">
             <field name="name">IRPF Retenciones a cuenta Base Imponible 19%</field>
             <field name="code">B.IRPF19 AC</field>
             <field name="parent_id" ref="irpf_pymes_base_sale"/>
             <field name="sign">1.0</field>
         </record>
-        
+
+        <record id="irpf_pymes_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_pymes_base_sale"/>
+            <field name="sign">1.0</field>
+        </record>
+
         <record id="irpf_pymes_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_pymes_base_sale"/>
             <field name="sign">1.0</field>
         </record>
-        
+
         <!--Cuotas-->
         <record id="irpf_pymes_cuota_sale_total" model="account.tax.code.template">
             <field name="name">IRPF Retenciones a cuenta Total Cuota</field>
@@ -2375,56 +3213,70 @@
             <field name="parent_id" ref="vat_code_chart_pymes_root"/>
             <field name="sign">1.0</field>
         </record>
-        
+
         <record id="irpf_pymes_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_pymes_cuota_sale_total"/>
             <field name="sign">1.0</field>
         </record>
-        
+
         <record id="irpf_pymes_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_pymes_cuota_sale_total"/>
             <field name="sign">1.0</field>
         </record>
-        
+
         <record id="irpf_pymes_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_pymes_cuota_sale_total"/>
             <field name="sign">1.0</field>
         </record>
-        
+
+        <record id="irpf_pymes_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_pymes_cuota_sale_total"/>
+            <field name="sign">1.0</field>
+        </record>
+
         <record id="irpf_pymes_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_pymes_cuota_sale_total"/>
             <field name="sign">1.0</field>
         </record>
-        
+
         <record id="irpf_pymes_cuota_sale_18" model="account.tax.code.template">
             <field name="name">IRPF Retenciones a cuenta Cuota 18%</field>
             <field name="code">IRPF18 AC</field>
             <field name="parent_id" ref="irpf_pymes_cuota_sale_total"/>
             <field name="sign">1.0</field>
         </record>
-        
+
         <record id="irpf_pymes_cuota_sale_19" model="account.tax.code.template">
             <field name="name">IRPF Retenciones a cuenta Cuota 19%</field>
             <field name="code">IRPF19 AC</field>
             <field name="parent_id" ref="irpf_pymes_cuota_sale_total"/>
             <field name="sign">1.0</field>
         </record>
-        
+
+        <record id="irpf_pymes_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_pymes_cuota_sale_total"/>
+            <field name="sign">1.0</field>
+        </record>
+
         <record id="irpf_pymes_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_pymes_cuota_sale_total"/>
             <field name="sign">1.0</field>
         </record>
-        
+
         <!--Cuentas para Retenciones-->
         <record id="pgc_pymes_473001" model="account.account.template">
             <field name="code">473001</field>
@@ -2434,7 +3286,7 @@
             <field name="name">Hacienda Pública. Retenciones a cuenta empresarios módulos 1%</field>
             <field name="user_type" ref="tax"/>
         </record>
-        
+
         <record id="pgc_pymes_473002" model="account.account.template">
             <field name="code">473002</field>
             <field name="reconcile" eval="True"/>
@@ -2443,7 +3295,7 @@
             <field name="name">Hacienda Pública. Retenciones a cuenta act. agrícolas, ganaderas, forestales 2%</field>
             <field name="user_type" ref="tax"/>
         </record>
-        
+
         <record id="pgc_pymes_473007" model="account.account.template">
             <field name="code">473007</field>
             <field name="reconcile" eval="True"/>
@@ -2452,7 +3304,16 @@
             <field name="name">Hacienda Pública. Retenciones a cuenta act. profesionales 7%</field>
             <field name="user_type" ref="tax"/>
         </record>
-        
+
+        <record id="pgc_pymes_473009" model="account.account.template">
+            <field name="code">473009</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_pymes_473"/>
+            <field name="type">other</field>
+            <field name="name">Hacienda Pública. Retenciones a cuenta act. profesionales 9%</field>
+            <field name="user_type" ref="tax"/>
+        </record>
+
         <record id="pgc_pymes_473015" model="account.account.template">
             <field name="code">473015</field>
             <field name="reconcile" eval="True"/>
@@ -2461,7 +3322,7 @@
             <field name="name">Hacienda Pública. Retenciones a cuenta act. profesionales 15%</field>
             <field name="user_type" ref="tax"/>
         </record>
-        
+
         <record id="pgc_pymes_473018" model="account.account.template">
             <field name="code">473018</field>
             <field name="reconcile" eval="True"/>
@@ -2470,7 +3331,7 @@
             <field name="name">Hacienda Pública. Retenciones a cuenta arrendamientos, cap. mobiliario 18%</field>
             <field name="user_type" ref="tax"/>
         </record>
-        
+
         <record id="pgc_pymes_473019" model="account.account.template">
             <field name="code">473019</field>
             <field name="reconcile" eval="True"/>
@@ -2479,7 +3340,16 @@
             <field name="name">Hacienda Pública. Retenciones a cuenta arrendamientos, cap. mobiliario 19%</field>
             <field name="user_type" ref="tax"/>
         </record>
-        
+
+        <record id="pgc_pymes_473020" model="account.account.template">
+            <field name="code">473020</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_pymes_473"/>
+            <field name="type">other</field>
+            <field name="name">Hacienda Pública. Retenciones a cuenta arrendamientos, cap. mobiliario 20%</field>
+            <field name="user_type" ref="tax"/>
+        </record>
+
         <record id="pgc_pymes_473021" model="account.account.template">
             <field name="code">473021</field>
             <field name="reconcile" eval="True"/>
@@ -2488,7 +3358,7 @@
             <field name="name">Hacienda Pública. Retenciones a cuenta arrendamientos, cap. mobiliario 21%</field>
             <field name="user_type" ref="tax"/>
         </record>
-        
+
         <!-- Plantillas de retenciones-->
         <record id="irpf_pymes_sale_1" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
@@ -2507,7 +3377,7 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">sale</field>
         </record>
-        
+
         <record id="irpf_pymes_sale_2" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
             <field name="name">Retenciones a cuenta IRPF 2%</field>
@@ -2525,7 +3395,7 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">sale</field>
         </record>
-        
+
         <record id="irpf_pymes_sale_7" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
             <field name="name">Retenciones a cuenta IRPF 7%</field>
@@ -2543,7 +3413,25 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">sale</field>
         </record>
-        
+
+        <record id="irpf_pymes_sale_9" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+            <field name="name">Retenciones a cuenta IRPF 9%</field>
+            <field eval="-0.09" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_pymes_473009"/>
+            <field name="account_paid_id" ref="pgc_pymes_473009"/>
+            <field name="base_code_id" ref="irpf_pymes_base_sale_9"/>
+            <field name="tax_code_id" ref="irpf_pymes_cuota_sale_9"/>
+            <field name="ref_base_code_id" ref="irpf_pymes_base_sale_9"/>
+            <field name="ref_tax_code_id" ref="irpf_pymes_cuota_sale_9"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">sale</field>
+        </record>
+
         <record id="irpf_pymes_sale_15" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
             <field name="name">Retenciones a cuenta IRPF 15%</field>
@@ -2561,7 +3449,7 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">sale</field>
         </record>
-        
+
         <record id="irpf_pymes_sale_18" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
             <field name="name">Retenciones a cuenta IRPF 18%</field>
@@ -2579,7 +3467,7 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">sale</field>
         </record>
-        
+
         <record id="irpf_pymes_sale_19" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
             <field name="name">Retenciones a cuenta IRPF 19%</field>
@@ -2597,7 +3485,25 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">sale</field>
         </record>
-        
+
+        <record id="irpf_pymes_sale_20" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+            <field name="name">Retenciones a cuenta IRPF 20%</field>
+            <field eval="-0.20" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_pymes_473020"/>
+            <field name="account_paid_id" ref="pgc_pymes_473020"/>
+            <field name="base_code_id" ref="irpf_pymes_base_sale_20"/>
+            <field name="tax_code_id" ref="irpf_pymes_cuota_sale_20"/>
+            <field name="ref_base_code_id" ref="irpf_pymes_base_sale_20"/>
+            <field name="ref_tax_code_id" ref="irpf_pymes_cuota_sale_20"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">sale</field>
+        </record>
+
         <record id="irpf_pymes_sale_21" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
             <field name="name">Retenciones a cuenta IRPF 21%</field>
diff --git a/addons/l10n_fr/__init__.py b/addons/l10n_fr/__init__.py
index 8d5728e334e..592068eedda 100644
--- a/addons/l10n_fr/__init__.py
+++ b/addons/l10n_fr/__init__.py
@@ -22,7 +22,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
 ##############################################################################
 
diff --git a/addons/l10n_fr/__openerp__.py b/addons/l10n_fr/__openerp__.py
index e1d4b9ac334..9a563eeb197 100644
--- a/addons/l10n_fr/__openerp__.py
+++ b/addons/l10n_fr/__openerp__.py
@@ -22,7 +22,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
 ##############################################################################
 {
diff --git a/addons/l10n_fr/l10n_fr_view.xml b/addons/l10n_fr/l10n_fr_view.xml
old mode 100755
new mode 100644
diff --git a/addons/l10n_fr/report/__init__.py b/addons/l10n_fr/report/__init__.py
index 9907a2f5765..c73179a9023 100644
--- a/addons/l10n_fr/report/__init__.py
+++ b/addons/l10n_fr/report/__init__.py
@@ -22,7 +22,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
 ##############################################################################
 
diff --git a/addons/l10n_fr/report/base_report.py b/addons/l10n_fr/report/base_report.py
index 39a18bc7ca4..bc2cd308bf8 100644
--- a/addons/l10n_fr/report/base_report.py
+++ b/addons/l10n_fr/report/base_report.py
@@ -22,7 +22,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
 ##############################################################################
 
diff --git a/addons/l10n_fr/report/bilan_report.py b/addons/l10n_fr/report/bilan_report.py
index a7947434da0..2ffbd24cc4f 100644
--- a/addons/l10n_fr/report/bilan_report.py
+++ b/addons/l10n_fr/report/bilan_report.py
@@ -22,7 +22,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
 ##############################################################################
 
diff --git a/addons/l10n_fr/report/compute_resultant_report.py b/addons/l10n_fr/report/compute_resultant_report.py
index 9a1809fd7cc..5eb62d7e82d 100644
--- a/addons/l10n_fr/report/compute_resultant_report.py
+++ b/addons/l10n_fr/report/compute_resultant_report.py
@@ -22,7 +22,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
 ##############################################################################
 
diff --git a/addons/l10n_fr/wizard/__init__.py b/addons/l10n_fr/wizard/__init__.py
index 6e29471a975..1bbaf351ea4 100644
--- a/addons/l10n_fr/wizard/__init__.py
+++ b/addons/l10n_fr/wizard/__init__.py
@@ -22,7 +22,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
 ##############################################################################
 
diff --git a/addons/l10n_fr/wizard/fr_report_bilan.py b/addons/l10n_fr/wizard/fr_report_bilan.py
index 291557f8fba..e7ae542fa3f 100644
--- a/addons/l10n_fr/wizard/fr_report_bilan.py
+++ b/addons/l10n_fr/wizard/fr_report_bilan.py
@@ -22,7 +22,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
 ##############################################################################
 
diff --git a/addons/l10n_fr/wizard/fr_report_compute_resultant.py b/addons/l10n_fr/wizard/fr_report_compute_resultant.py
index 8d8aed8baff..c83f7494d4a 100644
--- a/addons/l10n_fr/wizard/fr_report_compute_resultant.py
+++ b/addons/l10n_fr/wizard/fr_report_compute_resultant.py
@@ -22,7 +22,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
 ##############################################################################
 
diff --git a/addons/l10n_fr_hr_payroll/__init__.py b/addons/l10n_fr_hr_payroll/__init__.py
old mode 100755
new mode 100644
diff --git a/addons/l10n_fr_hr_payroll/__openerp__.py b/addons/l10n_fr_hr_payroll/__openerp__.py
old mode 100755
new mode 100644
diff --git a/addons/l10n_fr_hr_payroll/l10n_fr_hr_payroll_data.xml b/addons/l10n_fr_hr_payroll/l10n_fr_hr_payroll_data.xml
old mode 100755
new mode 100644
diff --git a/addons/l10n_fr_hr_payroll/l10n_fr_hr_payroll_view.xml b/addons/l10n_fr_hr_payroll/l10n_fr_hr_payroll_view.xml
old mode 100755
new mode 100644
diff --git a/addons/l10n_fr_hr_payroll/report/__init__.py b/addons/l10n_fr_hr_payroll/report/__init__.py
index 40d2ccc3c05..d6c9481579e 100644
--- a/addons/l10n_fr_hr_payroll/report/__init__.py
+++ b/addons/l10n_fr_hr_payroll/report/__init__.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 #-*- coding:utf-8 -*-
 
 ##############################################################################
diff --git a/addons/l10n_hr/l10n_hr_chart_template.xml b/addons/l10n_hr/l10n_hr_chart_template.xml
old mode 100755
new mode 100644
diff --git a/addons/l10n_in_hr_payroll/report/__init__.py b/addons/l10n_in_hr_payroll/report/__init__.py
index 8a20170c384..e76f45b69c0 100644
--- a/addons/l10n_in_hr_payroll/report/__init__.py
+++ b/addons/l10n_in_hr_payroll/report/__init__.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 #-*- coding:utf-8 -*-
 
 ##############################################################################
diff --git a/addons/l10n_nl/__init__.py b/addons/l10n_nl/__init__.py
index 57a3bb10df3..ee9f0292f12 100644
--- a/addons/l10n_nl/__init__.py
+++ b/addons/l10n_nl/__init__.py
@@ -22,7 +22,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
 ##############################################################################
 
diff --git a/addons/l10n_nl/__openerp__.py b/addons/l10n_nl/__openerp__.py
index 5e811511c01..aec85016ea5 100644
--- a/addons/l10n_nl/__openerp__.py
+++ b/addons/l10n_nl/__openerp__.py
@@ -22,7 +22,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
 ##############################################################################
 #
diff --git a/addons/l10n_nl/account_chart_netherlands.xml b/addons/l10n_nl/account_chart_netherlands.xml
index 516c88bdcf9..c7eefb42cde 100644
--- a/addons/l10n_nl/account_chart_netherlands.xml
+++ b/addons/l10n_nl/account_chart_netherlands.xml
@@ -3940,7 +3940,7 @@
         <record id="btw_code_2a" model="account.tax.code.template">
             <field name="code">2a</field>
             <field name="parent_id" ref="btw_code_verlegging"/>
-            <field name="name">Leveringen/diensten waarbij de heffing van omzetbelasting naar u is verlegd (BTW)</field>
+            <field name="name">Heffing van omzetbelasting is naar u verlegd (BTW)</field>
         </record>
 <!-- Voor rubriek 3 hoeft geen omzetbelasting aangegeven te worden, wel het omzet bedrag, zie hiervoor verderop
      3. Leveringen naar het buitenland -->
@@ -4052,7 +4052,7 @@
         <record id="omz_code_2a" model="account.tax.code.template">
             <field name="code">2a</field>
             <field name="parent_id" ref="omz_code_verlegging"/>
-            <field name="name">Leveringen/diensten waarbij de heffing van omzetbelasting naar u is verlegd (omzet)</field>
+            <field name="name">Heffing van omzetbelasting is naar u verlegd (omzet)</field>
         </record>
 <!-- 3. Leveringen naar het buitenland -->
         <record id="omz_code_naar_buitenland" model="account.tax.code.template">
@@ -4260,7 +4260,7 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge
             <field eval="omz_code_1e" name="ref_base_code_id"/>
             <field name="ref_base_sign" eval="-1"/>
             <field name="ref_tax_sign" eval="-1"/>
-            <field name="type_tax_use">purchase</field>
+            <field name="type_tax_use">sale</field>
         </record>
         <record id="btw_ink_0" model="account.tax.template">
             <field name="sequence">15</field>
@@ -4279,9 +4279,9 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge
             <field eval="True" name="child_depend"/>
         </record>
         <record id="btw_ink_0_1" model="account.tax.template">
-            <field name="sequence">99</field>
+            <field name="sequence">98</field>
             <field name="chart_template_id" ref="l10nnl_chart_template"/>
-            <field name="name">BTW af te dragen verlegd (inkopen1)</field>
+            <field name="name">BTW te vorderen verlegd (inkopen1)</field>
             <field eval="1.00" name="amount"/>
             <field name="type">percent</field>
             <field eval="btw_ink_0" name="parent_id"/>
@@ -4304,54 +4304,8 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge
             <field name="account_paid_id" ref="vat_payable_verlegd"/>
             <field eval="btw_code_5b" name="tax_code_id"/>
             <field eval="btw_code_5b" name="ref_tax_code_id"/>
+            <field name="tax_sign" eval="-1"/>
             <field name="ref_base_sign" eval="-1"/>
-            <field name="ref_tax_sign" eval="-1"/>
-            <field name="type_tax_use">purchase</field>
-        </record>
-        <record id="btw_ink2_0" model="account.tax.template">
-            <field name="sequence">15</field>
-            <field name="chart_template_id" ref="l10nnl_chart_template"/>
-            <field name="name">BTW te vorderen verlegd (inkopen)</field>
-            <field name="description">21% BTW verlegd</field>
-            <field eval="0.21" name="amount"/>
-            <field name="type">percent</field>
-            <field name="account_collected_id" ref="vat_refund_verlegd"/>
-            <field name="account_paid_id" ref="vat_refund_verlegd"/>
-            <field eval="omz_code_2a" name="base_code_id"/>
-            <field eval="omz_code_2a" name="ref_base_code_id"/>
-            <field name="ref_base_sign" eval="-1"/>
-            <field name="ref_tax_sign" eval="-1"/>
-            <field name="type_tax_use">purchase</field>
-            <field eval="True" name="child_depend"/>
-        </record>
-        <record id="btw_ink2_0_1" model="account.tax.template">
-            <field name="sequence">99</field>
-            <field name="chart_template_id" ref="l10nnl_chart_template"/>
-            <field name="name">BTW te vorderen verlegd (inkopen1)</field>
-            <field eval="1.00" name="amount"/>
-            <field name="type">percent</field>
-            <field eval="btw_ink2_0" name="parent_id"/>
-            <field name="account_collected_id" ref="vat_refund_verlegd"/>
-            <field name="account_paid_id" ref="vat_refund_verlegd"/>
-            <field eval="btw_code_2a" name="tax_code_id"/>
-            <field eval="btw_code_2a" name="ref_tax_code_id"/>
-            <field name="ref_base_sign" eval="-1"/>
-            <field name="ref_tax_sign" eval="-1"/>
-            <field name="type_tax_use">purchase</field>
-        </record>
-        <record id="btw_ink2_0_2" model="account.tax.template">
-            <field name="sequence">99</field>
-            <field name="chart_template_id" ref="l10nnl_chart_template"/>
-            <field name="name">BTW te vorderen verlegd (inkopen2)</field>
-            <field eval="-1.00" name="amount"/>
-            <field name="type">percent</field>
-            <field eval="btw_ink2_0" name="parent_id"/>
-            <field name="account_collected_id" ref="vat_refund_verlegd"/>
-            <field name="account_paid_id" ref="vat_refund_verlegd"/>
-            <field eval="btw_code_5b" name="tax_code_id"/>
-            <field eval="btw_code_5b" name="ref_tax_code_id"/>
-            <field name="ref_base_sign" eval="-1"/>
-            <field name="ref_tax_sign" eval="-1"/>
             <field name="type_tax_use">purchase</field>
         </record>
 <!-- Binnen de EU -->
@@ -4402,6 +4356,7 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge
         </record>
         <record id="btw_I_21" model="account.tax.template">
             <field name="chart_template_id" ref="l10nnl_chart_template"/>
+            <field name="sequence">20</field>
             <field name="name">Inkopen import binnen EU hoog</field>
             <field name="description">21% BTW import binnen EU</field>
             <field eval="0.21" name="amount"/>
diff --git a/addons/l10n_nl/account_fiscal_position_tax_template.xml b/addons/l10n_nl/account_fiscal_position_tax_template.xml
index 622ffafa67c..9fe9a3df786 100644
--- a/addons/l10n_nl/account_fiscal_position_tax_template.xml
+++ b/addons/l10n_nl/account_fiscal_position_tax_template.xml
@@ -90,6 +90,13 @@
             <field name="tax_dest_id" ref="l10n_nl.btw_I_overig"/>
         </record>
         
+        <record id="position_tax_transferred" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fiscal_position_template_transferred"/>
+            <field name="tax_src_id" ref="l10n_nl.btw_21_buy"/>
+            <field name="tax_dest_id" ref="l10n_nl.btw_ink_0"/>
+        </record>
+
+
         <!-- Again, Belgian schema has 17 (!) more records. Missing VAT 0
              and separation of goods and services .. -->
 
diff --git a/addons/l10n_nl/account_fiscal_position_template.xml b/addons/l10n_nl/account_fiscal_position_template.xml
index fe658c6d4b7..1c69f2d1198 100644
--- a/addons/l10n_nl/account_fiscal_position_template.xml
+++ b/addons/l10n_nl/account_fiscal_position_template.xml
@@ -7,6 +7,10 @@
             <field name="name">Binnenland</field>
             <field name="chart_template_id" ref="l10nnl_chart_template" />
         </record>
+        <record id="fiscal_position_template_transferred" model="account.fiscal.position.template">
+            <field name="name">BTW verlegd</field>
+            <field name="chart_template_id" ref="l10nnl_chart_template" />
+        </record>
         <record id="fiscal_position_template_eu" model="account.fiscal.position.template">
             <field name="name">EU landen</field>
             <field name="chart_template_id" ref="l10nnl_chart_template" />
diff --git a/addons/l10n_pa/__init__.py b/addons/l10n_pa/__init__.py
index 92da5dbf966..25e7e337165 100644
--- a/addons/l10n_pa/__init__.py
+++ b/addons/l10n_pa/__init__.py
@@ -23,7 +23,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
 ##############################################################################
 
diff --git a/addons/l10n_pe/__init__.py b/addons/l10n_pe/__init__.py
index 92da5dbf966..25e7e337165 100644
--- a/addons/l10n_pe/__init__.py
+++ b/addons/l10n_pe/__init__.py
@@ -23,7 +23,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
 ##############################################################################
 
diff --git a/addons/l10n_ro/partner_view.xml b/addons/l10n_ro/partner_view.xml
index c03d5c9a1a6..102ba3d92f0 100644
--- a/addons/l10n_ro/partner_view.xml
+++ b/addons/l10n_ro/partner_view.xml
@@ -7,7 +7,6 @@
 			<field name="model">res.partner</field>
 			<field name="arch" type="xml">
 				<xpath expr="//div[@name='vat_info']" position="after">
-					<label for="nrc"/>
 					<field name="nrc" placeholder="e.g. J12/1234/2012" class="oe_inline"/>
                 </xpath>
 			</field>
diff --git a/addons/l10n_ro/res_partner.py b/addons/l10n_ro/res_partner.py
old mode 100755
new mode 100644
index 96de4b4e86a..79933dc468e
--- a/addons/l10n_ro/res_partner.py
+++ b/addons/l10n_ro/res_partner.py
@@ -1,4 +1,3 @@
-
 # -*- encoding: utf-8 -*-
 ##############################################################################
 #
diff --git a/addons/l10n_vn/__init__.py b/addons/l10n_vn/__init__.py
new file mode 100644
index 00000000000..4b18956216e
--- /dev/null
+++ b/addons/l10n_vn/__init__.py
@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    This module is Copyright (c) 2009-2013 General Solutions (http://gscom.vn) All Rights Reserved.
+#
+#    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
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_vn/__openerp__.py b/addons/l10n_vn/__openerp__.py
new file mode 100644
index 00000000000..19b81654523
--- /dev/null
+++ b/addons/l10n_vn/__openerp__.py
@@ -0,0 +1,42 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    This module is Copyright (c) 2009-2013 General Solutions (http://gscom.vn) All Rights Reserved.
+#
+#    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
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+{
+    "name" : "Vietnam Chart of Accounts",
+    "version" : "1.0",
+    "author" : "General Solutions",
+    'website': 'http://gscom.vn',
+    "category" : "Localization/Account Charts",
+    "description": """
+This is the module to manage the accounting chart for Vietnam in OpenERP.
+========================================================================
+
+This module applies to companies based in Vietnamese Accounting Standard (VAS).
+
+**Credits:** General Solutions.
+""",
+    "depends" : ["account","base_vat","base_iban"],
+    "data" : ["account_tax_code.xml","account_chart.xml","account_tax.xml","l10n_vn_wizard.xml"],
+    "demo" : [],
+    'auto_install': False,
+    "installable": True,
+}
+
diff --git a/addons/l10n_vn/account_chart.xml b/addons/l10n_vn/account_chart.xml
new file mode 100755
index 00000000000..c7d3f6a9ee3
--- /dev/null
+++ b/addons/l10n_vn/account_chart.xml
@@ -0,0 +1,2022 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+<data noupdate="True">
+
+    <!-- Account types -->
+
+    <record id="account_type_current_asset" model="account.account.type">
+        <field name="name">1. TÀI SẢN NGẮN HẠN</field>
+        <field name="code">current_asset</field>
+        <field name="close_method">balance</field>
+        <field name="report_type">asset</field>
+    </record>
+
+    <record id="account_type_current_asset_rec" model="account.account.type">
+        <field name="name">1. TÀI SẢN NGẮN HẠN - REC</field>
+        <field name="code">current_asset</field>
+        <field name="close_method">unreconciled</field>
+        <field name="report_type">asset</field>
+    </record>
+
+    <record id="account_type_long_term_asset" model="account.account.type">
+        <field name="name">2. TÀI SẢN DÀI HẠN</field>
+        <field name="code">long_term_asset</field>
+        <field name="close_method">balance</field>
+        <field name="report_type">asset</field>
+    </record>
+
+    <record id="account_type_liability" model="account.account.type">
+        <field name="name">3. NỢ PHẢI TRẢ</field>
+        <field name="code">liability</field>
+        <field name="close_method">unreconciled</field>
+        <field name="report_type">liability</field>
+    </record>
+
+    <record id="account_type_cash_equity" model="account.account.type">
+        <field name="name">4. VỐN CHỦ SỞ HỮU</field>
+        <field name="code">equity</field>
+        <field name="close_method">balance</field>
+        <field name="report_type">asset</field>
+    </record>
+
+    <record id="account_type_income" model="account.account.type">
+        <field name="name">5. DOANH THU</field>
+        <field name="code">income</field>
+        <field name="close_method">none</field>
+        <field name="report_type">income</field>
+    </record>
+
+    <record id="account_type_expense" model="account.account.type">
+        <field name="name">6. CHI PHÍ SẢN XUẤT, KINH DOANH</field>
+        <field name="code">expense</field>
+        <field name="close_method">none</field>
+        <field name="report_type">expense</field>
+    </record>
+
+    <record id="account_type_other_income" model="account.account.type">
+        <field name="name">7. THU NHẬP KHÁC</field>
+        <field name="code">other_income</field>
+        <field name="close_method">none</field>
+        <field name="report_type">income</field>
+    </record>
+
+    <record id="account_type_other_expense" model="account.account.type">
+        <field name="name">8. CHI PHÍ KHÁC</field>
+        <field name="code">other_expense</field>
+        <field name="close_method">none</field>
+        <field name="report_type">expense</field>
+    </record>
+
+    <record id="account_type_evaluation" model="account.account.type">
+        <field name="name">9. XÁC ĐỊNH KẾT QUẢ KINH DOANH</field>
+        <field name="code">evaluation</field>
+        <field name="close_method">none</field>
+    </record>
+
+    <record id="account_type_other" model="account.account.type">
+        <field name="name">X. TÀI KHOẢN NGOÀI BẢNG</field>
+        <field name="code">other</field>
+        <field name="close_method">none</field>
+    </record>
+
+    <record id="account_type_root" model="account.account.type">
+        <field name="name">CHỈ XEM</field>
+        <field name="code">view</field>
+        <field name="close_method">none</field>
+    </record>
+</data>
+
+<data>
+    <!-- Account Templates -->
+
+    <record id="chart0" model="account.account.template">
+        <field name="code">0</field>
+        <field name="name">Hệ thống tài khoản kế toán Việt Nam</field>
+        <field name="type">view</field>
+        <field name="user_type" ref="account_type_root" />
+    </record>
+
+    <!-- Loại 1 -->
+    <record id="chart1" model="account.account.template">
+        <field name="code">1</field>
+        <field name="name">TÀI SẢN NGẮN HẠN</field>
+        <field name="type">view</field>
+        <field name="parent_id" ref="chart0" />
+        <field name="user_type" ref="account_type_current_asset" />
+    </record>
+
+    <record id="chart111" model="account.account.template">
+        <field name="code">111</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">view</field>
+        <field name="parent_id" ref="chart1" />
+        <field name="user_type" ref="account_type_current_asset" />
+        <field name="name">Tiền mặt</field>
+    </record>
+    <record id="chart1111" model="account.account.template">
+        <field name="code">1111</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">liquidity</field>
+        <field name="parent_id" ref="chart111" />
+        <field name="user_type" ref="account_type_current_asset" />
+        <field name="name">Tiền Việt Nam</field>
+    </record>
+    <record id="chart1112" model="account.account.template">
+        <field name="code">1112</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart111" />
+        <field name="user_type" ref="account_type_current_asset" />
+        <field name="name">Ngoại tệ</field>
+    </record>
+    <record id="chart1113" model="account.account.template">
+        <field name="code">1113</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart111" />
+        <field name="user_type" ref="account_type_current_asset" />
+        <field name="name">Vàng bạc, kim khí quý, đá quý</field>
+    </record>
+
+    <record id="chart112" model="account.account.template">
+        <field name="code">112</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">view</field>
+        <field name="parent_id" ref="chart1" />
+        <field name="user_type" ref="account_type_current_asset" />
+        <field name="name">Tiền gửi ngân hàng</field>
+    </record>
+    <record id="chart1121" model="account.account.template">
+        <field name="code">1121</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">liquidity</field>
+        <field name="parent_id" ref="chart112" />
+        <field name="user_type" ref="account_type_current_asset" />
+        <field name="name">Tiền Việt Nam</field>
+    </record>
+    <record id="chart1122" model="account.account.template">
+        <field name="code">1122</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart112" />
+        <field name="user_type" ref="account_type_current_asset" />
+        <field name="name">Ngoại tệ</field>
+    </record>
+    <record id="chart1123" model="account.account.template">
+        <field name="code">1123</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart112" />
+        <field name="user_type" ref="account_type_current_asset" />
+        <field name="name">Vàng bạc, kim khí quý, đá quý</field>
+    </record>
+
+    <record id="chart113" model="account.account.template">
+        <field name="code">113</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">view</field>
+        <field name="parent_id" ref="chart1" />
+        <field name="user_type" ref="account_type_current_asset" />
+        <field name="name">Tiền đang chuyển</field>
+    </record>
+    <record id="chart1131" model="account.account.template">
+        <field name="code">1131</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart113" />
+        <field name="user_type" ref="account_type_current_asset" />
+        <field name="name">Tiền Việt Nam</field>
+    </record>
+    <record id="chart1132" model="account.account.template">
+        <field name="code">1132</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart113" />
+        <field name="user_type" ref="account_type_current_asset" />
+        <field name="name">Ngoại tệ</field>
+    </record>
+
+    <record id="chart121" model="account.account.template">
+        <field name="code">121</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">view</field>
+        <field name="parent_id" ref="chart1" />
+        <field name="user_type" ref="account_type_current_asset" />
+        <field name="name">Đầu tư tài chính ngắn hạn</field>
+    </record>
+    <record id="chart1211" model="account.account.template">
+        <field name="code">1211</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart121" />
+        <field name="user_type" ref="account_type_current_asset" />
+        <field name="name">Cổ phiếu</field>
+    </record>
+    <record id="chart1212" model="account.account.template">
+        <field name="code">1212</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart121" />
+        <field name="user_type" ref="account_type_current_asset" />
+        <field name="name">Trái phiếu, Tín phiếu, Kỳ phiếu</field>
+    </record>
+
+    <record id="chart128" model="account.account.template">
+        <field name="code">128</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">view</field>
+        <field name="parent_id" ref="chart1" />
+        <field name="user_type" ref="account_type_current_asset" />
+        <field name="name">Đầu tư ngắn hạn khác</field>
+    </record>
+    <record id="chart1281" model="account.account.template">
+        <field name="code">1281</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart128" />
+        <field name="user_type" ref="account_type_current_asset" />
+        <field name="name">Tiền gửi có kỳ hạn</field>
+    </record>
+    <record id="chart1282" model="account.account.template">
+        <field name="code">1282</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart128" />
+        <field name="user_type" ref="account_type_current_asset" />
+        <field name="name">Đầu tư ngắn hạn khác</field>
+    </record>
+
+    <record id="chart129" model="account.account.template">
+        <field name="code">129</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart1" />
+        <field name="user_type" ref="account_type_current_asset" />
+        <field name="name">Dự phòng giảm giá đầu tư ngắn hạn</field>
+    </record>
+
+    <record id="chart131" model="account.account.template">
+        <field name="code">131</field>
+        <field name="reconcile" eval="True" />
+        <field name="type">receivable</field>
+        <field name="parent_id" ref="chart1" />
+        <field name="user_type" ref="account_type_current_asset_rec" />
+        <field name="name">Phải thu của khách hàng</field>
+    </record>
+
+    <record id="chart133" model="account.account.template">
+        <field name="code">133</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">view</field>
+        <field name="parent_id" ref="chart1" />
+        <field name="user_type" ref="account_type_current_asset" />
+        <field name="name">Thuế GTGT được khấu trừ</field>
+    </record>
+    <record id="chart1331" model="account.account.template">
+        <field name="code">1331</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart133" />
+        <field name="user_type" ref="account_type_current_asset" />
+        <field name="name">Thuế GTGT được khấu trừ của hàng hóa, dịch vụ
+        </field>
+    </record>
+    <record id="chart1332" model="account.account.template">
+        <field name="code">1332</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart133" />
+        <field name="user_type" ref="account_type_current_asset" />
+        <field name="name">Thuế GTGT được khấu trừ của TSCĐ</field>
+    </record>
+
+    <record id="chart136" model="account.account.template">
+        <field name="code">136</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">view</field>
+        <field name="parent_id" ref="chart1" />
+        <field name="user_type" ref="account_type_current_asset" />
+        <field name="name">Phải thu nội bộ</field>
+    </record>
+    <record id="chart1361" model="account.account.template">
+        <field name="code">1361</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart136" />
+        <field name="user_type" ref="account_type_current_asset" />
+        <field name="name">Vốn kinh doanh ở đơn vị trực thuộc</field>
+    </record>
+    <record id="chart1368" model="account.account.template">
+        <field name="code">1368</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart136" />
+        <field name="user_type" ref="account_type_current_asset" />
+        <field name="name">Phải thu nội bộ khác</field>
+    </record>
+
+    <record id="chart138" model="account.account.template">
+        <field name="code">138</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">view</field>
+        <field name="parent_id" ref="chart1" />
+        <field name="user_type" ref="account_type_current_asset" />
+        <field name="name">Phải thu khác</field>
+    </record>
+    <record id="chart1381" model="account.account.template">
+        <field name="code">1381</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart138" />
+        <field name="user_type" ref="account_type_current_asset" />
+        <field name="name">Tài sản thiếu chờ xử lý</field>
+    </record>
+    <record id="chart1385" model="account.account.template">
+        <field name="code">1385</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart138" />
+        <field name="user_type" ref="account_type_current_asset" />
+        <field name="name">Phải thu về cổ phần hóa</field>
+    </record>
+    <record id="chart1388" model="account.account.template">
+        <field name="code">1388</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart138" />
+        <field name="user_type" ref="account_type_current_asset" />
+        <field name="name">Phải thu khác</field>
+    </record>
+
+    <record id="chart139" model="account.account.template">
+        <field name="code">139</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart1" />
+        <field name="user_type" ref="account_type_current_asset" />
+        <field name="name">Dự phòng phải thu khó đòi</field>
+    </record>
+
+    <record id="chart141" model="account.account.template">
+        <field name="code">141</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart1" />
+        <field name="user_type" ref="account_type_current_asset" />
+        <field name="name">Tạm ứng</field>
+    </record>
+
+    <record id="chart142" model="account.account.template">
+        <field name="code">142</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart1" />
+        <field name="user_type" ref="account_type_current_asset" />
+        <field name="name">Chi phí trả trước ngắn hạn</field>
+    </record>
+
+    <record id="chart144" model="account.account.template">
+        <field name="code">144</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart1" />
+        <field name="user_type" ref="account_type_current_asset" />
+        <field name="name">Cầm cố, ký cược, ký quỹ ngắn hạn</field>
+    </record>
+
+    <record id="chart151" model="account.account.template">
+        <field name="code">151</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart1" />
+        <field name="user_type" ref="account_type_current_asset" />
+        <field name="name">Hàng hóa mua đang đi trên đường</field>
+    </record>
+
+    <record id="chart152" model="account.account.template">
+        <field name="code">152</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart1" />
+        <field name="user_type" ref="account_type_current_asset" />
+        <field name="name">Nguyên liệu, vật liệu</field>
+    </record>
+
+    <record id="chart153" model="account.account.template">
+        <field name="code">153</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart1" />
+        <field name="user_type" ref="account_type_current_asset" />
+        <field name="name">Công cụ, dụng cụ</field>
+    </record>
+
+    <record id="chart154" model="account.account.template">
+        <field name="code">154</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart1" />
+        <field name="user_type" ref="account_type_current_asset" />
+        <field name="name">Chi phí sản xuất kinh doanh dở dang</field>
+    </record>
+
+    <record id="chart155" model="account.account.template">
+        <field name="code">155</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart1" />
+        <field name="user_type" ref="account_type_current_asset" />
+        <field name="name">Thành phẩm</field>
+    </record>
+
+    <record id="chart156" model="account.account.template">
+        <field name="code">156</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">view</field>
+        <field name="parent_id" ref="chart1" />
+        <field name="user_type" ref="account_type_current_asset" />
+        <field name="name">Hàng hóa</field>
+    </record>
+    <record id="chart1561" model="account.account.template">
+        <field name="code">1561</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart156" />
+        <field name="user_type" ref="account_type_current_asset" />
+        <field name="name">Giá mua hàng hóa</field>
+    </record>
+    <record id="chart1562" model="account.account.template">
+        <field name="code">1562</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart156" />
+        <field name="user_type" ref="account_type_current_asset" />
+        <field name="name">Chi phí thu mua hàng hóa</field>
+    </record>
+    <record id="chart1567" model="account.account.template">
+        <field name="code">1567</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart156" />
+        <field name="user_type" ref="account_type_current_asset" />
+        <field name="name">Hàng hóa bất động sản</field>
+    </record>
+
+    <record id="chart157" model="account.account.template">
+        <field name="code">157</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart1" />
+        <field name="user_type" ref="account_type_current_asset" />
+        <field name="name">Hàng gửi đi bán</field>
+    </record>
+
+    <record id="chart158" model="account.account.template">
+        <field name="code">158</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart1" />
+        <field name="user_type" ref="account_type_current_asset" />
+        <field name="name">Hàng hóa kho bảo thuế</field>
+    </record>
+
+    <record id="chart159" model="account.account.template">
+        <field name="code">159</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart1" />
+        <field name="user_type" ref="account_type_current_asset" />
+        <field name="name">Dự phòng giảm giá hàng tồn kho</field>
+    </record>
+
+    <record id="chart161" model="account.account.template">
+        <field name="code">161</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">view</field>
+        <field name="parent_id" ref="chart1" />
+        <field name="user_type" ref="account_type_current_asset" />
+        <field name="name">Chi sự nghiệp</field>
+    </record>
+    <record id="chart1611" model="account.account.template">
+        <field name="code">1611</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart161" />
+        <field name="user_type" ref="account_type_current_asset" />
+        <field name="name">Chi sự nghiệp năm trước</field>
+    </record>
+    <record id="chart1612" model="account.account.template">
+        <field name="code">1612</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart161" />
+        <field name="user_type" ref="account_type_current_asset" />
+        <field name="name">Chi sự nghiệp năm nay</field>
+    </record>
+
+    <!-- Loại 2 -->
+    <record id="chart2" model="account.account.template">
+        <field name="code">2</field>
+        <field name="name">TÀI SẢN DÀI HẠN</field>
+        <field name="type">view</field>
+        <field name="parent_id" ref="chart0" />
+        <field name="user_type" ref="account_type_long_term_asset" />
+    </record>
+
+    <record id="chart211" model="account.account.template">
+        <field name="code">211</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">view</field>
+        <field name="parent_id" ref="chart2" />
+        <field name="user_type" ref="account_type_long_term_asset" />
+        <field name="name">Tài sản cố định hữu hình</field>
+    </record>
+    <record id="chart2111" model="account.account.template">
+        <field name="code">2111</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart211" />
+        <field name="user_type" ref="account_type_long_term_asset" />
+        <field name="name">Nhà cửa, vật kiến trúc</field>
+    </record>
+    <record id="chart2112" model="account.account.template">
+        <field name="code">2112</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart211" />
+        <field name="user_type" ref="account_type_long_term_asset" />
+        <field name="name">Máy móc, thiết bị</field>
+    </record>
+    <record id="chart2113" model="account.account.template">
+        <field name="code">2113</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart211" />
+        <field name="user_type" ref="account_type_long_term_asset" />
+        <field name="name">Phương tiện vận tải truyền dẫn</field>
+    </record>
+    <record id="chart2114" model="account.account.template">
+        <field name="code">2114</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart211" />
+        <field name="user_type" ref="account_type_long_term_asset" />
+        <field name="name">Thiết bị, dụng cụ quản lý</field>
+    </record>
+    <record id="chart2115" model="account.account.template">
+        <field name="code">2115</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart211" />
+        <field name="user_type" ref="account_type_long_term_asset" />
+        <field name="name">Cây lâu năm, súc vật làm việc và cho sản phẩm
+        </field>
+    </record>
+    <record id="chart2118" model="account.account.template">
+        <field name="code">2118</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart211" />
+        <field name="user_type" ref="account_type_long_term_asset" />
+        <field name="name">Tài sản cố định khác</field>
+    </record>
+
+    <record id="chart212" model="account.account.template">
+        <field name="code">212</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart2" />
+        <field name="user_type" ref="account_type_long_term_asset" />
+        <field name="name">Tài sản cố định thuê tài chính</field>
+    </record>
+
+    <record id="chart213" model="account.account.template">
+        <field name="code">213</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">view</field>
+        <field name="parent_id" ref="chart2" />
+        <field name="user_type" ref="account_type_long_term_asset" />
+        <field name="name">Tài sản cố định vô hình</field>
+    </record>
+    <record id="chart2131" model="account.account.template">
+        <field name="code">2131</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart213" />
+        <field name="user_type" ref="account_type_long_term_asset" />
+        <field name="name">Quyền sử dụng đất</field>
+    </record>
+    <record id="chart2132" model="account.account.template">
+        <field name="code">2132</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart213" />
+        <field name="user_type" ref="account_type_long_term_asset" />
+        <field name="name">Quyền phát hành</field>
+    </record>
+    <record id="chart2133" model="account.account.template">
+        <field name="code">2133</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart213" />
+        <field name="user_type" ref="account_type_long_term_asset" />
+        <field name="name">Bản quyền, bằng sáng chế</field>
+    </record>
+    <record id="chart2134" model="account.account.template">
+        <field name="code">2134</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart213" />
+        <field name="user_type" ref="account_type_long_term_asset" />
+        <field name="name">Nhãn hiệu hàng hóa</field>
+    </record>
+    <record id="chart2135" model="account.account.template">
+        <field name="code">2135</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart213" />
+        <field name="user_type" ref="account_type_long_term_asset" />
+        <field name="name">Phần mềm máy tính</field>
+    </record>
+    <record id="chart2136" model="account.account.template">
+        <field name="code">2136</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart213" />
+        <field name="user_type" ref="account_type_long_term_asset" />
+        <field name="name">Giấy phép và giấy phép nhượng quyền</field>
+    </record>
+    <record id="chart2138" model="account.account.template">
+        <field name="code">2138</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart213" />
+        <field name="user_type" ref="account_type_long_term_asset" />
+        <field name="name">Tài sản cố định vô hình khác</field>
+    </record>
+
+    <record id="chart214" model="account.account.template">
+        <field name="code">214</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">view</field>
+        <field name="parent_id" ref="chart2" />
+        <field name="user_type" ref="account_type_long_term_asset" />
+        <field name="name">Hao mòn TSCĐ</field>
+    </record>
+    <record id="chart2141" model="account.account.template">
+        <field name="code">2141</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart214" />
+        <field name="user_type" ref="account_type_long_term_asset" />
+        <field name="name">Hao mòn TSCĐ cố định hữu hình</field>
+    </record>
+    <record id="chart2142" model="account.account.template">
+        <field name="code">2142</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart214" />
+        <field name="user_type" ref="account_type_long_term_asset" />
+        <field name="name">Hao mòn TSCĐ thuê tài chính</field>
+    </record>
+    <record id="chart2143" model="account.account.template">
+        <field name="code">2143</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart214" />
+        <field name="user_type" ref="account_type_long_term_asset" />
+        <field name="name">Hao mòn TSCĐ vô hình</field>
+    </record>
+    <record id="chart2147" model="account.account.template">
+        <field name="code">2147</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart214" />
+        <field name="user_type" ref="account_type_long_term_asset" />
+        <field name="name">Hao mòn bất động sản đầu tư</field>
+    </record>
+
+    <record id="chart217" model="account.account.template">
+        <field name="code">217</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart2" />
+        <field name="user_type" ref="account_type_long_term_asset" />
+        <field name="name">Bất động sản đầu tư</field>
+    </record>
+
+    <record id="chart221" model="account.account.template">
+        <field name="code">221</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart2" />
+        <field name="user_type" ref="account_type_long_term_asset" />
+        <field name="name">Đầu tư vào công ty con</field>
+    </record>
+
+    <record id="chart222" model="account.account.template">
+        <field name="code">222</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart2" />
+        <field name="user_type" ref="account_type_long_term_asset" />
+        <field name="name">Vốn góp liên doanh</field>
+    </record>
+
+    <record id="chart223" model="account.account.template">
+        <field name="code">223</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart2" />
+        <field name="user_type" ref="account_type_long_term_asset" />
+        <field name="name">Đầu tư vào công ty liên kết</field>
+    </record>
+
+    <record id="chart228" model="account.account.template">
+        <field name="code">228</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">view</field>
+        <field name="parent_id" ref="chart2" />
+        <field name="user_type" ref="account_type_long_term_asset" />
+        <field name="name">Đầu tư dài hạn khác</field>
+    </record>
+    <record id="chart2281" model="account.account.template">
+        <field name="code">2281</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart228" />
+        <field name="user_type" ref="account_type_long_term_asset" />
+        <field name="name">Cổ phiếu</field>
+    </record>
+    <record id="chart2282" model="account.account.template">
+        <field name="code">2282</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart228" />
+        <field name="user_type" ref="account_type_long_term_asset" />
+        <field name="name">Trái phiếu</field>
+    </record>
+    <record id="chart2288" model="account.account.template">
+        <field name="code">2288</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart228" />
+        <field name="user_type" ref="account_type_long_term_asset" />
+        <field name="name">Đầu tư dài hạn khác</field>
+    </record>
+
+    <record id="chart229" model="account.account.template">
+        <field name="code">229</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart2" />
+        <field name="user_type" ref="account_type_long_term_asset" />
+        <field name="name">Dự phòng giảm giá đầu tư dài hạn</field>
+    </record>
+
+    <record id="chart241" model="account.account.template">
+        <field name="code">241</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">view</field>
+        <field name="parent_id" ref="chart2" />
+        <field name="user_type" ref="account_type_long_term_asset" />
+        <field name="name">Xây dựng cơ bản dở dang</field>
+    </record>
+    <record id="chart2411" model="account.account.template">
+        <field name="code">2411</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart241" />
+        <field name="user_type" ref="account_type_long_term_asset" />
+        <field name="name">Mua sắm TSCĐ</field>
+    </record>
+    <record id="chart2412" model="account.account.template">
+        <field name="code">2412</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart241" />
+        <field name="user_type" ref="account_type_long_term_asset" />
+        <field name="name">Xây dựng cơ bản</field>
+    </record>
+    <record id="chart2413" model="account.account.template">
+        <field name="code">2413</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart241" />
+        <field name="user_type" ref="account_type_long_term_asset" />
+        <field name="name">Sửa chữa lớn TSCĐ</field>
+    </record>
+
+    <record id="chart242" model="account.account.template">
+        <field name="code">242</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart2" />
+        <field name="user_type" ref="account_type_long_term_asset" />
+        <field name="name">Chi phí trả trước dài hạn</field>
+    </record>
+
+    <record id="chart243" model="account.account.template">
+        <field name="code">243</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart2" />
+        <field name="user_type" ref="account_type_long_term_asset" />
+        <field name="name">Tài sản thuế thu nhập hoãn lại</field>
+    </record>
+
+    <record id="chart244" model="account.account.template">
+        <field name="code">244</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart2" />
+        <field name="user_type" ref="account_type_long_term_asset" />
+        <field name="name">Ký quỹ, ký cược dài hạn</field>
+    </record>
+
+    <!-- Loại 3 -->
+    <record id="chart3" model="account.account.template">
+        <field name="code">3</field>
+        <field name="name">NỢ PHẢI TRẢ</field>
+        <field name="type">view</field>
+        <field name="parent_id" ref="chart0" />
+        <field name="user_type" ref="account_type_liability" />
+    </record>
+
+    <record id="chart311" model="account.account.template">
+        <field name="code">311</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart3" />
+        <field name="user_type" ref="account_type_liability" />
+        <field name="name">Vay ngắn hạn</field>
+    </record>
+
+    <record id="chart315" model="account.account.template">
+        <field name="code">315</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart3" />
+        <field name="user_type" ref="account_type_liability" />
+        <field name="name">Nợ dài hạn đến hạn trả</field>
+    </record>
+
+    <record id="chart331" model="account.account.template">
+        <field name="code">331</field>
+        <field name="reconcile" eval="True" />
+        <field name="type">payable</field>
+        <field name="parent_id" ref="chart3" />
+        <field name="user_type" ref="account_type_liability" />
+        <field name="name">Phải trả người bán</field>
+    </record>
+
+    <record id="chart333" model="account.account.template">
+        <field name="code">333</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">view</field>
+        <field name="parent_id" ref="chart3" />
+        <field name="user_type" ref="account_type_liability" />
+        <field name="name">Thuế và các khoản phải nộp Nhà nước</field>
+    </record>
+    <record id="chart3331" model="account.account.template">
+        <field name="code">3331</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">view</field>
+        <field name="parent_id" ref="chart333" />
+        <field name="user_type" ref="account_type_liability" />
+        <field name="name">Thuế GTGT phải nộp</field>
+    </record>
+    <record id="chart33311" model="account.account.template">
+        <field name="code">33311</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart3331" />
+        <field name="user_type" ref="account_type_liability" />
+        <field name="name">Thuế GTGT đầu ra</field>
+    </record>
+    <record id="chart33312" model="account.account.template">
+        <field name="code">33312</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart3331" />
+        <field name="user_type" ref="account_type_liability" />
+        <field name="name">Thuế GTGT hàng nhập khẩu</field>
+    </record>
+    <record id="chart3332" model="account.account.template">
+        <field name="code">3332</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart333" />
+        <field name="user_type" ref="account_type_liability" />
+        <field name="name">Thuế tiêu thụ đặc biệt</field>
+    </record>
+    <record id="chart3333" model="account.account.template">
+        <field name="code">3333</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart333" />
+        <field name="user_type" ref="account_type_liability" />
+        <field name="name">Thuế xuất, nhập khẩu</field>
+    </record>
+    <record id="chart3334" model="account.account.template">
+        <field name="code">3334</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart333" />
+        <field name="user_type" ref="account_type_liability" />
+        <field name="name">Thuế thu nhập doanh nghiệp</field>
+    </record>
+    <record id="chart3335" model="account.account.template">
+        <field name="code">3335</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart333" />
+        <field name="user_type" ref="account_type_liability" />
+        <field name="name">Thuế thu nhập cá nhân</field>
+    </record>
+    <record id="chart3336" model="account.account.template">
+        <field name="code">3336</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart333" />
+        <field name="user_type" ref="account_type_liability" />
+        <field name="name">Thuế tài nguyên</field>
+    </record>
+    <record id="chart3337" model="account.account.template">
+        <field name="code">3337</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart333" />
+        <field name="user_type" ref="account_type_liability" />
+        <field name="name">Thuế nhà đất, tiền thuê đất</field>
+    </record>
+    <record id="chart3338" model="account.account.template">
+        <field name="code">3338</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart333" />
+        <field name="user_type" ref="account_type_liability" />
+        <field name="name">Các loại thuế khác</field>
+    </record>
+    <record id="chart3339" model="account.account.template">
+        <field name="code">3339</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart333" />
+        <field name="user_type" ref="account_type_liability" />
+        <field name="name">Phí, lệ phí và các khoản phải nộp khác</field>
+    </record>
+
+    <record id="chart334" model="account.account.template">
+        <field name="code">334</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">view</field>
+        <field name="parent_id" ref="chart3" />
+        <field name="user_type" ref="account_type_liability" />
+        <field name="name">Phải trả người lao động</field>
+    </record>
+    <record id="chart3341" model="account.account.template">
+        <field name="code">3341</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart334" />
+        <field name="user_type" ref="account_type_liability" />
+        <field name="name">Phải trả công nhân viên</field>
+    </record>
+    <record id="chart3342" model="account.account.template">
+        <field name="code">3342</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart334" />
+        <field name="user_type" ref="account_type_liability" />
+        <field name="name">Phải trả người lao động khác</field>
+    </record>
+
+    <record id="chart335" model="account.account.template">
+        <field name="code">335</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart3" />
+        <field name="user_type" ref="account_type_liability" />
+        <field name="name">Chi phí phải trả</field>
+    </record>
+
+    <record id="chart336" model="account.account.template">
+        <field name="code">336</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart3" />
+        <field name="user_type" ref="account_type_liability" />
+        <field name="name">Phải trả nội bộ</field>
+    </record>
+
+    <record id="chart337" model="account.account.template">
+        <field name="code">337</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart3" />
+        <field name="user_type" ref="account_type_liability" />
+        <field name="name">Thanh toán theo tiến độ kế hoạch hợp đồng xây dựng
+        </field>
+    </record>
+
+    <record id="chart338" model="account.account.template">
+        <field name="code">338</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">view</field>
+        <field name="parent_id" ref="chart3" />
+        <field name="user_type" ref="account_type_liability" />
+        <field name="name">Phải trả, phải nộp khác</field>
+    </record>
+    <record id="chart3381" model="account.account.template">
+        <field name="code">3381</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart338" />
+        <field name="user_type" ref="account_type_liability" />
+        <field name="name">Tài sản thừa chờ giải quyết</field>
+    </record>
+    <record id="chart3382" model="account.account.template">
+        <field name="code">3382</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart338" />
+        <field name="user_type" ref="account_type_liability" />
+        <field name="name">Kinh phí công đoàn</field>
+    </record>
+    <record id="chart3383" model="account.account.template">
+        <field name="code">3383</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart338" />
+        <field name="user_type" ref="account_type_liability" />
+        <field name="name">Bảo hiểm xã hội</field>
+    </record>
+    <record id="chart3384" model="account.account.template">
+        <field name="code">3384</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart338" />
+        <field name="user_type" ref="account_type_liability" />
+        <field name="name">Bảo hiểm y tế</field>
+    </record>
+    <record id="chart3385" model="account.account.template">
+        <field name="code">3385</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart338" />
+        <field name="user_type" ref="account_type_liability" />
+        <field name="name">Phải trả về cổ phần hóa</field>
+    </record>
+    <record id="chart3386" model="account.account.template">
+        <field name="code">3386</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart338" />
+        <field name="user_type" ref="account_type_liability" />
+        <field name="name">Nhận ký quỹ, ký cược ngắn hạn</field>
+    </record>
+    <record id="chart3387" model="account.account.template">
+        <field name="code">3387</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart338" />
+        <field name="user_type" ref="account_type_liability" />
+        <field name="name">Doanh thu chưa thực hiện</field>
+    </record>
+    <record id="chart3388" model="account.account.template">
+        <field name="code">3388</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart338" />
+        <field name="user_type" ref="account_type_liability" />
+        <field name="name">Phải trả, phải nộp khác</field>
+    </record>
+
+    <record id="chart341" model="account.account.template">
+        <field name="code">341</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart3" />
+        <field name="user_type" ref="account_type_liability" />
+        <field name="name">Vay dài hạn</field>
+    </record>
+
+    <record id="chart342" model="account.account.template">
+        <field name="code">342</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart3" />
+        <field name="user_type" ref="account_type_liability" />
+        <field name="name">Nợ dài hạn</field>
+    </record>
+
+    <record id="chart343" model="account.account.template">
+        <field name="code">343</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">view</field>
+        <field name="parent_id" ref="chart3" />
+        <field name="user_type" ref="account_type_liability" />
+        <field name="name">Trái phiếu phát hành</field>
+    </record>
+    <record id="chart3431" model="account.account.template">
+        <field name="code">3431</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart343" />
+        <field name="user_type" ref="account_type_liability" />
+        <field name="name">Mệnh giá trái phiếu</field>
+    </record>
+    <record id="chart3432" model="account.account.template">
+        <field name="code">3432</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart343" />
+        <field name="user_type" ref="account_type_liability" />
+        <field name="name">Chiết khấu trái phiếu</field>
+    </record>
+    <record id="chart3434" model="account.account.template">
+        <field name="code">3434</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart343" />
+        <field name="user_type" ref="account_type_liability" />
+        <field name="name">Phụ trội trái phiếu</field>
+    </record>
+
+    <record id="chart344" model="account.account.template">
+        <field name="code">344</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart3" />
+        <field name="user_type" ref="account_type_liability" />
+        <field name="name">Nhận ký quỹ, ký cược dài hạn</field>
+    </record>
+
+    <record id="chart347" model="account.account.template">
+        <field name="code">347</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart3" />
+        <field name="user_type" ref="account_type_liability" />
+        <field name="name">Thuế thu nhập hoãn lại phải trả</field>
+    </record>
+
+    <record id="chart351" model="account.account.template">
+        <field name="code">351</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart3" />
+        <field name="user_type" ref="account_type_liability" />
+        <field name="name">Quỹ dự phòng trợ cấp mất việc làm</field>
+    </record>
+
+    <record id="chart352" model="account.account.template">
+        <field name="code">352</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart3" />
+        <field name="user_type" ref="account_type_liability" />
+        <field name="name">Dự phòng phải trả</field>
+    </record>
+
+    <!-- Loại 4 -->
+    <record id="chart4" model="account.account.template">
+        <field name="code">4</field>
+        <field name="name">VỐN CHỦ SỞ HỮU</field>
+        <field name="type">view</field>
+        <field name="parent_id" ref="chart0" />
+        <field name="user_type" ref="account_type_cash_equity" />
+    </record>
+
+    <record id="chart411" model="account.account.template">
+        <field name="code">411</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">view</field>
+        <field name="parent_id" ref="chart4" />
+        <field name="user_type" ref="account_type_cash_equity" />
+        <field name="name">Nguồn vốn kinh doanh</field>
+    </record>
+    <record id="chart4111" model="account.account.template">
+        <field name="code">4111</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart411" />
+        <field name="user_type" ref="account_type_cash_equity" />
+        <field name="name">Vốn đầu tư chủ sỡ hữu</field>
+    </record>
+    <record id="chart4112" model="account.account.template">
+        <field name="code">4112</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart411" />
+        <field name="user_type" ref="account_type_cash_equity" />
+        <field name="name">Thặng dư vốn cổ phần</field>
+    </record>
+    <record id="chart4118" model="account.account.template">
+        <field name="code">4118</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart411" />
+        <field name="user_type" ref="account_type_cash_equity" />
+        <field name="name">Vốn khác</field>
+    </record>
+
+    <record id="chart412" model="account.account.template">
+        <field name="code">412</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart4" />
+        <field name="user_type" ref="account_type_cash_equity" />
+        <field name="name">Chênh lệch đánh giá lại tài sản</field>
+    </record>
+
+    <record id="chart413" model="account.account.template">
+        <field name="code">413</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">view</field>
+        <field name="parent_id" ref="chart4" />
+        <field name="user_type" ref="account_type_cash_equity" />
+        <field name="name">Chênh lệnh tỉ giá hối đoái</field>
+    </record>
+    <record id="chart4131" model="account.account.template">
+        <field name="code">4131</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart413" />
+        <field name="user_type" ref="account_type_cash_equity" />
+        <field name="name">Chênh lệnh tỉ giá hối đoái đánh giá lại cuối năm
+            tài chính</field>
+    </record>
+    <record id="chart4132" model="account.account.template">
+        <field name="code">4132</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart413" />
+        <field name="user_type" ref="account_type_cash_equity" />
+        <field name="name">Chênh lệnh tỉ giá hối đoái trong giai đoạn đầu tư
+            XDCB</field>
+    </record>
+
+    <record id="chart414" model="account.account.template">
+        <field name="code">414</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart4" />
+        <field name="user_type" ref="account_type_cash_equity" />
+        <field name="name">Quỹ đầu tư phát triển</field>
+    </record>
+
+    <record id="chart415" model="account.account.template">
+        <field name="code">415</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart4" />
+        <field name="user_type" ref="account_type_cash_equity" />
+        <field name="name">Quỹ dự phòng tài chính</field>
+    </record>
+
+    <record id="chart418" model="account.account.template">
+        <field name="code">418</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart4" />
+        <field name="user_type" ref="account_type_cash_equity" />
+        <field name="name">Các quỹ khác thuộc vốn chủ sở hữu</field>
+    </record>
+
+    <record id="chart419" model="account.account.template">
+        <field name="code">419</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart4" />
+        <field name="user_type" ref="account_type_cash_equity" />
+        <field name="name">Cổ phiếu quỹ</field>
+    </record>
+
+    <record id="chart421" model="account.account.template">
+        <field name="code">421</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">view</field>
+        <field name="parent_id" ref="chart4" />
+        <field name="user_type" ref="account_type_cash_equity" />
+        <field name="name">Lợi nhuận chưa phân phối</field>
+    </record>
+    <record id="chart4211" model="account.account.template">
+        <field name="code">4211</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart421" />
+        <field name="user_type" ref="account_type_cash_equity" />
+        <field name="name">Lợi nhuận chưa phân phối năm trước</field>
+    </record>
+    <record id="chart4212" model="account.account.template">
+        <field name="code">4212</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart421" />
+        <field name="user_type" ref="account_type_cash_equity" />
+        <field name="name">Lợi nhuận chưa phân phối năm nay</field>
+    </record>
+
+    <record id="chart431" model="account.account.template">
+        <field name="code">431</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">view</field>
+        <field name="parent_id" ref="chart4" />
+        <field name="user_type" ref="account_type_cash_equity" />
+        <field name="name">Quỹ khen thưởng phúc lợi</field>
+    </record>
+    <record id="chart4311" model="account.account.template">
+        <field name="code">4311</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart431" />
+        <field name="user_type" ref="account_type_cash_equity" />
+        <field name="name">Quỹ khen thưởng</field>
+    </record>
+    <record id="chart4312" model="account.account.template">
+        <field name="code">4312</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart431" />
+        <field name="user_type" ref="account_type_cash_equity" />
+        <field name="name">Quỹ phúc lợi</field>
+    </record>
+    <record id="chart4313" model="account.account.template">
+        <field name="code">4313</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart431" />
+        <field name="user_type" ref="account_type_cash_equity" />
+        <field name="name">Quỹ phúc lợi đã hình thành TSCĐ</field>
+    </record>
+
+    <record id="chart441" model="account.account.template">
+        <field name="code">441</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart4" />
+        <field name="user_type" ref="account_type_cash_equity" />
+        <field name="name">Ngồn vố đầu tư xây dựng cơ bản</field>
+    </record>
+
+    <record id="chart461" model="account.account.template">
+        <field name="code">461</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">view</field>
+        <field name="parent_id" ref="chart4" />
+        <field name="user_type" ref="account_type_cash_equity" />
+        <field name="name">Nguồn kinh phí sự nghiệp</field>
+    </record>
+    <record id="chart4611" model="account.account.template">
+        <field name="code">4611</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart461" />
+        <field name="user_type" ref="account_type_cash_equity" />
+        <field name="name">Nguồn kinh phí sự nghiệp năm trước</field>
+    </record>
+    <record id="chart4612" model="account.account.template">
+        <field name="code">4612</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart461" />
+        <field name="user_type" ref="account_type_cash_equity" />
+        <field name="name">Nguồn kinh phí sự nghiệp năm nay</field>
+    </record>
+
+    <record id="chart466" model="account.account.template">
+        <field name="code">466</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart4" />
+        <field name="user_type" ref="account_type_cash_equity" />
+        <field name="name">Nguồn kinh phí đã hình thành TSCĐ</field>
+    </record>
+
+    <!-- Loại 5 -->
+    <record id="chart5" model="account.account.template">
+        <field name="code">5</field>
+        <field name="name">DOANH THU</field>
+        <field name="type">view</field>
+        <field name="parent_id" ref="chart0" />
+        <field name="user_type" ref="account_type_income" />
+    </record>
+
+    <record id="chart511" model="account.account.template">
+        <field name="code">511</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">view</field>
+        <field name="parent_id" ref="chart5" />
+        <field name="user_type" ref="account_type_income" />
+        <field name="name">Doanh thu bán hàng và cung cấp dịch vụ</field>
+    </record>
+    <record id="chart5111" model="account.account.template">
+        <field name="code">5111</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart511" />
+        <field name="user_type" ref="account_type_income" />
+        <field name="name">Doanh thu bán hàng hóa</field>
+    </record>
+    <record id="chart5112" model="account.account.template">
+        <field name="code">5112</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart511" />
+        <field name="user_type" ref="account_type_income" />
+        <field name="name">Doanh thu bán các thành phẩm</field>
+    </record>
+    <record id="chart5113" model="account.account.template">
+        <field name="code">5113</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart511" />
+        <field name="user_type" ref="account_type_income" />
+        <field name="name">Doanh thu cung cấp dịch vụ</field>
+    </record>
+    <record id="chart5114" model="account.account.template">
+        <field name="code">5114</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart511" />
+        <field name="user_type" ref="account_type_income" />
+        <field name="name">Doanh thu trợ cấp, trợ giá</field>
+    </record>
+    <record id="chart5117" model="account.account.template">
+        <field name="code">5117</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart511" />
+        <field name="user_type" ref="account_type_income" />
+        <field name="name">Doanh thu kinh doanh bất động sản đầu tư</field>
+    </record>
+
+    <record id="chart512" model="account.account.template">
+        <field name="code">512</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">view</field>
+        <field name="parent_id" ref="chart5" />
+        <field name="user_type" ref="account_type_income" />
+        <field name="name">Doanh thu bán hàng nội bộ</field>
+    </record>
+    <record id="chart5121" model="account.account.template">
+        <field name="code">5121</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart512" />
+        <field name="user_type" ref="account_type_income" />
+        <field name="name">Doanh thu bán hàng hóa</field>
+    </record>
+    <record id="chart5122" model="account.account.template">
+        <field name="code">5122</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart512" />
+        <field name="user_type" ref="account_type_income" />
+        <field name="name">Doanh thu bán các thành phẩm</field>
+    </record>
+    <record id="chart5123" model="account.account.template">
+        <field name="code">5123</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart512" />
+        <field name="user_type" ref="account_type_income" />
+        <field name="name">Doanh thu cung cấp dịch vụ</field>
+    </record>
+
+    <record id="chart515" model="account.account.template">
+        <field name="code">515</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart5" />
+        <field name="user_type" ref="account_type_income" />
+        <field name="name">Doanh thu hoạt động tài chính khác</field>
+    </record>
+
+    <record id="chart521" model="account.account.template">
+        <field name="code">521</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart5" />
+        <field name="user_type" ref="account_type_income" />
+        <field name="name">Chiết khấu thương mại</field>
+    </record>
+
+    <record id="chart531" model="account.account.template">
+        <field name="code">531</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart5" />
+        <field name="user_type" ref="account_type_income" />
+        <field name="name">Hàng bán bị trả lại</field>
+    </record>
+
+    <record id="chart532" model="account.account.template">
+        <field name="code">532</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart5" />
+        <field name="user_type" ref="account_type_income" />
+        <field name="name">Giảm giá hàng bán</field>
+    </record>
+
+    <!-- Loại 6 -->
+    <record id="chart6" model="account.account.template">
+        <field name="code">6</field>
+        <field name="name">CHI PHÍ SẢN XUẤT, KINH DOANH</field>
+        <field name="type">view</field>
+        <field name="parent_id" ref="chart0" />
+        <field name="user_type" ref="account_type_expense" />
+    </record>
+
+    <record id="chart611" model="account.account.template">
+        <field name="code">611</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">view</field>
+        <field name="parent_id" ref="chart6" />
+        <field name="user_type" ref="account_type_expense" />
+        <field name="name">Mua hàng</field>
+    </record>
+    <record id="chart6111" model="account.account.template">
+        <field name="code">6111</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart611" />
+        <field name="user_type" ref="account_type_expense" />
+        <field name="name">Mua nguyên liệu, vật liệu</field>
+    </record>
+    <record id="chart6112" model="account.account.template">
+        <field name="code">6112</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart611" />
+        <field name="user_type" ref="account_type_expense" />
+        <field name="name">Mua hàng hóa</field>
+    </record>
+
+    <record id="chart621" model="account.account.template">
+        <field name="code">621</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart6" />
+        <field name="user_type" ref="account_type_expense" />
+        <field name="name">Chi phí nguyên liệu, vật liệu trực tiếp</field>
+    </record>
+
+    <record id="chart622" model="account.account.template">
+        <field name="code">622</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart6" />
+        <field name="user_type" ref="account_type_expense" />
+        <field name="name">Chi phí nhân công trực tiếp</field>
+    </record>
+
+    <record id="chart623" model="account.account.template">
+        <field name="code">623</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">view</field>
+        <field name="parent_id" ref="chart6" />
+        <field name="user_type" ref="account_type_expense" />
+        <field name="name">Chi phí sử dụng máy thi công</field>
+    </record>
+    <record id="chart6231" model="account.account.template">
+        <field name="code">6231</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart623" />
+        <field name="user_type" ref="account_type_expense" />
+        <field name="name">Chi phí nhân công</field>
+    </record>
+    <record id="chart6232" model="account.account.template">
+        <field name="code">6232</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart623" />
+        <field name="user_type" ref="account_type_expense" />
+        <field name="name">Chi phí vật liệu</field>
+    </record>
+    <record id="chart6233" model="account.account.template">
+        <field name="code">6233</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart623" />
+        <field name="user_type" ref="account_type_expense" />
+        <field name="name">Chi phí dụng cụ sản xuất</field>
+    </record>
+    <record id="chart6234" model="account.account.template">
+        <field name="code">6234</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart623" />
+        <field name="user_type" ref="account_type_expense" />
+        <field name="name">Chi phí khấu hao máy thi công</field>
+    </record>
+    <record id="chart6237" model="account.account.template">
+        <field name="code">6237</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart623" />
+        <field name="user_type" ref="account_type_expense" />
+        <field name="name">Chi phí dịch vụ mua ngoài</field>
+    </record>
+    <record id="chart6238" model="account.account.template">
+        <field name="code">6238</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart623" />
+        <field name="user_type" ref="account_type_expense" />
+        <field name="name">Chi phí bằng tiền khác</field>
+    </record>
+
+    <record id="chart627" model="account.account.template">
+        <field name="code">627</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">view</field>
+        <field name="parent_id" ref="chart6" />
+        <field name="user_type" ref="account_type_expense" />
+        <field name="name">Chi phí sản xuất chung</field>
+    </record>
+    <record id="chart6271" model="account.account.template">
+        <field name="code">6271</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart627" />
+        <field name="user_type" ref="account_type_expense" />
+        <field name="name">Chi phí nhân viên phân xưởng</field>
+    </record>
+    <record id="chart6272" model="account.account.template">
+        <field name="code">6272</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart627" />
+        <field name="user_type" ref="account_type_expense" />
+        <field name="name">Chi phí vật liệu</field>
+    </record>
+    <record id="chart6273" model="account.account.template">
+        <field name="code">6273</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart627" />
+        <field name="user_type" ref="account_type_expense" />
+        <field name="name">Chi phí dụng cụ sản xuất</field>
+    </record>
+    <record id="chart6274" model="account.account.template">
+        <field name="code">6274</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart627" />
+        <field name="user_type" ref="account_type_expense" />
+        <field name="name">Chi phí khấu hao TSCĐ</field>
+    </record>
+    <record id="chart6277" model="account.account.template">
+        <field name="code">6277</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart627" />
+        <field name="user_type" ref="account_type_expense" />
+        <field name="name">Chi phí dịch vụ mua ngoài</field>
+    </record>
+    <record id="chart6278" model="account.account.template">
+        <field name="code">6278</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart627" />
+        <field name="user_type" ref="account_type_expense" />
+        <field name="name">Chi phí bằng tiền khác</field>
+    </record>
+
+    <record id="chart631" model="account.account.template">
+        <field name="code">631</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart6" />
+        <field name="user_type" ref="account_type_expense" />
+        <field name="name">Giá thành sản xuất</field>
+    </record>
+
+    <record id="chart632" model="account.account.template">
+        <field name="code">632</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart6" />
+        <field name="user_type" ref="account_type_expense" />
+        <field name="name">Giá vốn hàng bán</field>
+    </record>
+
+    <record id="chart635" model="account.account.template">
+        <field name="code">635</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart6" />
+        <field name="user_type" ref="account_type_expense" />
+        <field name="name">Chi phí tài chính</field>
+    </record>
+
+    <record id="chart641" model="account.account.template">
+        <field name="code">641</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">view</field>
+        <field name="parent_id" ref="chart6" />
+        <field name="user_type" ref="account_type_expense" />
+        <field name="name">Chi phí bán hàng</field>
+    </record>
+    <record id="chart6411" model="account.account.template">
+        <field name="code">6411</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart641" />
+        <field name="user_type" ref="account_type_expense" />
+        <field name="name">Chi phí nhân viên</field>
+    </record>
+    <record id="chart6412" model="account.account.template">
+        <field name="code">6412</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart641" />
+        <field name="user_type" ref="account_type_expense" />
+        <field name="name">Chi phí vật liệu, bao bì</field>
+    </record>
+    <record id="chart6413" model="account.account.template">
+        <field name="code">6413</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart641" />
+        <field name="user_type" ref="account_type_expense" />
+        <field name="name">Chi phí dụng cụ, đồ dùng</field>
+    </record>
+    <record id="chart6414" model="account.account.template">
+        <field name="code">6414</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart641" />
+        <field name="user_type" ref="account_type_expense" />
+        <field name="name">Chi phí khấu hao TSCĐ</field>
+    </record>
+    <record id="chart6415" model="account.account.template">
+        <field name="code">6415</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart641" />
+        <field name="user_type" ref="account_type_expense" />
+        <field name="name">Chi phí bảo hành</field>
+    </record>
+    <record id="chart6417" model="account.account.template">
+        <field name="code">6417</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart641" />
+        <field name="user_type" ref="account_type_expense" />
+        <field name="name">Chi phí dịch vụ mua ngoài</field>
+    </record>
+    <record id="chart6418" model="account.account.template">
+        <field name="code">6418</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart641" />
+        <field name="user_type" ref="account_type_expense" />
+        <field name="name">Chi phí bằng tiền khác</field>
+    </record>
+
+    <record id="chart642" model="account.account.template">
+        <field name="code">642</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">view</field>
+        <field name="parent_id" ref="chart6" />
+        <field name="user_type" ref="account_type_expense" />
+        <field name="name">Chi phí quản lý doanh nghiệp</field>
+    </record>
+    <record id="chart6421" model="account.account.template">
+        <field name="code">6421</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart642" />
+        <field name="user_type" ref="account_type_expense" />
+        <field name="name">Chi phí nhân viên quản lý</field>
+    </record>
+    <record id="chart6422" model="account.account.template">
+        <field name="code">6422</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart642" />
+        <field name="user_type" ref="account_type_expense" />
+        <field name="name">Chi phí vật liệu quản lý</field>
+    </record>
+    <record id="chart6423" model="account.account.template">
+        <field name="code">6423</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart642" />
+        <field name="user_type" ref="account_type_expense" />
+        <field name="name">Chi phí đồ dùng văn phòng</field>
+    </record>
+    <record id="chart6424" model="account.account.template">
+        <field name="code">6424</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart642" />
+        <field name="user_type" ref="account_type_expense" />
+        <field name="name">Chi phí khấu hao tài sản cố định</field>
+    </record>
+    <record id="chart6425" model="account.account.template">
+        <field name="code">6425</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart642" />
+        <field name="user_type" ref="account_type_expense" />
+        <field name="name">Thuế, phí và lệ phí</field>
+    </record>
+    <record id="chart6426" model="account.account.template">
+        <field name="code">6426</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart642" />
+        <field name="user_type" ref="account_type_expense" />
+        <field name="name">Chi phí dự phòng</field>
+    </record>
+    <record id="chart6427" model="account.account.template">
+        <field name="code">6427</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart642" />
+        <field name="user_type" ref="account_type_expense" />
+        <field name="name">Chi phí dịch vụ mua ngoài</field>
+    </record>
+    <record id="chart6428" model="account.account.template">
+        <field name="code">6428</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart642" />
+        <field name="user_type" ref="account_type_expense" />
+        <field name="name">Chi phí bằng tiền khác</field>
+    </record>
+
+    <!-- Loại 7 -->
+    <record id="chart7" model="account.account.template">
+        <field name="code">7</field>
+        <field name="name">THU NHẬP KHÁC</field>
+        <field name="type">view</field>
+        <field name="parent_id" ref="chart0" />
+        <field name="user_type" ref="account_type_other_income" />
+    </record>
+
+    <record id="chart711" model="account.account.template">
+        <field name="code">711</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart7" />
+        <field name="user_type" ref="account_type_other_income" />
+        <field name="name">Thu nhập khác</field>
+    </record>
+
+    <!-- Loại 8 -->
+    <record id="chart8" model="account.account.template">
+        <field name="code">8</field>
+        <field name="name">CHI PHÍ KHÁC</field>
+        <field name="type">view</field>
+        <field name="parent_id" ref="chart0" />
+        <field name="user_type" ref="account_type_other_expense" />
+    </record>
+
+    <record id="chart811" model="account.account.template">
+        <field name="code">811</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart8" />
+        <field name="user_type" ref="account_type_other_expense" />
+        <field name="name">Chi phí khác</field>
+    </record>
+
+    <record id="chart821" model="account.account.template">
+        <field name="code">821</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">view</field>
+        <field name="parent_id" ref="chart8" />
+        <field name="user_type" ref="account_type_other_expense" />
+        <field name="name">Chi phí thuế thu nhập doanh nghiệp</field>
+    </record>
+    <record id="chart8211" model="account.account.template">
+        <field name="code">8211</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart821" />
+        <field name="user_type" ref="account_type_other_expense" />
+        <field name="name">Chi phí thuế TNDN hiện hành</field>
+    </record>
+    <record id="chart8212" model="account.account.template">
+        <field name="code">8212</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart821" />
+        <field name="user_type" ref="account_type_other_expense" />
+        <field name="name">Chi phí thuế TNDN hoãn lại</field>
+    </record>
+
+    <!-- Loại 9 -->
+    <record id="chart9" model="account.account.template">
+        <field name="code">9</field>
+        <field name="name">XÁC ĐỊNH KẾT QUẢ KINH DOANH</field>
+        <field name="type">view</field>
+        <field name="parent_id" ref="chart0" />
+        <field name="user_type" ref="account_type_evaluation" />
+    </record>
+
+    <record id="chart911" model="account.account.template">
+        <field name="code">911</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart9" />
+        <field name="user_type" ref="account_type_evaluation" />
+        <field name="name">Xác định kết quả kinh doanh</field>
+    </record>
+
+    <!-- Loại 10 -->
+    <record id="chart10" model="account.account.template">
+        <field name="code">X10</field>
+        <field name="name">TÀI KHOẢN NGOÀI BẢNG</field>
+        <field name="type">view</field>
+        <field name="parent_id" ref="chart0" />
+        <field name="user_type" ref="account_type_other" />
+    </record>
+
+    <record id="chart001" model="account.account.template">
+        <field name="code">001</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart10" />
+        <field name="user_type" ref="account_type_other" />
+        <field name="name">Tài sản thuê ngoài</field>
+    </record>
+
+    <record id="chart002" model="account.account.template">
+        <field name="code">002</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart10" />
+        <field name="user_type" ref="account_type_other" />
+        <field name="name">Vật tư, hàng hóa nhận giữ hộ, nhận gia công</field>
+    </record>
+
+    <record id="chart003" model="account.account.template">
+        <field name="code">003</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart10" />
+        <field name="user_type" ref="account_type_other" />
+        <field name="name">Hàng hóa nhận bán hộ, nhận ký gửi, ký cược</field>
+    </record>
+
+    <record id="chart004" model="account.account.template">
+        <field name="code">004</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart10" />
+        <field name="user_type" ref="account_type_other" />
+        <field name="name">Nợ khó đòi đã xử lý</field>
+    </record>
+
+    <record id="chart007" model="account.account.template">
+        <field name="code">007</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart10" />
+        <field name="user_type" ref="account_type_other" />
+        <field name="name">Ngoại tệ các loại</field>
+    </record>
+
+    <record id="chart008" model="account.account.template">
+        <field name="code">008</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart10" />
+        <field name="user_type" ref="account_type_other" />
+        <field name="name">Dự toán chi sự nghiệp, dự án</field>
+    </record>
+
+    <record id="chartoba" model="account.account.template">
+        <field name="code">OBA</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart10" />
+        <field name="user_type" ref="account_type_other" />
+        <field name="name">Opening Balance Account </field>
+    </record>
+
+    <!-- Chart template -->
+    <record id="vn_template" model="account.chart.template">
+        <field name="name">VN - Chart of Accounts</field>
+        <field name="code_digits">0</field>
+        <field name="account_root_id" ref="chart0" />
+        <field name="tax_code_root_id" ref="vat_code_tax" />
+        <field name="bank_account_view_id" ref="chart1121" />
+        <field name="property_account_receivable" ref="chart131" />
+        <field name="property_account_payable" ref="chart331" />
+        <field name="property_account_expense_categ" ref="chart1561" />
+        <field name="property_account_income_categ" ref="chart5111" />
+
+    </record>
+
+</data>
+</openerp>
diff --git a/addons/l10n_vn/account_tax.xml b/addons/l10n_vn/account_tax.xml
new file mode 100755
index 00000000000..85f068023c2
--- /dev/null
+++ b/addons/l10n_vn/account_tax.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0"?>
+<openerp>
+<data>
+
+    <!-- Tax Definitions -->
+    
+    <!-- for purchase -->
+    <record id="tax_purchase_vat10" model="account.tax.template">
+            <field name="chart_template_id" ref="vn_template"/>
+            <field name="name">Thuế GTGT được khấu trừ 10%</field>
+            <field name="amount" eval="0.100000"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="chart1331"/>
+            <field name="account_paid_id" ref="chart1331"/>
+            <field name="type_tax_use">purchase</field>
+            <field name="base_code_id" ref="l10n_vn.vat_code_tax_in_local_10_base"/>
+            <field name="tax_code_id" ref="l10n_vn.vat_code_tax_in_local_10_balance"/>
+            <field name="ref_base_code_id" ref="l10n_vn.vat_code_tax_in_local_10_base"/>
+            <field name="ref_tax_code_id" ref="l10n_vn.vat_code_tax_in_local_10_balance"/>
+    </record>
+    <record id="tax_purchase_vat5" model="account.tax.template">
+            <field name="chart_template_id" ref="vn_template"/>
+            <field name="name">Thuế GTGT được khấu trừ 5%</field>
+            <field name="amount" eval="0.050000"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="chart1331"/>
+            <field name="account_paid_id" ref="chart1331"/>
+            <field name="type_tax_use">purchase</field>
+            <field name="base_code_id" ref="l10n_vn.vat_code_tax_in_local_05_base"/>
+            <field name="tax_code_id" ref="l10n_vn.vat_code_tax_in_local_05_balance"/>
+            <field name="ref_base_code_id" ref="l10n_vn.vat_code_tax_in_local_05_base"/>
+            <field name="ref_tax_code_id" ref="l10n_vn.vat_code_tax_in_local_05_balance"/>
+    </record>
+    <record id="tax_purchase_vat0" model="account.tax.template">
+            <field name="chart_template_id" ref="vn_template"/>
+            <field name="name">Thuế GTGT được khấu trừ 0%</field>
+            <field name="amount" eval="0.000000"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="chart1331"/>
+            <field name="account_paid_id" ref="chart1331"/>
+            <field name="type_tax_use">purchase</field>
+            <field name="base_code_id" ref="l10n_vn.vat_code_tax_in_local_00_base"/>
+            <field name="tax_code_id" ref="l10n_vn.vat_code_tax_in_local_00_balance"/>
+            <field name="ref_base_code_id" ref="l10n_vn.vat_code_tax_in_local_00_base"/>
+            <field name="ref_tax_code_id" ref="l10n_vn.vat_code_tax_in_local_00_balance"/>
+    </record>
+    
+    <!-- for sale -->
+    <record id="tax_sale_vat10" model="account.tax.template">
+            <field name="chart_template_id" ref="vn_template"/>
+            <field name="name">Thuế GTGT phải nộp 10%</field>
+            <field name="amount" eval="0.100000"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="chart33311"/>
+            <field name="account_paid_id" ref="chart33311"/>
+            <field name="type_tax_use">sale</field>
+            <field name="base_code_id" ref="l10n_vn.vat_code_tax_out_local_10_base"/>
+            <field name="tax_code_id" ref="l10n_vn.vat_code_tax_out_local_10_balance"/>
+            <field name="ref_base_code_id" ref="l10n_vn.vat_code_tax_out_local_10_base"/>
+            <field name="ref_tax_code_id" ref="l10n_vn.vat_code_tax_out_local_10_balance"/>
+    </record>
+    <record id="tax_sale_vat5" model="account.tax.template">
+            <field name="chart_template_id" ref="vn_template"/>
+            <field name="name">Thuế GTGT phải nộp 5%</field>
+            <field name="amount" eval="0.050000"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="chart33311"/>
+            <field name="account_paid_id" ref="chart33311"/>
+            <field name="type_tax_use">sale</field>
+            <field name="base_code_id" ref="l10n_vn.vat_code_tax_out_local_05_base"/>
+            <field name="tax_code_id" ref="l10n_vn.vat_code_tax_out_local_05_balance"/>
+            <field name="ref_base_code_id" ref="l10n_vn.vat_code_tax_out_local_05_base"/>
+            <field name="ref_tax_code_id" ref="l10n_vn.vat_code_tax_out_local_05_balance"/>
+    </record>
+    <record id="tax_sale_vat0" model="account.tax.template">
+            <field name="chart_template_id" ref="vn_template"/>
+            <field name="name">Thuế GTGT phải nộp 0%</field>
+            <field name="amount" eval="0.000000"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="chart33311"/>
+            <field name="account_paid_id" ref="chart33311"/>
+            <field name="type_tax_use">sale</field>
+            <field name="base_code_id" ref="l10n_vn.vat_code_tax_out_local_00_base"/>
+            <field name="tax_code_id" ref="l10n_vn.vat_code_tax_out_local_00_balance"/>
+            <field name="ref_base_code_id" ref="l10n_vn.vat_code_tax_out_local_00_base"/>
+            <field name="ref_tax_code_id" ref="l10n_vn.vat_code_tax_out_local_00_balance"/>
+    </record>
+
+</data>
+</openerp>
diff --git a/addons/l10n_vn/account_tax_code.xml b/addons/l10n_vn/account_tax_code.xml
new file mode 100755
index 00000000000..4f3aee1bfc6
--- /dev/null
+++ b/addons/l10n_vn/account_tax_code.xml
@@ -0,0 +1,122 @@
+<?xml version="1.0"?>
+<openerp>
+<data>
+
+    <!-- Tax Code Definitions -->
+
+    <record model="account.tax.code.template" id="vat_code_tax">
+        <field name="name">Tờ khai thuế GTGT</field>
+        <field name="code">MAIN</field>
+    </record>
+    
+    <record model="account.tax.code.template" id="vat_code_tax_in">
+        <field name="name">HHDV mua vào</field>
+        <field name="parent_id" ref="vat_code_tax"/>
+        <field name="code">IN</field>
+    </record>
+    
+    <record model="account.tax.code.template" id="vat_code_tax_out">
+        <field name="name">HHDV bán ra</field>
+        <field name="parent_id" ref="vat_code_tax"/>
+        <field name="code">OUT</field>
+    </record>
+    
+    <!-- Tax base -->
+    <record model="account.tax.code.template" id="vat_code_tax_in_local_base">
+        <field name="name">Giá trị HHDV mua vào</field>
+        <field name="parent_id" ref="vat_code_tax_in"/>
+        <field name="code">IN_BASE</field>
+    </record>
+    
+    <record model="account.tax.code.template" id="vat_code_tax_in_local_00_base">
+        <field name="name">Giá trị HHDV mua vào chịu thuế 0%</field>
+        <field name="parent_id" ref="vat_code_tax_in_local_base"/>
+        <field name="code">IN_BASE_00</field>
+    </record>
+    
+    <record model="account.tax.code.template" id="vat_code_tax_in_local_05_base">
+        <field name="name">Giá trị HHDV mua vào chịu thuế 5%</field>
+        <field name="parent_id" ref="vat_code_tax_in_local_base"/>
+        <field name="code">IN_BASE_05</field>
+    </record>
+    
+    <record model="account.tax.code.template" id="vat_code_tax_in_local_10_base">
+        <field name="name">Giá trị HHDV mua vào chịu thuế 10%</field>
+        <field name="parent_id" ref="vat_code_tax_in_local_base"/>
+        <field name="code">IN_BASE_10</field>
+    </record>
+    
+    <record model="account.tax.code.template" id="vat_code_tax_out_local_base">
+        <field name="name">Giá trị HHDV bán ra</field>
+        <field name="parent_id" ref="vat_code_tax_out"/>
+        <field name="code">OUT_BASE</field>
+    </record>
+    
+    <record model="account.tax.code.template" id="vat_code_tax_out_local_00_base">
+        <field name="name">Giá trị HHDV bán ra chịu thuế 0%</field>
+        <field name="parent_id" ref="vat_code_tax_out_local_base"/>
+        <field name="code">OUT_BASE_00</field>
+    </record>
+    
+    <record model="account.tax.code.template" id="vat_code_tax_out_local_05_base">
+        <field name="name">Giá trị HHDV bán ra chịu thuế 5%</field>
+        <field name="parent_id" ref="vat_code_tax_out_local_base"/>
+        <field name="code">OUT_BASE_05</field>
+    </record>
+    
+    <record model="account.tax.code.template" id="vat_code_tax_out_local_10_base">
+        <field name="name">Giá trị HHDV bán ra chịu thuế 10%</field>
+        <field name="parent_id" ref="vat_code_tax_out_local_base"/>
+        <field name="code">OUT_BASE_10</field>
+    </record>
+    
+    <!-- Tax balance -->
+    <record model="account.tax.code.template" id="vat_code_tax_in_local_balance">
+        <field name="name">Thuế GTGT HHDV mua vào</field>
+        <field name="parent_id" ref="vat_code_tax_in"/>
+        <field name="code">IN_BALANCE</field>
+    </record>
+    
+    <record model="account.tax.code.template" id="vat_code_tax_in_local_00_balance">
+        <field name="name">Thuế GTGT HHDV mua vào chịu thuế 0%</field>
+        <field name="parent_id" ref="vat_code_tax_in_local_balance"/>
+        <field name="code">IN_BALANCE_00</field>
+    </record>
+    
+    <record model="account.tax.code.template" id="vat_code_tax_in_local_05_balance">
+        <field name="name">Thuế GTGT HHDV mua vào chịu thuế 5%</field>
+        <field name="parent_id" ref="vat_code_tax_in_local_balance"/>
+        <field name="code">IN_BALANCE_05</field>
+    </record>
+    
+    <record model="account.tax.code.template" id="vat_code_tax_in_local_10_balance">
+        <field name="name">Thuế GTGT HHDV mua vào chịu thuế 10%</field>
+        <field name="parent_id" ref="vat_code_tax_in_local_balance"/>
+        <field name="code">IN_BALANCE_10</field>
+    </record>
+    
+    <record model="account.tax.code.template" id="vat_code_tax_out_local_balance">
+        <field name="name">Thuế GTGT HHDV bán ra</field>
+        <field name="parent_id" ref="vat_code_tax_out"/>
+        <field name="code">OUT_BALANCE</field>
+    </record>
+    
+    <record model="account.tax.code.template" id="vat_code_tax_out_local_00_balance">
+        <field name="name">Thuế GTGT HHDV bán ra chịu thuế 0%</field>
+        <field name="parent_id" ref="vat_code_tax_out_local_balance"/>
+        <field name="code">OUT_BALANCE_00</field>
+    </record>
+    
+    <record model="account.tax.code.template" id="vat_code_tax_out_local_05_balance">
+        <field name="name">Thuế GTGT HHDV bán ra chịu thuế 5%</field>
+        <field name="parent_id" ref="vat_code_tax_out_local_balance"/>
+        <field name="code">OUT_BALANCE_05</field>
+    </record>
+    
+    <record model="account.tax.code.template" id="vat_code_tax_out_local_10_balance">
+        <field name="name">Thuế GTGT HHDV bán ra chịu thuế 10%</field>
+        <field name="parent_id" ref="vat_code_tax_out_local_balance"/>
+        <field name="code">OUT_BALANCE_10</field>
+    </record>
+</data>
+</openerp>
diff --git a/addons/l10n_vn/l10n_vn_wizard.xml b/addons/l10n_vn/l10n_vn_wizard.xml
new file mode 100755
index 00000000000..368a3cbd8b3
--- /dev/null
+++ b/addons/l10n_vn/l10n_vn_wizard.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<openerp>
+    <data noupdate="1">
+
+        <record id="account.action_wizard_multi_chart_todo" model="ir.actions.todo">
+            <field name="state">open</field>
+        </record>
+        
+    </data>
+</openerp>        
\ No newline at end of file
diff --git a/addons/l10n_vn/static/src/img/icon.png b/addons/l10n_vn/static/src/img/icon.png
new file mode 100755
index 00000000000..241a2d3fa74
Binary files /dev/null and b/addons/l10n_vn/static/src/img/icon.png differ
diff --git a/addons/lunch/i18n/ko.po b/addons/lunch/i18n/ko.po
new file mode 100644
index 00000000000..e76966ad73b
--- /dev/null
+++ b/addons/lunch/i18n/ko.po
@@ -0,0 +1,896 @@
+# Korean 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: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2013-05-11 19:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Korean <ko@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: 2013-05-12 05:28+0000\n"
+"X-Generator: Launchpad (build 16598)\n"
+
+#. module: lunch
+#: field:lunch.product,category_id:0
+#: field:lunch.product.category,name:0
+msgid "Category"
+msgstr "범주"
+
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch_order_by_supplier_form
+msgid "Today's Orders by Supplier"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.order:0
+msgid "My Orders"
+msgstr ""
+
+#. module: lunch
+#: selection:lunch.order,state:0
+msgid "Partially Confirmed"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.cashmove:0
+#: view:lunch.order.line:0
+msgid "Group By..."
+msgstr ""
+
+#. module: lunch
+#: field:lunch.alert,sunday:0
+msgid "Sunday"
+msgstr ""
+
+#. module: lunch
+#: field:lunch.order.line,supplier:0
+#: field:lunch.product,supplier:0
+msgid "Supplier"
+msgstr "공급업체"
+
+#. module: lunch
+#: view:lunch.order.line:0
+msgid "Today"
+msgstr "오늘"
+
+#. module: lunch
+#: selection:report.lunch.order.line,month:0
+msgid "March"
+msgstr "3월"
+
+#. module: lunch
+#: view:lunch.cashmove:0
+msgid "By Employee"
+msgstr "직원에 의해"
+
+#. module: lunch
+#: field:lunch.alert,friday:0
+msgid "Friday"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.validation:0
+msgid "validate order lines"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.order.line:0
+msgid "Order lines Tree"
+msgstr ""
+
+#. module: lunch
+#: field:lunch.alert,specific_day:0
+#: field:report.lunch.order.line,day:0
+msgid "Day"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.order.line:0
+#: selection:lunch.order.line,state:0
+msgid "Received"
+msgstr "받음"
+
+#. module: lunch
+#: view:lunch.order.line:0
+msgid "By Supplier"
+msgstr ""
+
+#. module: lunch
+#: model:ir.actions.act_window,help:lunch.action_lunch_order_tree
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a lunch order. \n"
+"            </p>\n"
+"            <p>\n"
+"                A lunch order is defined by its user, date and order lines.\n"
+"                Each order line corresponds to a product, an additional note "
+"and a price.\n"
+"                Before selecting your order lines, don't forget to read the "
+"warnings displayed in the reddish area.\n"
+"            </p>\n"
+"            "
+msgstr ""
+
+#. module: lunch
+#: view:lunch.order.line:0
+msgid "Not Received"
+msgstr ""
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_lunch_order_by_supplier_form
+#: model:ir.ui.menu,name:lunch.menu_lunch_control_suppliers
+msgid "Orders by Supplier"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.validation:0
+msgid "Receive Meals"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.cashmove:0
+msgid "cashmove form"
+msgstr ""
+
+#. module: lunch
+#: model:ir.actions.act_window,help:lunch.action_lunch_cashmove_form
+msgid ""
+"<p>\n"
+"                Here you can see your cash moves.<br/>A cash moves can be "
+"either an expense or a payment.\n"
+"                An expense is automatically created when an order is "
+"received while a payment is a reimbursement to the company encoded by the "
+"manager.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: lunch
+#: field:lunch.cashmove,amount:0
+msgid "Amount"
+msgstr ""
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_lunch_products
+#: model:ir.ui.menu,name:lunch.menu_lunch_products
+#: field:lunch.order,order_line_ids:0
+msgid "Products"
+msgstr "상품"
+
+#. module: lunch
+#: view:lunch.order.line:0
+msgid "By Date"
+msgstr ""
+
+#. module: lunch
+#: selection:lunch.order,state:0
+#: view:lunch.order.line:0
+#: selection:lunch.order.line,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.cashmove:0
+msgid "lunch employee payment"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.alert:0
+msgid "alert tree"
+msgstr ""
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_report_lunch_order_line
+msgid "Lunch Orders Statistics"
+msgstr ""
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_lunch_alert
+msgid "Lunch Alert"
+msgstr ""
+
+#. module: lunch
+#: code:addons/lunch/lunch.py:183
+#, python-format
+msgid "Select a product and put your order comments on the note."
+msgstr ""
+
+#. module: lunch
+#: selection:lunch.alert,alter_type:0
+msgid "Every Week"
+msgstr ""
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_lunch_cashmove
+msgid "Register Cash Moves"
+msgstr ""
+
+#. module: lunch
+#: selection:lunch.order,state:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.order:0
+msgid "lunch orders"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.order.line:0
+msgid "Confirm"
+msgstr "확정"
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_lunch_cashmove_form
+msgid "Your Account"
+msgstr ""
+
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch_cashmove_form
+msgid "Your Lunch Account"
+msgstr "점심 계정"
+
+#. module: lunch
+#: field:lunch.alert,active_from:0
+msgid "Between"
+msgstr ""
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_lunch_order_order
+msgid "Wizard to order a meal"
+msgstr ""
+
+#. module: lunch
+#: selection:lunch.order,state:0
+#: selection:lunch.order.line,state:0
+msgid "New"
+msgstr ""
+
+#. module: lunch
+#: code:addons/lunch/lunch.py:180
+#, python-format
+msgid "This is the first time you order a meal"
+msgstr "이것은 첫번쨰 고기 주문입니다."
+
+#. module: lunch
+#: field:report.lunch.order.line,price_total:0
+msgid "Total Price"
+msgstr "총액"
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_lunch_validation
+msgid "lunch validation for order"
+msgstr ""
+
+#. module: lunch
+#: report:lunch.order.line:0
+msgid "Name/Date"
+msgstr "이름/날짜"
+
+#. module: lunch
+#: report:lunch.order.line:0
+msgid "Total :"
+msgstr "합계 :"
+
+#. module: lunch
+#: selection:report.lunch.order.line,month:0
+msgid "July"
+msgstr ""
+
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch_config
+msgid "Configuration"
+msgstr ""
+
+#. module: lunch
+#: field:lunch.order,state:0
+#: field:lunch.order.line,state:0
+msgid "Status"
+msgstr "상태"
+
+#. module: lunch
+#: view:lunch.order.order:0
+msgid ""
+"Order a meal doesn't mean that we have to pay it.\n"
+"                        A meal should be paid when it is received."
+msgstr ""
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_lunch_control_accounts
+#: model:ir.ui.menu,name:lunch.menu_lunch_control_accounts
+msgid "Control Accounts"
+msgstr ""
+
+#. module: lunch
+#: selection:lunch.alert,alter_type:0
+msgid "Every Day"
+msgstr "매일"
+
+#. module: lunch
+#: field:lunch.order.line,cashmove:0
+msgid "Cash Move"
+msgstr ""
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.order_order_lines
+msgid "Order meals"
+msgstr "육류 주문"
+
+#. module: lunch
+#: view:lunch.alert:0
+msgid "Schedule Hour"
+msgstr ""
+
+#. module: lunch
+#: selection:report.lunch.order.line,month:0
+msgid "September"
+msgstr "9월"
+
+#. module: lunch
+#: model:ir.actions.act_window,help:lunch.action_lunch_control_suppliers
+msgid ""
+"<p>\n"
+"                Here you can see every orders grouped by suppliers and by "
+"date.\n"
+"              </p>\n"
+"              <p>\n"
+"                - Click on the <img "
+"src=\"../../../web/static/src/img/icons/terp-call-start.png\"/> to announce "
+"that the order is ordered <br/>\n"
+"                - Click on the <img "
+"src=\"../../../web/static/src/img/icons/gtk-apply.png\"/> to announce that "
+"the order is received <br/>\n"
+"                - Click on the <img "
+"src=\"../../../web/static/src/img/icons/gtk-cancel.png\"/> red X to announce "
+"that the order isn't available\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: lunch
+#: field:lunch.alert,tuesday:0
+msgid "Tuesday"
+msgstr ""
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_lunch_order_tree
+msgid "Your Orders"
+msgstr ""
+
+#. module: lunch
+#: field:report.lunch.order.line,month:0
+msgid "Month"
+msgstr ""
+
+#. module: lunch
+#: model:ir.actions.act_window,help:lunch.action_lunch_products
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a product for lunch. \n"
+"            </p>\n"
+"              <p>\n"
+"                A product is defined by its name, category, price and "
+"supplier.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: lunch
+#: view:lunch.alert:0
+#: field:lunch.alert,message:0
+msgid "Message"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.order.order:0
+msgid "Order Meals"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.cancel:0
+#: view:lunch.order.order:0
+#: view:lunch.validation:0
+msgid "or"
+msgstr ""
+
+#. module: lunch
+#: model:ir.actions.act_window,help:lunch.action_lunch_product_categories
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a lunch category. \n"
+"            </p>\n"
+"              <p>\n"
+"                Here you can find every lunch categories for products.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: lunch
+#: view:lunch.order.order:0
+msgid "Order meal"
+msgstr ""
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_lunch_product_categories
+#: model:ir.ui.menu,name:lunch.menu_lunch_product_categories
+msgid "Product Categories"
+msgstr ""
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_lunch_control_suppliers
+msgid "Control Suppliers"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.alert:0
+msgid "Schedule Date"
+msgstr ""
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_lunch_alert
+#: model:ir.ui.menu,name:lunch.menu_lunch_alert
+#: field:lunch.order,alerts:0
+msgid "Alerts"
+msgstr ""
+
+#. module: lunch
+#: field:lunch.order.line,note:0
+#: field:report.lunch.order.line,note:0
+msgid "Note"
+msgstr ""
+
+#. module: lunch
+#: code:addons/lunch/lunch.py:250
+#, python-format
+msgid "Add"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.product:0
+#: view:lunch.product.category:0
+msgid "Products Form"
+msgstr ""
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.cancel_order_lines
+msgid "Cancel meals"
+msgstr ""
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_lunch_cashmove
+#: view:lunch.cashmove:0
+msgid "lunch cashmove"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.cancel:0
+msgid "Are you sure you want to cancel these meals?"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.cashmove:0
+msgid "My Account"
+msgstr ""
+
+#. module: lunch
+#: selection:report.lunch.order.line,month:0
+msgid "August"
+msgstr ""
+
+#. module: lunch
+#: field:lunch.alert,monday:0
+msgid "Monday"
+msgstr ""
+
+#. module: lunch
+#: field:lunch.order.line,name:0
+msgid "unknown"
+msgstr ""
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.validate_order_lines
+msgid "Receive meals"
+msgstr ""
+
+#. module: lunch
+#: selection:report.lunch.order.line,month:0
+msgid "June"
+msgstr ""
+
+#. module: lunch
+#: field:lunch.cashmove,user_id:0
+#: field:lunch.order,user_id:0
+#: field:report.lunch.order.line,user_id:0
+msgid "User Name"
+msgstr ""
+
+#. module: lunch
+#: model:ir.module.category,name:lunch.module_lunch_category
+#: model:ir.ui.menu,name:lunch.menu_lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch_title
+msgid "Lunch"
+msgstr ""
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_lunch_order_line
+msgid "lunch order line"
+msgstr ""
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_lunch_product
+msgid "lunch product"
+msgstr ""
+
+#. module: lunch
+#: field:lunch.order.line,user_id:0
+#: model:res.groups,name:lunch.group_lunch_user
+msgid "User"
+msgstr ""
+
+#. module: lunch
+#: field:lunch.cashmove,date:0
+#: field:lunch.order,date:0
+#: field:lunch.order.line,date:0
+msgid "Date"
+msgstr ""
+
+#. module: lunch
+#: selection:report.lunch.order.line,month:0
+msgid "November"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.order:0
+msgid "Orders Tree"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.order:0
+msgid "Orders Form"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.alert:0
+#: view:lunch.order.line:0
+msgid "Search"
+msgstr ""
+
+#. module: lunch
+#: selection:report.lunch.order.line,month:0
+msgid "October"
+msgstr ""
+
+#. module: lunch
+#: model:ir.actions.act_window,help:lunch.action_lunch_order_by_supplier_form
+msgid ""
+"<p>\n"
+"                Here you can see today's orders grouped by suppliers.\n"
+"              </p>\n"
+"              <p>\n"
+"                - Click on the <img "
+"src=\"../../../web/static/src/img/icons/terp-call-start.png\"/> to announce "
+"that the order is ordered <br/>\n"
+"                - Click on the <img "
+"src=\"../../../web/static/src/img/icons/gtk-apply.png\"/> to announce that "
+"the order is received <br/>\n"
+"                - Click on the <img "
+"src=\"../../../web/static/src/img/icons/gtk-cancel.png\"/> to announce that "
+"the order isn't available\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: lunch
+#: selection:report.lunch.order.line,month:0
+msgid "January"
+msgstr ""
+
+#. module: lunch
+#: selection:lunch.alert,alter_type:0
+msgid "Specific Day"
+msgstr ""
+
+#. module: lunch
+#: field:lunch.alert,wednesday:0
+msgid "Wednesday"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.product.category:0
+msgid "Product Category: "
+msgstr ""
+
+#. module: lunch
+#: field:lunch.alert,active_to:0
+msgid "And"
+msgstr ""
+
+#. module: lunch
+#: selection:lunch.order.line,state:0
+msgid "Ordered"
+msgstr ""
+
+#. module: lunch
+#: field:report.lunch.order.line,date:0
+msgid "Date Order"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.cancel:0
+msgid "Cancel Orders"
+msgstr ""
+
+#. module: lunch
+#: model:ir.actions.act_window,help:lunch.action_lunch_alert
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a lunch alert. \n"
+"            </p>\n"
+"              <p>\n"
+"                Alerts are used to warn employee from possible issues "
+"concerning the lunch orders.\n"
+"                To create a lunch alert you have to define its recurrency, "
+"the time interval during which the alert should be executed and the message "
+"to display.\n"
+"            </p>\n"
+"            <p>\n"
+"                Example: <br/>\n"
+"                - Recurency: Everyday<br/>\n"
+"                - Time interval: from 00h00 am to 11h59 pm<br/>\n"
+"                - Message: \"You must order before 10h30 am\"\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: lunch
+#: view:lunch.cancel:0
+msgid "A cancelled meal should not be paid by employees."
+msgstr ""
+
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch_cash
+msgid "Administrate Cash Moves"
+msgstr ""
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_lunch_cancel
+msgid "cancel lunch order"
+msgstr ""
+
+#. module: lunch
+#: selection:report.lunch.order.line,month:0
+msgid "December"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.cancel:0
+#: view:lunch.order.line:0
+#: view:lunch.order.order:0
+#: view:lunch.validation:0
+msgid "Cancel"
+msgstr ""
+
+#. module: lunch
+#: model:ir.actions.act_window,help:lunch.action_lunch_cashmove
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a payment. \n"
+"            </p>\n"
+"              <p>\n"
+"                Here you can see the employees' payment. A payment is a cash "
+"move from the employee to the company.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: lunch
+#: code:addons/lunch/lunch.py:186
+#, python-format
+msgid "Your favorite meals will be created based on your last orders."
+msgstr ""
+
+#. module: lunch
+#: model:ir.module.category,description:lunch.module_lunch_category
+msgid ""
+"Helps you handle your lunch needs, if you are a manager you will be able to "
+"create new products, cashmoves and to confirm or cancel orders."
+msgstr ""
+
+#. module: lunch
+#: model:ir.actions.act_window,help:lunch.action_lunch_control_accounts
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new payment. \n"
+"            </p>\n"
+"              <p>\n"
+"                A cashmove can either be an expense or a payment.<br/>\n"
+"                An expense is automatically created at the order "
+"receipt.<br/>\n"
+"                A payment represents the employee reimbursement to the "
+"company.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: lunch
+#: field:lunch.alert,alter_type:0
+msgid "Recurrency"
+msgstr ""
+
+#. module: lunch
+#: code:addons/lunch/lunch.py:189
+#, python-format
+msgid "Don't forget the alerts displayed in the reddish area"
+msgstr ""
+
+#. module: lunch
+#: field:lunch.alert,thursday:0
+msgid "Thursday"
+msgstr ""
+
+#. module: lunch
+#: report:lunch.order.line:0
+msgid "Unit Price"
+msgstr ""
+
+#. module: lunch
+#: field:lunch.order.line,product_id:0
+#: field:lunch.product,name:0
+msgid "Product"
+msgstr ""
+
+#. module: lunch
+#: field:lunch.cashmove,description:0
+#: report:lunch.order.line:0
+#: field:lunch.product,description:0
+msgid "Description"
+msgstr ""
+
+#. module: lunch
+#: selection:report.lunch.order.line,month:0
+msgid "May"
+msgstr ""
+
+#. module: lunch
+#: field:lunch.order.line,price:0
+#: field:lunch.product,price:0
+msgid "Price"
+msgstr ""
+
+#. module: lunch
+#: field:lunch.cashmove,state:0
+msgid "Is an order or a Payment"
+msgstr ""
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_lunch_order_form
+#: model:ir.ui.menu,name:lunch.menu_lunch_order_form
+msgid "New Order"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.cashmove:0
+msgid "cashmove tree"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.cancel:0
+msgid "Cancel a meal means that we didn't receive it from the supplier."
+msgstr ""
+
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch_cashmove
+msgid "Employee Payments"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.cashmove:0
+#: selection:lunch.cashmove,state:0
+msgid "Payment"
+msgstr ""
+
+#. module: lunch
+#: selection:report.lunch.order.line,month:0
+msgid "February"
+msgstr ""
+
+#. module: lunch
+#: field:report.lunch.order.line,year:0
+msgid "Year"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.order:0
+msgid "List"
+msgstr ""
+
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch_admin
+msgid "Administrate Orders"
+msgstr ""
+
+#. module: lunch
+#: selection:report.lunch.order.line,month:0
+msgid "April"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.order:0
+msgid "Select your order"
+msgstr ""
+
+#. module: lunch
+#: field:lunch.cashmove,order_id:0
+#: selection:lunch.cashmove,state:0
+#: report:lunch.order.line:0
+#: view:lunch.order.line:0
+#: field:lunch.order.line,order_id:0
+msgid "Order"
+msgstr ""
+
+#. module: lunch
+#: model:ir.actions.report.xml,name:lunch.report_lunch_order
+#: model:ir.model,name:lunch.model_lunch_order
+#: report:lunch.order.line:0
+msgid "Lunch Order"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.order.order:0
+msgid "Are you sure you want to order these meals?"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.cancel:0
+msgid "cancel order lines"
+msgstr ""
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_lunch_product_category
+msgid "lunch product category"
+msgstr ""
+
+#. module: lunch
+#: field:lunch.alert,saturday:0
+msgid "Saturday"
+msgstr ""
+
+#. module: lunch
+#: model:res.groups,name:lunch.group_lunch_manager
+msgid "Manager"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.validation:0
+msgid "Did your received these meals?"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.validation:0
+msgid "Once a meal is received a new cash move is created for the employee."
+msgstr ""
+
+#. module: lunch
+#: view:lunch.product:0
+msgid "Products Tree"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.cashmove:0
+#: view:lunch.order:0
+#: field:lunch.order,total:0
+#: view:lunch.order.line:0
+msgid "Total"
+msgstr ""
+
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch_order_tree
+msgid "Previous Orders"
+msgstr ""
diff --git a/addons/mail/data/mail_data.xml b/addons/mail/data/mail_data.xml
index 02cfd626768..4e935e4aa88 100644
--- a/addons/mail/data/mail_data.xml
+++ b/addons/mail/data/mail_data.xml
@@ -40,6 +40,12 @@
             <field name="args">()</field>
         </record>
 
+        <!-- Catchall Email Alias -->
+        <record id="icp_mail_catchall_alias" model="ir.config_parameter">
+            <field name="key">mail.catchall.alias</field>
+            <field name="value">catchall</field>
+        </record>
+
         <!-- Discussion subtype for messaging / Chatter -->
         <record id="mt_comment" model="mail.message.subtype">
             <field name="name">Discussions</field>
diff --git a/addons/mail/html/index.html b/addons/mail/html/index.html
new file mode 100644
index 00000000000..b564cf3ab1e
--- /dev/null
+++ b/addons/mail/html/index.html
@@ -0,0 +1,178 @@
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <div class="oe_span12">
+            <h2 class="oe_slogan">Enterprise Social Network</h2>
+            <h3 class="oe_slogan">A private social network for your company</h3>
+        </div>
+        <div class="oe_span6">
+            <div class="oe_demo oe_picture oe_screenshot">
+                <a href="https://www.openerp.com/saas_master/demo?lang=en_US&module=crm">
+                    <img src="mail_sc_00.png">
+                </a>
+                <div class="oe_demo_footer oe_centeralign">Online Demo</div>
+            </div>
+        </div>
+        <div class="oe_span6">
+            <p class="oe_mt32">
+Connect with experts, follow what interests you, share documents and promote
+best practices. Get work done with effective collaboration across departments,
+geographies, documents and business applications. All of this while decreasing
+email overload.
+
+            </p>
+            <div class="oe_centeralign oe_websiteonly">
+                <a href="http://www.openerp.com/start" class="oe_button oe_big oe_tacky">Start your <span class="oe_emph">free</span> trial</a>
+            </div>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container oe_dark">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan">Connect with experts</h2>
+        <h3 class="oe_slogan">Get the right information, when you need it</h3>
+        <div class="oe_span6">
+            <p class="oe_mt32">
+Next time you have a question for the marketing, sales, R&amp;D or any other
+department, don't send an email blast-post the question to OpenERP and get
+answers from the right persons.
+            </p>
+        </div>
+        <div class="oe_span6">
+            <div class="oe_row_img oe_centered">
+                <img class="oe_picture oe_screenshot" src="mail_sc_01.png">
+            </div>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan">Follow what interests you</h2>
+        <h3 class="oe_slogan">Make the information flow across your company</h3>
+        <div class="oe_span6">
+            <div class="oe_row_img oe_centered">
+                <img class="oe_picture" src="mail_sc_02.png">
+            </div>
+        </div>
+        <div class="oe_span6">
+            <p class="oe_mt32">
+Want to get informed about new product features, hot deals, bottlenecks in projects or any other event? Just follow what interests you to get the information you need what you need; no more, no less.
+            </p>
+        </div>
+    </div>
+</section>
+
+
+<section class="oe_container oe_dark">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan">Get Things Done</h2>
+        <h3 class="oe_slogan">Your inbox is a todo list</h3>
+        <div class="oe_span6">
+            <p class="oe_mt32">
+You can process (not only read) the inbox and easily mark messages for future actions. Start feeling the pleasure of having an empty inbox every day; no more overload of information.
+            </p>
+        </div>
+        <div class="oe_span6">
+            <div class="oe_row_img oe_centered">
+                <img class="oe_picture oe_screenshot" src="mail_sc_03.png">
+            </div>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan">Promote best practices</h2>
+        <h3 class="oe_slogan">Discussion groups at your fingertips</h3>
+        <div class="oe_span6">
+            <div class="oe_row_img oe_centered">
+                <img class="oe_picture oe_screenshot" src="mail_sc_04.png">
+            </div>
+        </div>
+        <div class="oe_span6">
+            <p class="oe_mt32">
+Cut back on meetings and email chains by working together in groups of interests. Create a group to let people share files, discuss ideas, and vote to promote best practices.
+            </p>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container oe_dark">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan">Improve Access to Information and Expertise</h2>
+        <h3 class="oe_slogan">Easily find the information you need</h3>
+        <div class="oe_span6">
+            <p class="oe_mt32">
+Break down information silos. Search across your existing systems to find the answers and expertise you need to complete projects quickly.
+            </p>
+        </div>
+        <div class="oe_span6">
+            <div class="oe_row_img oe_centered">
+                <img class="oe_picture oe_screenshot" src="mail_illustration.png">
+            </div>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan">Collaborate securely</h2>
+        <div class="oe_span6">
+            <div class="oe_row_img oe_centered">
+                <img class="oe_picture oe_screenshot" src="mail_sc_06.png">
+            </div>
+        </div>
+        <div class="oe_span6">
+            <p class="oe_mt32">
+Set the right security policy; public, private or on invitation only -- according to the information sensitivity.
+            </p>
+        </div>
+    </div>
+</section>
+
+
+<section class="oe_container oe_dark">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan">A Twitter-like Network For Your Company </h2>
+        <div class="oe_span6">
+            <p class="oe_mt32">
+Make every employee feel more connected and engaged with twitter-like features
+for your own company. Follow people, share best practices, 'like' top ideas, etc.
+            </p>
+        </div>
+        <div class="oe_span6">
+            <div class="oe_row_img oe_centered">
+                <img class="oe_picture oe_screenshot" src="mail_sc_07.png">
+            </div>
+        </div>
+    </div>
+</section>
+
+
+<section class="oe_container">
+    <div class="oe_row">
+        <div class="oe_span12">
+            <h2 class="oe_slogan">Trusted by millions worldwide</h2>
+        </div>
+        <div class="oe_span12">
+            <div class="oe_quote">
+                <q>
+                Emails make me waste my time. But I need them. Reading my inbox
+                is the most unproductive task I do on a daily basis. I have to
+                spend one or two full hours a day to process my emails. All the
+                junk flows in the same inbox; spams, information that doesn't
+                matter, quoted answers of quoted answers, etc. At the end of
+                the hour, only 10 emails actually requested an answer from me.
+                Since I use OpenERP, I can do the same job in only 10 minutes!
+                </q>
+                <cite class="oe_cite oe_clearfix">
+                    <img class="oe_photo" src="photo.png">
+                    <div class="oe_author">Luc de Keyser</div>
+                </cite>
+            </div>
+        </div>
+    </div>
+</section>
+<section class="oe_container oe_separator">
+</section>
diff --git a/addons/mail/html/mail_illustration.png b/addons/mail/html/mail_illustration.png
new file mode 100644
index 00000000000..4fff4837faa
Binary files /dev/null and b/addons/mail/html/mail_illustration.png differ
diff --git a/addons/mail/html/mail_sc_00.png b/addons/mail/html/mail_sc_00.png
new file mode 100644
index 00000000000..3011ef129b5
Binary files /dev/null and b/addons/mail/html/mail_sc_00.png differ
diff --git a/addons/mail/html/mail_sc_01.png b/addons/mail/html/mail_sc_01.png
new file mode 100644
index 00000000000..1b1099f6536
Binary files /dev/null and b/addons/mail/html/mail_sc_01.png differ
diff --git a/addons/mail/html/mail_sc_02.png b/addons/mail/html/mail_sc_02.png
new file mode 100644
index 00000000000..4e59c9d1e0f
Binary files /dev/null and b/addons/mail/html/mail_sc_02.png differ
diff --git a/addons/mail/html/mail_sc_03.png b/addons/mail/html/mail_sc_03.png
new file mode 100644
index 00000000000..dbb14b4da36
Binary files /dev/null and b/addons/mail/html/mail_sc_03.png differ
diff --git a/addons/mail/html/mail_sc_04.png b/addons/mail/html/mail_sc_04.png
new file mode 100644
index 00000000000..b8f47ba2935
Binary files /dev/null and b/addons/mail/html/mail_sc_04.png differ
diff --git a/addons/mail/html/mail_sc_05.png b/addons/mail/html/mail_sc_05.png
new file mode 100644
index 00000000000..251b4ebc676
Binary files /dev/null and b/addons/mail/html/mail_sc_05.png differ
diff --git a/addons/mail/html/mail_sc_06.png b/addons/mail/html/mail_sc_06.png
new file mode 100644
index 00000000000..251b4ebc676
Binary files /dev/null and b/addons/mail/html/mail_sc_06.png differ
diff --git a/addons/mail/html/mail_sc_07.png b/addons/mail/html/mail_sc_07.png
new file mode 100644
index 00000000000..9a33332817e
Binary files /dev/null and b/addons/mail/html/mail_sc_07.png differ
diff --git a/addons/mail/html/photo.png b/addons/mail/html/photo.png
new file mode 100644
index 00000000000..e605e5c6f8e
Binary files /dev/null and b/addons/mail/html/photo.png differ
diff --git a/addons/mail/i18n/ko.po b/addons/mail/i18n/ko.po
new file mode 100644
index 00000000000..6315792f4fc
--- /dev/null
+++ b/addons/mail/i18n/ko.po
@@ -0,0 +1,1687 @@
+# Korean 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: 2012-12-21 17:04+0000\n"
+"PO-Revision-Date: 2013-05-12 07:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Korean <ko@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: 2013-05-13 05:17+0000\n"
+"X-Generator: Launchpad (build 16614)\n"
+
+#. module: mail
+#: view:mail.followers:0
+msgid "Followers Form"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_publisher_warranty_contract
+msgid "publisher_warranty.contract"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,author_id:0
+#: field:mail.message,author_id:0
+msgid "Author"
+msgstr "작성자"
+
+#. module: mail
+#: view:mail.mail:0
+msgid "Message Details"
+msgstr ""
+
+#. module: mail
+#: help:mail.mail,email_to:0
+msgid "Message recipients"
+msgstr ""
+
+#. module: mail
+#: help:mail.message.subtype,default:0
+msgid "Activated by default when subscribing."
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Comments"
+msgstr ""
+
+#. module: mail
+#: view:mail.alias:0
+#: view:mail.mail:0
+msgid "Group By..."
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,body:0
+#: help:mail.message,body:0
+msgid "Automatically sanitized HTML contents"
+msgstr ""
+
+#. module: mail
+#: help:mail.alias,alias_name:0
+msgid ""
+"The name of the email alias, e.g. 'jobs' if you want to catch emails for "
+"<jobs@example.my.openerp.com>"
+msgstr ""
+
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_email_compose_message_wizard
+#: view:mail.compose.message:0
+msgid "Compose Email"
+msgstr "메일 작성"
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:132
+#, python-format
+msgid "Add them into recipients and followers"
+msgstr ""
+
+#. module: mail
+#: view:mail.group:0
+msgid "Group Name"
+msgstr "그룹명"
+
+#. module: mail
+#: selection:mail.group,public:0
+msgid "Public"
+msgstr ""
+
+#. module: mail
+#: view:mail.mail:0
+msgid "Body"
+msgstr "본문"
+
+#. module: mail
+#: view:mail.message:0
+msgid "Show messages to read"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,email_from:0
+#: help:mail.message,email_from:0
+msgid ""
+"Email address of the sender. This field is set when no matching partner is "
+"found for incoming emails."
+msgstr "보내는 사람의 이메일 주소. 이 필드는 수신 메일에서 일치하는 파트너를 찾을 수 없을 때 설정됩니다."
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:23
+#, python-format
+msgid "Add others"
+msgstr ""
+
+#. module: mail
+#: field:mail.message.subtype,parent_id:0
+msgid "Parent"
+msgstr ""
+
+#. module: mail
+#: field:mail.group,message_unread:0
+#: field:mail.thread,message_unread:0
+#: field:res.partner,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:296
+#, python-format
+msgid "show"
+msgstr ""
+
+#. module: mail
+#: help:mail.group,group_ids:0
+msgid ""
+"Members of those groups will automatically added as followers. Note that "
+"they will be able to manage their subscription manually if necessary."
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/mail.js:1019
+#, python-format
+msgid "Do you really want to delete this message?"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+#: field:mail.notification,read:0
+msgid "Read"
+msgstr ""
+
+#. module: mail
+#: view:mail.group:0
+msgid "Search Groups"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/mail_followers.js:159
+#, python-format
+msgid "followers"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_message.py:726
+#, python-format
+msgid "Access Denied"
+msgstr ""
+
+#. module: mail
+#: help:mail.group,image_medium:0
+msgid ""
+"Medium-sized photo of the group. It is automatically resized as a 128x128px "
+"image, with aspect ratio preserved. Use this field in form views or some "
+"kanban views."
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:212
+#, python-format
+msgid "Uploading error"
+msgstr ""
+
+#. module: mail
+#: model:mail.group,name:mail.group_support
+msgid "Support"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_message.py:727
+#, python-format
+msgid ""
+"The requested operation cannot be completed due to security restrictions. "
+"Please contact your system administrator.\n"
+"\n"
+"(Document type: %s, Operation: %s)"
+msgstr ""
+
+#. module: mail
+#: view:mail.mail:0
+#: selection:mail.mail,state:0
+msgid "Received"
+msgstr ""
+
+#. module: mail
+#: view:mail.mail:0
+msgid "Thread"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:29
+#, python-format
+msgid "Open the full mail composer"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:29
+#, python-format
+msgid "&ograve"
+msgstr ""
+
+#. module: mail
+#: field:base.config.settings,alias_domain:0
+msgid "Alias Domain"
+msgstr ""
+
+#. module: mail
+#: field:mail.group,group_ids:0
+msgid "Auto Subscription"
+msgstr ""
+
+#. module: mail
+#: field:mail.mail,references:0
+msgid "References"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:206
+#, python-format
+msgid "No messages."
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_group
+msgid "Discussion group"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:98
+#: code:addons/mail/static/src/xml/mail.xml:110
+#, python-format
+msgid "uploading"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:52
+#, python-format
+msgid "more."
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,type:0
+#: help:mail.message,type:0
+msgid ""
+"Message type: email for email message, notification for system message, "
+"comment for other messages such as user replies"
+msgstr ""
+
+#. module: mail
+#: help:mail.message.subtype,relation_field:0
+msgid ""
+"Field used to link the related model to the subtype model when using "
+"automatic subscription on a related document. The field is used to compute "
+"getattr(related_document.relation_field)."
+msgstr ""
+
+#. module: mail
+#: selection:mail.mail,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: mail
+#: field:mail.mail,reply_to:0
+msgid "Reply-To"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/wizard/invite.py:37
+#, python-format
+msgid "<div>You have been invited to follow %s.</div>"
+msgstr ""
+
+#. module: mail
+#: help:mail.group,message_unread:0
+#: help:mail.thread,message_unread:0
+#: help:res.partner,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: mail
+#: field:mail.group,image_medium:0
+msgid "Medium-sized photo"
+msgstr ""
+
+#. module: mail
+#: model:ir.actions.client,name:mail.action_mail_to_me_feeds
+#: model:ir.ui.menu,name:mail.mail_tomefeeds
+msgid "To: me"
+msgstr ""
+
+#. module: mail
+#: field:mail.message.subtype,name:0
+msgid "Message Type"
+msgstr ""
+
+#. module: mail
+#: field:mail.mail,auto_delete:0
+msgid "Auto Delete"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:12
+#: view:mail.group:0
+#, python-format
+msgid "Unfollow"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:295
+#, python-format
+msgid "show one more message"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_mail.py:74
+#: code:addons/mail/res_users.py:69
+#, python-format
+msgid "Invalid Action!"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:25
+#, python-format
+msgid "User img"
+msgstr ""
+
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_view_mail_mail
+#: model:ir.ui.menu,name:mail.menu_mail_mail
+#: view:mail.mail:0
+#: view:mail.message:0
+msgid "Emails"
+msgstr ""
+
+#. module: mail
+#: field:mail.followers,partner_id:0
+msgid "Related Partner"
+msgstr ""
+
+#. module: mail
+#: help:mail.group,message_summary:0
+#: help:mail.thread,message_summary:0
+#: help:res.partner,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
+msgstr ""
+
+#. module: mail
+#: help:mail.alias,alias_model_id:0
+msgid ""
+"The model (OpenERP Document Kind) to which this alias corresponds. Any "
+"incoming email that does not reply to an existing record will cause the "
+"creation of a new record of this model (e.g. a Project Task)"
+msgstr ""
+
+#. module: mail
+#: field:mail.message.subtype,relation_field:0
+msgid "Relation field"
+msgstr ""
+
+#. module: mail
+#: selection:mail.compose.message,type:0
+#: selection:mail.message,type:0
+msgid "System notification"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_res_partner
+#: view:mail.mail:0
+msgid "Partner"
+msgstr ""
+
+#. module: mail
+#: model:ir.ui.menu,name:mail.mail_my_stuff
+msgid "Organizer"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,subject:0
+#: field:mail.message,subject:0
+msgid "Subject"
+msgstr ""
+
+#. module: mail
+#: field:mail.wizard.invite,partner_ids:0
+msgid "Partners"
+msgstr ""
+
+#. module: mail
+#: view:mail.mail:0
+msgid "Retry"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,email_from:0
+#: field:mail.mail,email_from:0
+#: field:mail.message,email_from:0
+msgid "From"
+msgstr ""
+
+#. module: mail
+#: view:mail.mail:0
+#: view:mail.message.subtype:0
+msgid "Email message"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_base_config_settings
+msgid "base.config.settings"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:36
+#: view:mail.compose.message:0
+#, python-format
+msgid "Send"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/mail_followers.js:155
+#, python-format
+msgid "No followers"
+msgstr ""
+
+#. module: mail
+#: view:mail.mail:0
+msgid "Failed"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:22
+#: model:ir.actions.act_window,name:mail.action_view_followers
+#: model:ir.ui.menu,name:mail.menu_email_followers
+#: view:mail.followers:0
+#: field:mail.group,message_follower_ids:0
+#: field:mail.thread,message_follower_ids:0
+#: field:res.partner,message_follower_ids:0
+#, python-format
+msgid "Followers"
+msgstr ""
+
+#. module: mail
+#: model:ir.actions.client,name:mail.action_mail_archives_feeds
+#: model:ir.ui.menu,name:mail.mail_archivesfeeds
+msgid "Archives"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:97
+#: code:addons/mail/static/src/xml/mail.xml:109
+#, python-format
+msgid "Delete this attachment"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:245
+#: view:mail.mail:0
+#, python-format
+msgid "Reply"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/mail_followers.js:157
+#, python-format
+msgid "One follower"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,type:0
+#: field:mail.message,type:0
+msgid "Type"
+msgstr ""
+
+#. module: mail
+#: selection:mail.compose.message,type:0
+#: view:mail.mail:0
+#: selection:mail.message,type:0
+msgid "Email"
+msgstr ""
+
+#. module: mail
+#: field:ir.ui.menu,mail_group_id:0
+msgid "Mail Group"
+msgstr ""
+
+#. module: mail
+#: selection:res.partner,notification_email_send:0
+msgid "Comments and Emails"
+msgstr ""
+
+#. module: mail
+#: field:mail.alias,alias_defaults:0
+msgid "Default Values"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/res_users.py:89
+#, python-format
+msgid "%s has joined the %s network."
+msgstr ""
+
+#. module: mail
+#: help:mail.group,image_small:0
+msgid ""
+"Small-sized photo of the group. It is automatically resized as a 64x64px "
+"image, with aspect ratio preserved. Use this field anywhere a small image is "
+"required."
+msgstr ""
+
+#. module: mail
+#: view:mail.compose.message:0
+#: field:mail.message,partner_ids:0
+msgid "Recipients"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:142
+#, python-format
+msgid "<<<"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:43
+#, python-format
+msgid "Write to the followers of this document..."
+msgstr ""
+
+#. module: mail
+#: field:mail.group,group_public_id:0
+msgid "Authorized Group"
+msgstr ""
+
+#. module: mail
+#: view:mail.group:0
+msgid "Join Group"
+msgstr ""
+
+#. module: mail
+#: help:mail.mail,email_from:0
+msgid "Message sender, taken from user preferences."
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/wizard/invite.py:40
+#, python-format
+msgid "<div>You have been invited to follow a new document.</div>"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,parent_id:0
+#: field:mail.message,parent_id:0
+msgid "Parent Message"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,res_id:0
+#: field:mail.followers,res_id:0
+#: field:mail.message,res_id:0
+#: field:mail.wizard.invite,res_id:0
+msgid "Related Document ID"
+msgstr ""
+
+#. module: mail
+#: model:ir.actions.client,help:mail.action_mail_to_me_feeds
+msgid ""
+"<p>\n"
+"                    <b>No private message.</b>\n"
+"                </p><p>\n"
+"                    This list contains messages sent to you.\n"
+"                </p>\n"
+"            "
+msgstr ""
+
+#. module: mail
+#: model:mail.group,name:mail.group_rd
+msgid "R&D"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:61
+#, python-format
+msgid "/web/binary/upload_attachment"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_thread
+msgid "Email Thread"
+msgstr ""
+
+#. module: mail
+#: view:mail.mail:0
+msgid "Advanced"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:244
+#, python-format
+msgid "Move to Inbox"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:165
+#, python-format
+msgid "Re:"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,to_read:0
+#: field:mail.message,to_read:0
+msgid "To read"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/res_users.py:69
+#, python-format
+msgid ""
+"You may not create a user. To create new users, you should use the "
+"\"Settings > Users\" menu."
+msgstr ""
+
+#. module: mail
+#: help:mail.followers,res_model:0
+#: help:mail.wizard.invite,res_model:0
+msgid "Model of the followed resource"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:320
+#, python-format
+msgid "like"
+msgstr ""
+
+#. module: mail
+#: view:mail.compose.message:0
+#: view:mail.wizard.invite:0
+msgid "Cancel"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:47
+#, python-format
+msgid "Share with my followers..."
+msgstr ""
+
+#. module: mail
+#: field:mail.notification,partner_id:0
+msgid "Contact"
+msgstr ""
+
+#. module: mail
+#: view:mail.group:0
+msgid ""
+"Only the invited followers can read the\n"
+"                                    discussions on this group."
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_ir_ui_menu
+msgid "ir.ui.menu"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Has attachments"
+msgstr ""
+
+#. module: mail
+#: view:mail.mail:0
+msgid "on"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_message.py:915
+#, python-format
+msgid ""
+"The following partners chosen as recipients for the email have no email "
+"address linked :"
+msgstr ""
+
+#. module: mail
+#: help:mail.alias,alias_defaults:0
+msgid ""
+"A Python dictionary that will be evaluated to provide default values when "
+"creating new records for this alias."
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_message_subtype
+msgid "Message subtypes"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,notified_partner_ids:0
+#: help:mail.message,notified_partner_ids:0
+msgid ""
+"Partners that have a notification pushing this message in their mailboxes"
+msgstr ""
+
+#. module: mail
+#: selection:mail.compose.message,type:0
+#: view:mail.mail:0
+#: selection:mail.message,type:0
+msgid "Comment"
+msgstr ""
+
+#. module: mail
+#: model:ir.actions.client,help:mail.action_mail_inbox_feeds
+msgid ""
+"<p>\n"
+"                    <b>Good Job!</b> Your inbox is empty.\n"
+"                </p><p>\n"
+"                    Your inbox contains private messages or emails sent to "
+"you\n"
+"                    as well as information related to documents or people "
+"you\n"
+"                    follow.\n"
+"                </p>\n"
+"            "
+msgstr ""
+
+#. module: mail
+#: field:mail.mail,notification:0
+msgid "Is Notification"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:188
+#, python-format
+msgid "Compose a new message"
+msgstr ""
+
+#. module: mail
+#: view:mail.mail:0
+msgid "Send Now"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_mail.py:74
+#, python-format
+msgid ""
+"Unable to send email, please configure the sender's email address or alias."
+msgstr ""
+
+#. module: mail
+#: help:res.users,alias_id:0
+msgid ""
+"Email address internally associated with this user. Incoming emails will "
+"appear in the user's notifications."
+msgstr ""
+
+#. module: mail
+#: field:mail.group,image:0
+msgid "Photo"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:56
+#: code:addons/mail/static/src/xml/mail.xml:191
+#: view:mail.compose.message:0
+#: view:mail.wizard.invite:0
+#, python-format
+msgid "or"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,vote_user_ids:0
+#: help:mail.message,vote_user_ids:0
+msgid "Users that voted for this message"
+msgstr ""
+
+#. module: mail
+#: help:mail.group,alias_id:0
+msgid ""
+"The email address associated with this group. New emails received will "
+"automatically create new topics."
+msgstr ""
+
+#. module: mail
+#: view:mail.mail:0
+msgid "Month"
+msgstr ""
+
+#. module: mail
+#: view:mail.mail:0
+msgid "Email Search"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,child_ids:0
+#: field:mail.message,child_ids:0
+msgid "Child Messages"
+msgstr ""
+
+#. module: mail
+#: field:mail.alias,alias_user_id:0
+msgid "Owner"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_res_users
+msgid "Users"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_message
+#: field:mail.mail,mail_message_id:0
+#: view:mail.message:0
+#: field:mail.notification,message_id:0
+#: field:mail.wizard.invite,message:0
+msgid "Message"
+msgstr ""
+
+#. module: mail
+#: help:mail.followers,res_id:0
+#: help:mail.wizard.invite,res_id:0
+msgid "Id of the followed resource"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,body:0
+#: field:mail.message,body:0
+msgid "Contents"
+msgstr ""
+
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_view_mail_alias
+#: model:ir.ui.menu,name:mail.mail_alias_menu
+msgid "Aliases"
+msgstr ""
+
+#. module: mail
+#: help:mail.message.subtype,description:0
+msgid ""
+"Description that will be added in the message posted for this subtype. If "
+"void, the name will be added instead."
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,vote_user_ids:0
+#: field:mail.message,vote_user_ids:0
+msgid "Votes"
+msgstr ""
+
+#. module: mail
+#: view:mail.group:0
+msgid "Group"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,starred:0
+#: help:mail.message,starred:0
+msgid "Current user has a starred notification linked to this message"
+msgstr ""
+
+#. module: mail
+#: field:mail.group,public:0
+msgid "Privacy"
+msgstr ""
+
+#. module: mail
+#: view:mail.mail:0
+msgid "Notification"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/mail.js:650
+#, python-format
+msgid "Please complete partner's informations"
+msgstr ""
+
+#. module: mail
+#: view:mail.wizard.invite:0
+msgid "Add Followers"
+msgstr ""
+
+#. module: mail
+#: view:mail.compose.message:0
+msgid "Followers of selected items and"
+msgstr ""
+
+#. module: mail
+#: field:mail.alias,alias_force_thread_id:0
+msgid "Record Thread ID"
+msgstr ""
+
+#. module: mail
+#: model:ir.ui.menu,name:mail.mail_group_root
+msgid "My Groups"
+msgstr ""
+
+#. module: mail
+#: model:ir.actions.client,help:mail.action_mail_archives_feeds
+msgid ""
+"<p>\n"
+"                    No message found and no message sent yet.\n"
+"                </p><p>\n"
+"                    Click on the top-right icon to compose a message. This\n"
+"                    message will be sent by email if it's an internal "
+"contact.\n"
+"                </p>\n"
+"            "
+msgstr ""
+
+#. module: mail
+#: view:mail.mail:0
+#: field:mail.mail,state:0
+msgid "Status"
+msgstr ""
+
+#. module: mail
+#: view:mail.mail:0
+#: selection:mail.mail,state:0
+msgid "Outgoing"
+msgstr ""
+
+#. module: mail
+#: selection:res.partner,notification_email_send:0
+msgid "All feeds"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,record_name:0
+#: help:mail.message,record_name:0
+msgid "Name get of the related document."
+msgstr ""
+
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_view_notifications
+#: model:ir.model,name:mail.model_mail_notification
+#: model:ir.ui.menu,name:mail.menu_email_notifications
+#: field:mail.compose.message,notification_ids:0
+#: view:mail.message:0
+#: field:mail.message,notification_ids:0
+#: view:mail.notification:0
+msgid "Notifications"
+msgstr ""
+
+#. module: mail
+#: view:mail.alias:0
+msgid "Search Alias"
+msgstr ""
+
+#. module: mail
+#: help:mail.alias,alias_force_thread_id:0
+msgid ""
+"Optional ID of a thread (record) to which all incoming messages will be "
+"attached, even if they did not reply to it. If set, this will disable the "
+"creation of new records completely."
+msgstr ""
+
+#. module: mail
+#: help:mail.message.subtype,name:0
+msgid ""
+"Message subtype gives a more precise type on the message, especially for "
+"system notifications. For example, it can be a notification related to a new "
+"record (New), or to a stage change in a process (Stage change). Message "
+"subtypes allow to precisely tune the notifications the user want to receive "
+"on its wall."
+msgstr ""
+
+#. module: mail
+#: view:mail.mail:0
+msgid "by"
+msgstr ""
+
+#. module: mail
+#: model:mail.group,name:mail.group_best_sales_practices
+msgid "Best Sales Practices"
+msgstr ""
+
+#. module: mail
+#: selection:mail.group,public:0
+msgid "Selected Group Only"
+msgstr ""
+
+#. module: mail
+#: field:mail.group,message_is_follower:0
+#: field:mail.thread,message_is_follower:0
+#: field:res.partner,message_is_follower:0
+msgid "Is a Follower"
+msgstr ""
+
+#. module: mail
+#: view:mail.alias:0
+#: view:mail.mail:0
+msgid "User"
+msgstr ""
+
+#. module: mail
+#: view:mail.group:0
+msgid "Groups"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Messages Search"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,date:0
+#: field:mail.message,date:0
+msgid "Date"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:34
+#, python-format
+msgid "Post"
+msgstr ""
+
+#. module: mail
+#: view:mail.mail:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:122
+#, python-format
+msgid "To:"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:193
+#, python-format
+msgid "Write to my followers"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_res_groups
+msgid "Access Groups"
+msgstr ""
+
+#. module: mail
+#: field:mail.message.subtype,default:0
+msgid "Default"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:294
+#, python-format
+msgid "show more message"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:246
+#, python-format
+msgid "Mark as Todo"
+msgstr ""
+
+#. module: mail
+#: help:mail.message.subtype,parent_id:0
+msgid "Parent subtype, used for automatic subscription."
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_wizard_invite
+msgid "Invite wizard"
+msgstr ""
+
+#. module: mail
+#: field:mail.group,message_summary:0
+#: field:mail.thread,message_summary:0
+#: field:res.partner,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: mail
+#: help:mail.message.subtype,res_model:0
+msgid ""
+"Model the subtype applies to. If False, this subtype applies to all models."
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,subtype_id:0
+#: field:mail.followers,subtype_ids:0
+#: field:mail.message,subtype_id:0
+#: view:mail.message.subtype:0
+msgid "Subtype"
+msgstr ""
+
+#. module: mail
+#: view:mail.group:0
+msgid "Group Form"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,starred:0
+#: field:mail.message,starred:0
+#: field:mail.notification,starred:0
+msgid "Starred"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:296
+#, python-format
+msgid "more messages"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/update.py:93
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:13
+#, python-format
+msgid "Following"
+msgstr ""
+
+#. module: mail
+#: sql_constraint:mail.alias:0
+msgid ""
+"Unfortunately this email alias is already used, please choose a unique one"
+msgstr ""
+
+#. module: mail
+#: help:mail.alias,alias_user_id:0
+msgid ""
+"The owner of records created upon receiving emails on this alias. If this "
+"field is not set the system will attempt to find the right owner based on "
+"the sender (From) address, or will use the Administrator account if no "
+"system user is found for that address."
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:52
+#, python-format
+msgid "And"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,message_id:0
+#: field:mail.message,message_id:0
+msgid "Message-Id"
+msgstr ""
+
+#. module: mail
+#: help:mail.group,image:0
+msgid ""
+"This field holds the image used as photo for the group, limited to "
+"1024x1024px."
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,attachment_ids:0
+#: view:mail.mail:0
+#: field:mail.message,attachment_ids:0
+msgid "Attachments"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,record_name:0
+#: field:mail.message,record_name:0
+msgid "Message Record Name"
+msgstr ""
+
+#. module: mail
+#: field:mail.mail,email_cc:0
+msgid "Cc"
+msgstr ""
+
+#. module: mail
+#: help:mail.notification,starred:0
+msgid "Starred message that goes into the todo mailbox"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:125
+#: view:mail.compose.message:0
+#, python-format
+msgid "Followers of"
+msgstr ""
+
+#. module: mail
+#: help:mail.mail,auto_delete:0
+msgid "Permanently delete this email after sending it, to save space"
+msgstr ""
+
+#. module: mail
+#: model:ir.actions.client,name:mail.action_mail_group_feeds
+msgid "Discussion Group"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:242
+#, python-format
+msgid "Done"
+msgstr ""
+
+#. module: mail
+#: model:mail.message.subtype,name:mail.mt_comment
+msgid "Discussions"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:11
+#, python-format
+msgid "Follow"
+msgstr ""
+
+#. module: mail
+#: field:mail.group,name:0
+msgid "Name"
+msgstr ""
+
+#. module: mail
+#: model:mail.group,name:mail.group_all_employees
+msgid "Whole Company"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:131
+#: code:addons/mail/static/src/xml/mail.xml:278
+#: view:mail.compose.message:0
+#, python-format
+msgid "and"
+msgstr ""
+
+#. module: mail
+#: help:mail.mail,body_html:0
+msgid "Rich-text/HTML message"
+msgstr ""
+
+#. module: mail
+#: view:mail.mail:0
+msgid "Creation Month"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:306
+#, python-format
+msgid "Compose new Message"
+msgstr ""
+
+#. module: mail
+#: field:mail.group,menu_id:0
+msgid "Related Menu"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Content"
+msgstr ""
+
+#. module: mail
+#: field:mail.mail,email_to:0
+msgid "To"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,notified_partner_ids:0
+#: field:mail.message,notified_partner_ids:0
+msgid "Notified partners"
+msgstr ""
+
+#. module: mail
+#: help:mail.group,public:0
+msgid ""
+"This group is visible by non members.             Invisible groups can add "
+"members through the invite button."
+msgstr ""
+
+#. module: mail
+#: model:mail.group,name:mail.group_board
+msgid "Board meetings"
+msgstr ""
+
+#. module: mail
+#: constraint:mail.alias:0
+msgid ""
+"Invalid expression, it must be a literal python dictionary definition e.g. "
+"\"{'field': 'value'}\""
+msgstr ""
+
+#. module: mail
+#: field:mail.alias,alias_model_id:0
+msgid "Aliased Model"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,message_id:0
+#: help:mail.message,message_id:0
+msgid "Message unique identifier"
+msgstr ""
+
+#. module: mail
+#: field:mail.group,description:0
+#: field:mail.message.subtype,description:0
+msgid "Description"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_followers
+msgid "Document Followers"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:35
+#, python-format
+msgid "Remove this follower"
+msgstr ""
+
+#. module: mail
+#: selection:res.partner,notification_email_send:0
+msgid "Never"
+msgstr ""
+
+#. module: mail
+#: field:mail.mail,mail_server_id:0
+msgid "Outgoing mail server"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_message.py:919
+#, python-format
+msgid "Partners email addresses not found"
+msgstr ""
+
+#. module: mail
+#: view:mail.mail:0
+#: selection:mail.mail,state:0
+msgid "Sent"
+msgstr ""
+
+#. module: mail
+#: field:mail.mail,body_html:0
+msgid "Rich-text Contents"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,to_read:0
+#: help:mail.message,to_read:0
+msgid "Current user has an unread notification linked to this message"
+msgstr ""
+
+#. module: mail
+#: help:res.partner,notification_email_send:0
+msgid ""
+"Choose in which case you want to receive an email when you receive new feeds."
+msgstr ""
+
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_view_groups
+#: model:ir.ui.menu,name:mail.mail_allgroups
+msgid "Join a group"
+msgstr ""
+
+#. module: mail
+#: model:ir.actions.client,help:mail.action_mail_group_feeds
+msgid ""
+"<p>\n"
+"                    No message in this group.\n"
+"                </p>\n"
+"            "
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:213
+#, python-format
+msgid "Please, wait while the file is uploading."
+msgstr ""
+
+#. module: mail
+#: view:mail.group:0
+msgid ""
+"This group is visible by everyone,\n"
+"                                    including your customers if you "
+"installed\n"
+"                                    the portal module."
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:243
+#, python-format
+msgid "Set back to Todo"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:128
+#, python-format
+msgid "this document"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,filter_id:0
+msgid "Filters"
+msgstr ""
+
+#. module: mail
+#: field:res.partner,notification_email_send:0
+msgid "Receive Feeds by Email"
+msgstr ""
+
+#. module: mail
+#: help:base.config.settings,alias_domain:0
+msgid ""
+"If you have setup a catch-all email domain redirected to the OpenERP server, "
+"enter the domain name here."
+msgstr ""
+
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_view_mail_message
+#: model:ir.ui.menu,name:mail.menu_mail_message
+#: field:mail.group,message_ids:0
+#: view:mail.message:0
+#: field:mail.thread,message_ids:0
+#: field:res.partner,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:141
+#, python-format
+msgid "others..."
+msgstr ""
+
+#. module: mail
+#: model:ir.actions.client,name:mail.action_mail_star_feeds
+#: model:ir.ui.menu,name:mail.mail_starfeeds
+msgid "To-do"
+msgstr ""
+
+#. module: mail
+#: view:mail.alias:0
+#: field:mail.alias,alias_name:0
+#: field:mail.group,alias_id:0
+#: field:res.users,alias_id:0
+msgid "Alias"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_mail
+msgid "Outgoing Mails"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,notification_ids:0
+#: help:mail.message,notification_ids:0
+msgid ""
+"Technical field holding the message notifications. Use notified_partner_ids "
+"to access notified partners."
+msgstr ""
+
+#. module: mail
+#: model:ir.ui.menu,name:mail.mail_feeds
+#: model:ir.ui.menu,name:mail.mail_feeds_main
+msgid "Messaging"
+msgstr ""
+
+#. module: mail
+#: view:mail.alias:0
+#: field:mail.message.subtype,res_model:0
+msgid "Model"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Unread"
+msgstr "읽지 않음"
+
+#. module: mail
+#: help:mail.followers,subtype_ids:0
+msgid ""
+"Message subtypes followed, meaning subtypes that will be pushed onto the "
+"user's Wall."
+msgstr ""
+
+#. module: mail
+#: help:mail.group,message_ids:0
+#: help:mail.thread,message_ids:0
+#: help:res.partner,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: mail
+#: help:mail.mail,references:0
+msgid "Message references, such as identifiers of previous messages"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,composition_mode:0
+msgid "Composition mode"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,model:0
+#: field:mail.followers,res_model:0
+#: field:mail.message,model:0
+#: field:mail.wizard.invite,res_model:0
+msgid "Related Document Model"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:321
+#, python-format
+msgid "unlike"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,author_id:0
+#: help:mail.message,author_id:0
+msgid ""
+"Author of the message. If not set, email_from may hold an email address that "
+"did not match any partner."
+msgstr ""
+
+#. module: mail
+#: help:mail.mail,email_cc:0
+msgid "Carbon copy message recipients"
+msgstr ""
+
+#. module: mail
+#: field:mail.alias,alias_domain:0
+msgid "Alias domain"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/update.py:93
+#, python-format
+msgid "Error during communication with the publisher warranty server."
+msgstr ""
+
+#. module: mail
+#: selection:mail.group,public:0
+msgid "Private"
+msgstr ""
+
+#. module: mail
+#: model:ir.actions.client,help:mail.action_mail_star_feeds
+msgid ""
+"<p>\n"
+"                    <b>No todo.</b>\n"
+"                </p><p>\n"
+"                    When you process messages in your inbox, you can mark "
+"some\n"
+"                    as <i>todo</i>. From this menu, you can process all your "
+"todo.\n"
+"                </p>\n"
+"            "
+msgstr ""
+
+#. module: mail
+#: selection:mail.mail,state:0
+msgid "Delivery Failed"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,partner_ids:0
+msgid "Additional contacts"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,parent_id:0
+#: help:mail.message,parent_id:0
+msgid "Initial thread message."
+msgstr ""
+
+#. module: mail
+#: model:mail.group,name:mail.group_hr_policies
+msgid "HR Policies"
+msgstr ""
+
+#. module: mail
+#: selection:res.partner,notification_email_send:0
+msgid "Emails only"
+msgstr ""
+
+#. module: mail
+#: model:ir.actions.client,name:mail.action_mail_inbox_feeds
+#: model:ir.ui.menu,name:mail.mail_inboxfeeds
+msgid "Inbox"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:58
+#, python-format
+msgid "File"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/many2many_tags_email.js:63
+#, python-format
+msgid "Please complete partner's informations and Email"
+msgstr ""
+
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_view_message_subtype
+#: model:ir.ui.menu,name:mail.menu_message_subtype
+msgid "Subtypes"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_alias
+msgid "Email Aliases"
+msgstr ""
+
+#. module: mail
+#: field:mail.group,image_small:0
+msgid "Small-sized photo"
+msgstr ""
+
+#. module: mail
+#: help:mail.mail,reply_to:0
+msgid "Preferred response address for the message"
+msgstr ""
diff --git a/addons/mail/mail_alias.py b/addons/mail/mail_alias.py
index 8730599ad72..870695e074e 100644
--- a/addons/mail/mail_alias.py
+++ b/addons/mail/mail_alias.py
@@ -139,7 +139,7 @@ class mail_alias(osv.Model):
         return new_name
 
     def migrate_to_alias(self, cr, child_model_name, child_table_name, child_model_auto_init_fct,
-        alias_id_column, alias_key, alias_prefix = '', alias_force_key = '', alias_defaults = {}, context=None):
+        alias_id_column, alias_key, alias_prefix='', alias_force_key='', alias_defaults={}, context=None):
         """ Installation hook to create aliases for all users and avoid constraint errors.
 
             :param child_model_name: model name of the child class (i.e. res.users)
@@ -154,8 +154,10 @@ class mail_alias(osv.Model):
             :param alias_defaults: dict, keys = mail.alias columns, values = child
                 model column name used for default values (i.e. {'job_id': 'id'})
         """
+        if context is None:
+            context = {}
 
-        # disable the unique alias_id not null constraint, to avoid spurious warning during 
+        # disable the unique alias_id not null constraint, to avoid spurious warning during
         # super.auto_init. We'll reinstall it afterwards.
         alias_id_column.required = False
 
@@ -165,14 +167,14 @@ class mail_alias(osv.Model):
         registry = RegistryManager.get(cr.dbname)
         mail_alias = registry.get('mail.alias')
         child_class_model = registry[child_model_name]
-        no_alias_ids = child_class_model.search(cr, SUPERUSER_ID, [('alias_id', '=', False)], context={'active_test':False})
+        no_alias_ids = child_class_model.search(cr, SUPERUSER_ID, [('alias_id', '=', False)], context={'active_test': False})
         # Use read() not browse(), to avoid prefetching uninitialized inherited fields
         for obj_data in child_class_model.read(cr, SUPERUSER_ID, no_alias_ids, [alias_key]):
-            alias_vals = {'alias_name': '%s%s' % (alias_prefix, obj_data[alias_key]) }
+            alias_vals = {'alias_name': '%s%s' % (alias_prefix, obj_data[alias_key])}
             if alias_force_key:
                 alias_vals['alias_force_thread_id'] = obj_data[alias_force_key]
-            alias_vals['alias_defaults'] = dict( (k, obj_data[v]) for k, v in alias_defaults.iteritems())
-            alias_id = mail_alias.create_unique_alias(cr, SUPERUSER_ID, alias_vals, model_name=child_model_name)
+            alias_vals['alias_defaults'] = dict((k, obj_data[v]) for k, v in alias_defaults.iteritems())
+            alias_id = mail_alias.create_unique_alias(cr, SUPERUSER_ID, alias_vals, model_name=context.get('alias_model_name', child_model_name))
             child_class_model.write(cr, SUPERUSER_ID, obj_data['id'], {'alias_id': alias_id})
             _logger.info('Mail alias created for %s %s (uid %s)', child_model_name, obj_data[alias_key], obj_data['id'])
 
diff --git a/addons/mail/mail_followers.py b/addons/mail/mail_followers.py
index 152b9704fd7..98e88b664e6 100644
--- a/addons/mail/mail_followers.py
+++ b/addons/mail/mail_followers.py
@@ -90,7 +90,7 @@ class mail_notification(osv.Model):
                 continue
             partner = notification.partner_id
             # If partners_to_notify specified: restrict to them
-            if partners_to_notify and partner.id not in partners_to_notify:
+            if partners_to_notify is not None and partner.id not in partners_to_notify:
                 continue
             # Do not send to partners without email address defined
             if not partner.email:
@@ -135,14 +135,17 @@ class mail_notification(osv.Model):
         footer = tools.append_content_to_html(footer, signature, plaintext=False, container_tag='p')
 
         # add company signature
-        if user.company_id:
-            company = user.company_id.website and "<a style='color:inherit' href='%s'>%s</a>" % (user.company_id.website, user.company_id.name) or user.company_id.name
+        if user.company_id.website:
+            website_url = ('http://%s' % user.company_id.website) if not user.company_id.website.lower().startswith(('http:', 'https:')) \
+                else user.company_id.website
+            company = "<a style='color:inherit' href='%s'>%s</a>" % (website_url, user.company_id.name)
         else:
-            company = user.name
-        signature_company = _('<small>Sent by %(company)s using %(openerp)s.</small>') % {
+            company = user.company_id.name
+        sent_by = _('Sent by %(company)s using %(openerp)s.')
+        signature_company = '<small>%s</small>' % (sent_by % {
                 'company': company,
                 'openerp': "<a style='color:inherit' href='https://www.openerp.com/'>OpenERP</a>"
-            }
+            })
         footer = tools.append_content_to_html(footer, signature_company, plaintext=False, container_tag='div')
 
         return footer
diff --git a/addons/mail/mail_mail.py b/addons/mail/mail_mail.py
index 3c30a950230..8fab4347d0d 100644
--- a/addons/mail/mail_mail.py
+++ b/addons/mail/mail_mail.py
@@ -27,8 +27,8 @@ from urlparse import urljoin
 
 from openerp import tools
 from openerp import SUPERUSER_ID
+from openerp.addons.base.ir.ir_mail_server import MailDeliveryException
 from openerp.osv import fields, osv
-from openerp.osv.orm import except_orm
 from openerp.tools.translate import _
 
 _logger = logging.getLogger(__name__)
@@ -93,31 +93,41 @@ class mail_mail(osv.Model):
         """ Return a specific reply_to: alias of the document through message_get_reply_to
             or take the email_from
         """
+        # if value specified: directly return it
         if values.get('reply_to'):
             return values.get('reply_to')
-        email_reply_to = False
 
-        # model, res_id: comes from values OR related message
-        model = values.get('model')
-        res_id = values.get('res_id')
-        if values.get('mail_message_id') and (not model or not res_id):
+        mailgateway = True  # tells whether the answer will go through the mailgateway, leading to the formatting of reply_to <Followers of ...>
+        ir_config_parameter = self.pool.get("ir.config_parameter")
+        catchall_domain = ir_config_parameter.get_param(cr, uid, "mail.catchall.domain", context=context)
+
+        # model, res_id, email_from, reply_to: comes from values OR related message
+        message = None
+        if values.get('mail_message_id'):
             message = self.pool.get('mail.message').browse(cr, uid, values.get('mail_message_id'), context=context)
-            if not model:
-                model = message.model
-            if not res_id:
-                res_id = message.res_id
+        model = values.get('model', message and message.model or False)
+        res_id = values.get('res_id', message and message.res_id or False)
+        email_from = values.get('email_from', message and message.email_from or False)
+        email_reply_to = message and message.reply_to or False
 
         # if model and res_id: try to use ``message_get_reply_to`` that returns the document alias
-        if model and res_id and hasattr(self.pool[model], 'message_get_reply_to'):
+        if not email_reply_to and model and res_id and hasattr(self.pool[model], 'message_get_reply_to'):
             email_reply_to = self.pool[model].message_get_reply_to(cr, uid, [res_id], context=context)[0]
+        # no alias reply_to -> catchall alias
+        if not email_reply_to:
+            catchall_alias = ir_config_parameter.get_param(cr, uid, "mail.catchall.alias", context=context)
+            if catchall_domain and catchall_alias:
+                email_reply_to = '%s@%s' % (catchall_alias, catchall_domain)
         # no alias reply_to -> reply_to will be the email_from, only the email part
-        if not email_reply_to and values.get('email_from'):
-            emails = tools.email_split(values.get('email_from'))
+        if not email_reply_to and email_from:
+            emails = tools.email_split(email_from)
             if emails:
                 email_reply_to = emails[0]
+                if emails[0].split('@')[1] != catchall_domain:
+                    mailgateway = False
 
         # format 'Document name <email_address>'
-        if email_reply_to and model and res_id:
+        if email_reply_to and model and res_id and mailgateway:
             document_name = self.pool[model].name_get(cr, SUPERUSER_ID, [res_id], context=context)[0]
             if document_name:
                 # sanitize document name
@@ -195,6 +205,36 @@ class mail_mail(osv.Model):
             self.unlink(cr, SUPERUSER_ID, [mail.id], context=context)
         return True
 
+    #------------------------------------------------------
+    # mail_mail formatting, tools and send mechanism
+    #------------------------------------------------------
+
+    # TODO in 8.0(+): maybe factorize this to enable in modules link generation
+    # independently of mail_mail model
+    # TODO in 8.0(+): factorize doc name sanitized and 'Followers of ...' formatting
+    # because it begins to appear everywhere
+
+    def _get_partner_access_link(self, cr, uid, mail, partner=None, context=None):
+        """ Generate URLs for links in mails:
+            - partner is an user and has read access to the document: direct link to document with model, res_id
+        """
+        if partner and partner.user_ids:
+            base_url = self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url')
+            # the parameters to encode for the query and fragment part of url
+            query = {'db': cr.dbname}
+            fragment = {
+                'login': partner.user_ids[0].login,
+                'action': 'mail.action_mail_redirect',
+            }
+            if mail.notification:
+                fragment.update({
+                        'message_id': mail.mail_message_id.id,
+                    })
+            url = urljoin(base_url, "?%s#%s" % (urlencode(query), urlencode(fragment)))
+            return _("""<small>Access your messages and documents <a style='color:inherit' href="%s">in OpenERP</a></small>""") % url
+        else:
+            return None
+
     def send_get_mail_subject(self, cr, uid, mail, force=False, partner=None, context=None):
         """ If subject is void and record_name defined: '<Author> posted on <Resource>'
 
@@ -202,36 +242,12 @@ class mail_mail(osv.Model):
             :param browse_record mail: mail.mail browse_record
             :param browse_record partner: specific recipient partner
         """
-        if force or (not mail.subject and mail.model and mail.res_id):
+        if (force or not mail.subject) and mail.record_name:
             return 'Re: %s' % (mail.record_name)
+        elif (force or not mail.subject) and mail.parent_id and mail.parent_id.subject:
+            return 'Re: %s' % (mail.parent_id.subject)
         return mail.subject
 
-    def send_get_mail_body_footer(self, cr, uid, mail, partner=None, context=None):
-        """ Return a specific footer for the ir_email body.  The main purpose of this method
-            is to be inherited by Portal, to add modify the link for signing in, in
-            each notification email a partner receives.
-        """
-        body_footer = ""
-        # partner is a user, link to a related document (incentive to install portal)
-        if partner and partner.user_ids and mail.model and mail.res_id \
-                and self.check_access_rights(cr, partner.user_ids[0].id, 'read', raise_exception=False):
-            related_user = partner.user_ids[0]
-            try:
-                self.pool[mail.model].check_access_rule(cr, related_user.id, [mail.res_id], 'read', context=context)
-                base_url = self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url')
-                # the parameters to encode for the query and fragment part of url
-                query = {'db': cr.dbname}
-                fragment = {
-                    'login': related_user.login,
-                    'model': mail.model,
-                    'id': mail.res_id,
-                }
-                url = urljoin(base_url, "?%s#%s" % (urlencode(query), urlencode(fragment)))
-                body_footer = _("""<small>Access this document <a style='color:inherit' href="%s">directly in OpenERP</a></small>""") % url
-            except except_orm, e:
-                pass
-        return body_footer
-
     def send_get_mail_body(self, cr, uid, mail, partner=None, context=None):
         """ Return a specific ir_email body. The main purpose of this method
             is to be inherited to add custom content depending on some module.
@@ -241,9 +257,10 @@ class mail_mail(osv.Model):
         """
         body = mail.body_html
 
-        # add footer
-        body_footer = self.send_get_mail_body_footer(cr, uid, mail, partner=partner, context=context)
-        body = tools.append_content_to_html(body, body_footer, plaintext=False, container_tag='div')
+        # generate footer
+        link = self._get_partner_access_link(cr, uid, mail, partner, context=context)
+        if link:
+            body = tools.append_content_to_html(body, link, plaintext=False, container_tag='div')
         return body
 
     def send_get_email_dict(self, cr, uid, mail, partner=None, context=None):
@@ -276,7 +293,7 @@ class mail_mail(osv.Model):
             'email_to': email_to,
         }
 
-    def send(self, cr, uid, ids, auto_commit=False, context=None):
+    def send(self, cr, uid, ids, auto_commit=False, raise_exception=False, context=None):
         """ Sends the selected emails immediately, ignoring their current
             state (mails that have already been sent should not be passed
             unless they should actually be re-sent).
@@ -287,6 +304,8 @@ class mail_mail(osv.Model):
             :param bool auto_commit: whether to force a commit of the mail status
                 after sending each mail (meant only for scheduler processing);
                 should never be True during normal transactions (default: False)
+            :param bool raise_exception: whether to raise an exception if the
+                email sending process has failed
             :return: True
         """
         ir_mail_server = self.pool.get('ir.mail_server')
@@ -332,9 +351,16 @@ class mail_mail(osv.Model):
                 # see revid:odo@openerp.com-20120622152536-42b2s28lvdv3odyr in 6.1
                 if mail_sent:
                     self._postprocess_sent_message(cr, uid, mail, context=context)
-            except Exception:
+            except Exception as e:
                 _logger.exception('failed sending mail.mail %s', mail.id)
                 mail.write({'state': 'exception'})
+                if raise_exception:
+                    if isinstance(e, AssertionError):
+                        # get the args of the original error, wrap into a value and throw a MailDeliveryException
+                        # that is an except_orm, with name and value as arguments
+                        value = '. '.join(e.args)
+                        raise MailDeliveryException(_("Mail Delivery Failed"), value)
+                    raise
 
             if auto_commit == True:
                 cr.commit()
diff --git a/addons/mail/mail_mail_view.xml b/addons/mail/mail_mail_view.xml
index 1ff9a2a292e..7384cc24a75 100644
--- a/addons/mail/mail_mail_view.xml
+++ b/addons/mail/mail_mail_view.xml
@@ -6,6 +6,11 @@
             <field name="model">mail.mail</field>
             <field name="arch" type="xml">
                 <form string="Email message" version="7.0">
+                    <header>
+                        <button name="send" string="Send Now" type="object" states='outgoing' class="oe_highlight"/>
+                        <button name="mark_outgoing" string="Retry" type="object" states='exception,cancel'/>
+                        <button name="cancel" string="Cancel" type="object" states='outgoing'/>
+                    </header>
                     <sheet>
                         <label for="subject" class="oe_edit_only"/>
                         <h2><field name="subject"/></h2>
diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index defc12a2f73..c30d00f5af7 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -27,6 +27,7 @@ from openerp import SUPERUSER_ID
 from openerp.osv import osv, orm, fields
 from openerp.tools import html_email_clean
 from openerp.tools.translate import _
+from HTMLParser import HTMLParser
 
 _logger = logging.getLogger(__name__)
 
@@ -43,6 +44,19 @@ def decode(text):
         text = decode_header(text.replace('\r', ''))
         return ''.join([tools.ustr(x[0], x[1]) for x in text])
 
+class MLStripper(HTMLParser):
+    def __init__(self):
+        self.reset()
+        self.fed = []
+    def handle_data(self, d):
+        self.fed.append(d)
+    def get_data(self):
+        return ''.join(self.fed)
+
+def strip_tags(html):
+    s = MLStripper()
+    s.feed(html)
+    return s.get_data()
 
 class mail_message(osv.Model):
     """ Messages model: system notification (replacing res.log notifications),
@@ -125,7 +139,7 @@ class mail_message(osv.Model):
             ids = [ids]
         res = []
         for message in self.browse(cr, uid, ids, context=context):
-            name = '%s: %s' % (message.subject or '', message.body or '')
+            name = '%s: %s' % (message.subject or '', strip_tags(message.body or '') or '')
             res.append((message.id, self._shorten_name(name.lstrip(' :'))))
         return res
 
@@ -236,6 +250,8 @@ class mail_message(osv.Model):
             :param bool read: set notification as (un)read
             :param bool create_missing: create notifications for missing entries
                 (i.e. when acting on displayed messages not notified)
+
+            :return number of message mark as read
         """
         notification_obj = self.pool.get('mail.notification')
         user_pid = self.pool.get('res.users').read(cr, uid, uid, ['partner_id'], context=context)['partner_id'][0]
@@ -246,14 +262,16 @@ class mail_message(osv.Model):
 
         # all message have notifications: already set them as (un)read
         if len(notif_ids) == len(msg_ids) or not create_missing:
-            return notification_obj.write(cr, uid, notif_ids, {'read': read}, context=context)
+            notification_obj.write(cr, uid, notif_ids, {'read': read}, context=context)
+            return len(notif_ids)
 
         # some messages do not have notifications: find which one, create notification, update read status
         notified_msg_ids = [notification.message_id.id for notification in notification_obj.browse(cr, uid, notif_ids, context=context)]
         to_create_msg_ids = list(set(msg_ids) - set(notified_msg_ids))
         for msg_id in to_create_msg_ids:
             notification_obj.create(cr, uid, {'partner_id': user_pid, 'read': read, 'message_id': msg_id}, context=context)
-        return notification_obj.write(cr, uid, notif_ids, {'read': read}, context=context)
+        notification_obj.write(cr, uid, notif_ids, {'read': read}, context=context)
+        return len(notif_ids)
 
     def set_message_starred(self, cr, uid, msg_ids, starred, create_missing=True, context=None):
         """ Set messages as (un)starred. Technically, the notifications related
@@ -743,7 +761,7 @@ class mail_message(osv.Model):
         default_starred = context.pop('default_starred', False)
         # generate message_id, to redirect answers to the right discussion thread
         if not values.get('message_id') and values.get('reply_to'):
-            values['message_id'] = tools.generate_tracking_message_id('reply_to-%(model)s' % values)
+            values['message_id'] = tools.generate_tracking_message_id('reply_to')
         elif not values.get('message_id') and values.get('res_id') and values.get('model'):
             values['message_id'] = tools.generate_tracking_message_id('%(res_id)s-%(model)s' % values)
         elif not values.get('message_id'):
diff --git a/addons/mail/mail_message_view.xml b/addons/mail/mail_message_view.xml
index 8f2fb3f1020..02f4ef7fdbe 100644
--- a/addons/mail/mail_message_view.xml
+++ b/addons/mail/mail_message_view.xml
@@ -59,6 +59,9 @@
                     <field name="type"/>
                     <field name="author_id"/>
                     <field name="partner_ids"/>
+                    <field name="model"/>
+                    <field name="res_id"/>
+                    <field name="parent_id"/>
                     <filter string="To Read"
                             name="message_unread" help="Show messages to read"
                             domain="[('to_read', '=', True)]"/>
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 5ddf412e66b..80df8ad6e99 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -33,7 +33,7 @@ from email.message import Message
 from openerp import tools
 from openerp import SUPERUSER_ID
 from openerp.addons.mail.mail_message import decode
-from openerp.osv import fields, osv
+from openerp.osv import fields, osv, orm
 from openerp.tools.safe_eval import safe_eval as eval
 from openerp.tools.translate import _
 
@@ -449,6 +449,70 @@ class mail_thread(osv.AbstractModel):
         ir_attachment_obj.unlink(cr, uid, attach_ids, context=context)
         return True
 
+    def _get_formview_action(self, cr, uid, id, model=None, context=None):
+        """ Return an action to open the document. This method is meant to be
+            overridden in addons that want to give specific view ids for example.
+
+            :param int id: id of the document to open
+            :param string model: specific model that overrides self._name
+        """
+        return {
+                'type': 'ir.actions.act_window',
+                'res_model': model or self._name,
+                'view_type': 'form',
+                'view_mode': 'form',
+                'views': [(False, 'form')],
+                'target': 'current',
+                'res_id': id,
+            }
+
+    def _get_inbox_action_xml_id(self, cr, uid, context=None):
+        """ When redirecting towards the Inbox, choose which action xml_id has
+            to be fetched. This method is meant to be inherited, at least in portal
+            because portal users have a different Inbox action than classic users. """
+        return ('mail', 'action_mail_inbox_feeds')
+
+    def message_redirect_action(self, cr, uid, context=None):
+        """ For a given message, return an action that either
+            - opens the form view of the related document if model, res_id, and
+              read access to the document
+            - opens the Inbox with a default search on the conversation if model,
+              res_id
+            - opens the Inbox with context propagated
+
+        """
+        if context is None:
+            context = {}
+
+        # default action is the Inbox action
+        self.pool.get('res.users').browse(cr, SUPERUSER_ID, uid, context=context)
+        act_model, act_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, *self._get_inbox_action_xml_id(cr, uid, context=context))
+        action = self.pool.get(act_model).read(cr, uid, act_id, [])
+
+        # if msg_id specified: try to redirect to the document or fallback on the Inbox
+        msg_id = context.get('params', {}).get('message_id')
+        if not msg_id:
+            return action
+        msg = self.pool.get('mail.message').browse(cr, uid, msg_id, context=context)
+        if msg.model and msg.res_id:
+            action.update({
+                'context': {
+                    'search_default_model': msg.model,
+                    'search_default_res_id': msg.res_id,
+                }
+            })
+            if self.pool.get(msg.model).check_access_rights(cr, uid, 'read', raise_exception=False):
+                try:
+                    model_obj = self.pool.get(msg.model)
+                    model_obj.check_access_rule(cr, uid, [msg.res_id], 'read', context=context)
+                    if not hasattr(model_obj, '_get_formview_action'):
+                        action = self.pool.get('mail.thread')._get_formview_action(cr, uid, msg.res_id, model=msg.model, context=context)
+                    else:
+                        action = model_obj._get_formview_action(cr, uid, msg.res_id, context=context)
+                except (osv.except_osv, orm.except_orm):
+                    pass
+        return action
+
     #------------------------------------------------------
     # Email specific
     #------------------------------------------------------
@@ -459,7 +523,7 @@ class mail_thread(osv.AbstractModel):
         return ["%s@%s" % (record['alias_name'], record['alias_domain'])
                     if record.get('alias_domain') and record.get('alias_name')
                     else False
-                    for record in self.read(cr, uid, ids, ['alias_name', 'alias_domain'], context=context)]
+                    for record in self.read(cr, SUPERUSER_ID, ids, ['alias_name', 'alias_domain'], context=context)]
 
     #------------------------------------------------------
     # Mail gateway
@@ -1200,19 +1264,35 @@ class mail_thread(osv.AbstractModel):
         """ Add partners to the records followers. """
         user_pid = self.pool.get('res.users').read(cr, uid, uid, ['partner_id'], context=context)['partner_id'][0]
         if set(partner_ids) == set([user_pid]):
-            self.check_access_rights(cr, uid, 'read')
+            try:
+                self.check_access_rights(cr, uid, 'read')
+            except (osv.except_osv, orm.except_orm):
+                return
         else:
             self.check_access_rights(cr, uid, 'write')
 
+        # subscribe partners
         self.write(cr, SUPERUSER_ID, ids, {'message_follower_ids': [(4, pid) for pid in partner_ids]}, context=context)
-        # if subtypes are not specified (and not set to a void list), fetch default ones
-        if subtype_ids is None:
-            subtype_obj = self.pool.get('mail.message.subtype')
-            subtype_ids = subtype_obj.search(cr, uid, [('default', '=', True), '|', ('res_model', '=', self._name), ('res_model', '=', False)], context=context)
-        # update the subscriptions
+
+        # subtype specified: update the subscriptions
         fol_obj = self.pool.get('mail.followers')
-        fol_ids = fol_obj.search(cr, SUPERUSER_ID, [('res_model', '=', self._name), ('res_id', 'in', ids), ('partner_id', 'in', partner_ids)], context=context)
-        fol_obj.write(cr, SUPERUSER_ID, fol_ids, {'subtype_ids': [(6, 0, subtype_ids)]}, context=context)
+        if subtype_ids is not None:
+            fol_ids = fol_obj.search(cr, SUPERUSER_ID, [('res_model', '=', self._name), ('res_id', 'in', ids), ('partner_id', 'in', partner_ids)], context=context)
+            fol_obj.write(cr, SUPERUSER_ID, fol_ids, {'subtype_ids': [(6, 0, subtype_ids)]}, context=context)
+        # no subtypes: default ones for new subscription, do not update existing subscriptions
+        else:
+            # search new subscriptions: subtype_ids is False
+            fol_ids = fol_obj.search(cr, SUPERUSER_ID, [
+                            ('res_model', '=', self._name),
+                            ('res_id', 'in', ids),
+                            ('partner_id', 'in', partner_ids),
+                            ('subtype_ids', '=', False)
+                        ], context=context)
+            if fol_ids:
+                subtype_obj = self.pool.get('mail.message.subtype')
+                subtype_ids = subtype_obj.search(cr, uid, [('default', '=', True), '|', ('res_model', '=', self._name), ('res_model', '=', False)], context=context)
+                fol_obj.write(cr, SUPERUSER_ID, fol_ids, {'subtype_ids': [(6, 0, subtype_ids)]}, context=context)
+
         return True
 
     def message_unsubscribe_users(self, cr, uid, ids, user_ids=None, context=None):
diff --git a/addons/mail/mail_thread_view.xml b/addons/mail/mail_thread_view.xml
index 75c86e4645d..c9c5141d303 100644
--- a/addons/mail/mail_thread_view.xml
+++ b/addons/mail/mail_thread_view.xml
@@ -8,6 +8,7 @@
             <field name="context">{
               'default_model': 'res.users',
               'default_res_id': uid,
+              'needaction_menu_ref': ['mail.mail_tomefeeds', 'mail.mail_starfeeds']
             }</field>
             <field name="params" eval="&quot;{
                 'domain': [
@@ -36,7 +37,8 @@
             <field name="context">{
               'default_model': 'res.users',
               'default_res_id': uid,
-              'search_default_message_unread': True
+              'search_default_message_unread': True,
+              'needaction_menu_ref': ['mail.mail_starfeeds', 'mail.mail_inboxfeeds']
             }</field>
             <field name="params" eval="&quot;{
                 'domain': [
@@ -87,7 +89,8 @@
             <field name="tag">mail.wall</field>
             <field name="context">{
               'default_model': 'res.users',
-              'default_res_id': uid
+              'default_res_id': uid,
+              'needaction_menu_ref': ['mail.mail_tomefeeds', 'mail.mail_starfeeds', 'mail.mail_inboxfeeds']
             }</field>
             <field name="params" eval="&quot;{
                 'domain': [
@@ -108,6 +111,15 @@
             </field>
         </record>
 
+        <record id="action_mail_redirect" model="ir.actions.server">
+            <field name="name">Mail Redirection (Document / Inbox)</field>
+            <field name="condition">True</field>
+            <field name="model_id" ref="model_mail_thread"/>
+            <field name="code">action = pool.get('mail.thread').message_redirect_action(cr, uid, context)</field>
+            <field name="state">code</field>
+            <field name="type">ir.actions.server</field>
+        </record>
+
         <!-- MENU -->
 
         <!-- Top menu item -->
diff --git a/addons/mail/res_config.py b/addons/mail/res_config.py
index 91606e1c720..c19eb4a38ee 100644
--- a/addons/mail/res_config.py
+++ b/addons/mail/res_config.py
@@ -23,11 +23,12 @@ import urlparse
 
 from openerp.osv import osv, fields
 
+
 class project_configuration(osv.TransientModel):
     _inherit = 'base.config.settings'
 
     _columns = {
-        'alias_domain' : fields.char('Alias Domain',
+        'alias_domain': fields.char('Alias Domain',
                                      help="If you have setup a catch-all email domain redirected to "
                                           "the OpenERP server, enter the domain name here."),
     }
diff --git a/addons/mail/res_users_view.xml b/addons/mail/res_users_view.xml
index f49ff72194a..1cacadfc898 100644
--- a/addons/mail/res_users_view.xml
+++ b/addons/mail/res_users_view.xml
@@ -26,7 +26,7 @@
                 <field name="signature" position="before">
                     <field name="notification_email_send"/>
                 </field>
-                <field name="email" position="after">
+                <field name="signature" position="before">
                     <field name="alias_domain" invisible="1"/>
                     <field name="alias_id" readonly="1" required="0" attrs="{'invisible': [('alias_domain', '=', False)]}"/>
                 </field>
diff --git a/addons/mail/static/scripts/openerp_mailgate.py b/addons/mail/static/scripts/openerp_mailgate.py
old mode 100644
new mode 100755
diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index 6bc086a5b58..958c2bccd5f 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -564,13 +564,6 @@
     text-align: center;
     width:100%;
 }
-.openerp .oe_followers button.oe_invite{
-    margin: 5px 0;
-    padding: 2px 8px;
-    font-size: 12px;
-    text-shadow: none;
-    width: 100%;
-}
 .openerp .oe_followers button.oe_follower.oe_following{
     color: white;
     background-color: #3465A4;
@@ -624,8 +617,12 @@
     margin-top: 12px;
     margin-bottom: 4px;
 }
+.openerp .oe_followers .oe_invite{
+    float: right;
+}
 .openerp .oe_followers .oe_partner {
     height: 32px;
+    margin-right: 8px;
     overflow: hidden;
     white-space: nowrap;
     text-overflow: ellipsis;
diff --git a/addons/mail/static/src/img/email_icon.png b/addons/mail/static/src/img/email_icon.png
old mode 100755
new mode 100644
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index b1a579ba057..8631bc70baa 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -1056,9 +1056,7 @@ openerp.mail = function (session) {
                             msg.renderElement();
                             msg.start();
                         }
-                        if( self.options.root_thread.__parentedParent.__parentedParent.do_reload_menu_emails ) {
-                            self.options.root_thread.__parentedParent.__parentedParent.do_reload_menu_emails();
-                        }
+                        self.options.root_thread.MailWidget.do_reload_menu_emails();
                     });
 
                 });
@@ -1198,6 +1196,7 @@ openerp.mail = function (session) {
         init: function (parent, datasets, options) {
             var self = this;
             this._super(parent, options);
+            this.MailWidget = parent.__proto__ == mail.Widget.prototype ? parent : false;
             this.domain = options.domain || [];
             this.context = _.extend(options.context || {});
 
@@ -1431,11 +1430,16 @@ openerp.mail = function (session) {
 
         message_fetch_set_read: function (message_list) {
             if (! this.context.mail_read_set_read) return;
-            this.render_mutex.exec(_.bind(function() {
+            var self = this;
+            this.render_mutex.exec(function() {
                 msg_ids = _.pluck(message_list, 'id');
-                return this.ds_message.call('set_message_read', [
-                        msg_ids, true, false, this.context]);
-             }, this));
+                return self.ds_message.call('set_message_read', [msg_ids, true, false, self.context])
+                    .then(function (nb_read) {
+                        if (nb_read) {
+                            self.options.root_thread.MailWidget.do_reload_menu_emails();
+                        }
+                    });
+             });
         },
 
         /**
@@ -1700,6 +1704,22 @@ openerp.mail = function (session) {
             this.bind_events();
         },
         
+        /**
+        * create an object "related_menu"
+        * contains the menu widget and the sub menu related of this wall
+        */
+        do_reload_menu_emails: function () {
+            var menu = session.webclient.menu;
+            if (!menu || !menu.current_menu) {
+                return $.when();
+            }
+            return menu.rpc("/web/menu/load_needaction", {'menu_ids': [menu.current_menu]}).done(function(r) {
+                menu.on_needaction_loaded(r);
+            }).then(function () {
+                menu.trigger("need_action_reloaded");
+            });
+        },
+
         /**
          *Create the root thread and display this object in the DOM.
          * Call the no_message method then c all the message_fetch method 
@@ -1749,6 +1769,7 @@ openerp.mail = function (session) {
 
         init: function (parent, node) {
             this._super.apply(this, arguments);
+            this.ParentViewManager = parent;
             this.node = _.clone(node);
             this.node.params = _.extend({
                 'display_indented_thread': -1,
@@ -1768,7 +1789,7 @@ openerp.mail = function (session) {
 
             this.domain = this.node.params && this.node.params.domain || [];
 
-            if (!this.__parentedParent.is_action_enabled('edit')) {
+            if (!this.ParentViewManager.is_action_enabled('edit')) {
                 this.node.params.show_link = false;
             }
         },
@@ -1839,12 +1860,20 @@ openerp.mail = function (session) {
          */
         init: function (parent, action) {
             this._super(parent, action);
+            this.ActionManager = parent;
 
             this.action = _.clone(action);
             this.domain = this.action.params.domain || this.action.domain || [];
             this.context = _.extend(this.action.params.context || {}, this.action.context || {});
 
+            // filter some parameters that we will propagate as search_default
             this.defaults = {};
+            for (var key in this.action.context.params) {
+                if (_.indexOf(['model', 'res_id'], key) == -1) {
+                    continue;
+                }
+                this.context['search_default_' + key] = this.action.context.params[key];
+            }
             for (var key in this.context) {
                 if (key.match(/^search_default_/)) {
                     this.defaults[key.replace(/^search_default_/, '')] = this.context[key];
@@ -1871,23 +1900,6 @@ openerp.mail = function (session) {
             }
         },
 
-        /**
-        * crete an object "related_menu"
-        * contain the menu widget and the the sub menu related of this wall
-        */
-        do_reload_menu_emails: function () {
-            var menu = this.__parentedParent.__parentedParent.menu;
-            // return this.rpc("/web/menu/load", {'menu_id': 100}).done(function(r) {
-            //     _.each(menu.data.data.children, function (val) {
-            //         if (val.id == 100) {
-            //             val.children = _.find(r.data.children, function (r_val) {return r_val.id == 100;}).children;
-            //         }
-            //     });
-            //     var r = menu.data;
-            // window.setTimeout(function(){menu.do_reload();}, 0);
-            // });
-        },
-
         /**
          * Load the mail.message search view
          * @param {Object} defaults ??
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 7e7d772397a..ab82d650f30 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -144,7 +144,9 @@
             <t t-foreach='widget.recipients' t-as='recipient'>
                 <label t-attf-title="Add as recipient and follower (reason: #{recipient.reason})">
                     <input type="checkbox" t-att-checked="recipient.checked ? 'checked' : undefined" t-att-data="recipient.email_address"/>
-                    <t t-raw="recipient.name"/> (<t t-raw="recipient.email_address"/>)
+                    <t t-raw="recipient.name"/> 
+                    <t t-if="recipient.email_address">(<t t-raw="recipient.email_address"/>)</t>
+                    <t t-if="!recipient.email_address">(no email address)</t>
                 </label>
             </t>
         </div>
diff --git a/addons/mail/static/src/xml/mail_followers.xml b/addons/mail/static/src/xml/mail_followers.xml
index f3317223f1d..5ad3ff09bb3 100644
--- a/addons/mail/static/src/xml/mail_followers.xml
+++ b/addons/mail/static/src/xml/mail_followers.xml
@@ -19,7 +19,7 @@
         </div>
         <div class='oe_follower_title_box'>
             <h4 class='oe_follower_title'>Followers</h4>
-            <button t-if="widget.view_is_editable" href='#' class="oe_invite">Invite people</button>
+            <a t-if="widget.view_is_editable" href='#' class="oe_invite">Add others</a>
         </div>
         <div class="oe_follower_list"></div>
     </div>
diff --git a/addons/mail/tests/test_mail_features.py b/addons/mail/tests/test_mail_features.py
index 7eea66b3b90..46f4555349d 100644
--- a/addons/mail/tests/test_mail_features.py
+++ b/addons/mail/tests/test_mail_features.py
@@ -19,12 +19,15 @@
 #
 ##############################################################################
 
+from openerp.addons.mail.mail_mail import mail_mail
+from openerp.addons.mail.mail_thread import mail_thread
 from openerp.addons.mail.tests.test_mail_base import TestMailBase
+from openerp.tools import mute_logger
 from openerp.tools.mail import html_sanitize
 
 
 class test_mail(TestMailBase):
-    
+
     def test_000_alias_setup(self):
         """ Test basic mail.alias setup works, before trying to use them for routing """
         cr, uid = self.cr, self.uid
@@ -43,7 +46,6 @@ class test_mail(TestMailBase):
         self.user_barty = self.res_users.browse(cr, uid, self.user_barty_id)
         self.assertEquals(self.user_barty.alias_name, 'b4r+_-_r3wl-', 'Disallowed chars should be replaced by hyphens')
 
-
     def test_00_followers_function_field(self):
         """ Tests designed for the many2many function field 'follower_ids'.
             We will test to perform writes using the many2many commands 0, 3, 4,
@@ -116,18 +118,66 @@ class test_mail(TestMailBase):
         # CASE1: test subscriptions with subtypes
         # ----------------------------------------
 
-        # Do: Subscribe Raoul three times (niak niak) through message_subscribe_users
+        # Do: subscribe Raoul, should have default subtypes
+        group_pigs.message_subscribe_users([user_raoul.id])
+        group_pigs.refresh()
+        # Test: 2 followers (Admin and Raoul)
+        follower_ids = [follower.id for follower in group_pigs.message_follower_ids]
+        self.assertEqual(set(follower_ids), set([user_raoul.partner_id.id, user_admin.partner_id.id]),
+                        'message_subscribe: Admin and Raoul should be the only 2 Pigs fans')
+        # Raoul follows default subtypes
+        fol_ids = self.mail_followers.search(cr, uid, [
+                        ('res_model', '=', 'mail.group'),
+                        ('res_id', '=', self.group_pigs_id),
+                        ('partner_id', '=', user_raoul.partner_id.id)
+                    ])
+        fol_obj = self.mail_followers.browse(cr, uid, fol_ids)[0]
+        fol_subtype_ids = set([subtype.id for subtype in fol_obj.subtype_ids])
+        self.assertEqual(set(fol_subtype_ids), set(default_group_subtypes),
+                        'message_subscribe: Raoul subscription subtypes are incorrect, should be all default ones')
+
+        # Do: subscribe Raoul with specified new subtypes
+        group_pigs.message_subscribe_users([user_raoul.id], subtype_ids=[mt_mg_nodef])
+        # Test: 2 followers (Admin and Raoul)
+        follower_ids = [follower.id for follower in group_pigs.message_follower_ids]
+        self.assertEqual(set(follower_ids), set([user_raoul.partner_id.id, user_admin.partner_id.id]),
+                        'message_subscribe: Admin and Raoul should be the only 2 Pigs fans')
+        # Test: 2 lines in mail.followers (no duplicate for Raoul)
+        fol_ids = self.mail_followers.search(cr, uid, [
+                        ('res_model', '=', 'mail.group'),
+                        ('res_id', '=', self.group_pigs_id),
+                    ])
+        self.assertEqual(len(fol_ids), 2,
+                        'message_subscribe: subscribing an already-existing follower should not create new entries in mail.followers')
+        # Test: Raoul follows only specified subtypes
+        fol_ids = self.mail_followers.search(cr, uid, [
+                        ('res_model', '=', 'mail.group'),
+                        ('res_id', '=', self.group_pigs_id),
+                        ('partner_id', '=', user_raoul.partner_id.id)
+                    ])
+        fol_obj = self.mail_followers.browse(cr, uid, fol_ids)[0]
+        fol_subtype_ids = set([subtype.id for subtype in fol_obj.subtype_ids])
+        self.assertEqual(set(fol_subtype_ids), set([mt_mg_nodef]),
+                        'message_subscribe: Raoul subscription subtypes are incorrect, should be only specified')
+
+        # Do: Subscribe Raoul without specified subtypes: should not erase existing subscription subtypes
         group_pigs.message_subscribe_users([user_raoul.id, user_raoul.id])
         group_pigs.message_subscribe_users([user_raoul.id])
         group_pigs.refresh()
         # Test: 2 followers (Admin and Raoul)
         follower_ids = [follower.id for follower in group_pigs.message_follower_ids]
-        self.assertEqual(set(follower_ids), set([user_raoul.partner_id.id, user_admin.partner_id.id]), 'Admin and Raoul should be the only 2 Pigs fans')
+        self.assertEqual(set(follower_ids), set([user_raoul.partner_id.id, user_admin.partner_id.id]),
+                        'message_subscribe: Admin and Raoul should be the only 2 Pigs fans')
         # Test: Raoul follows default subtypes
-        fol_ids = self.mail_followers.search(cr, uid, [('res_model', '=', 'mail.group'), ('res_id', '=', self.group_pigs_id), ('partner_id', '=', user_raoul.partner_id.id)])
+        fol_ids = self.mail_followers.search(cr, uid, [
+                        ('res_model', '=', 'mail.group'),
+                        ('res_id', '=', self.group_pigs_id),
+                        ('partner_id', '=', user_raoul.partner_id.id)
+                    ])
         fol_obj = self.mail_followers.browse(cr, uid, fol_ids)[0]
         fol_subtype_ids = set([subtype.id for subtype in fol_obj.subtype_ids])
-        self.assertEqual(set(fol_subtype_ids), set(default_group_subtypes), 'subscription subtypes are incorrect')
+        self.assertEqual(set(fol_subtype_ids), set([mt_mg_nodef]),
+                        'message_subscribe: Raoul subscription subtypes are incorrect, should be only specified')
 
         # Do: Unsubscribe Raoul twice through message_unsubscribe_users
         group_pigs.message_unsubscribe_users([user_raoul.id, user_raoul.id])
@@ -135,6 +185,13 @@ class test_mail(TestMailBase):
         # Test: 1 follower (Admin)
         follower_ids = [follower.id for follower in group_pigs.message_follower_ids]
         self.assertEqual(follower_ids, [user_admin.partner_id.id], 'Admin must be the only Pigs fan')
+        # Test: 1 lines in mail.followers (no duplicate for Raoul)
+        fol_ids = self.mail_followers.search(cr, uid, [
+                        ('res_model', '=', 'mail.group'),
+                        ('res_id', '=', self.group_pigs_id)
+                    ])
+        self.assertEqual(len(fol_ids), 1,
+                        'message_subscribe: group should have only 1 entry in mail.follower for 1 follower')
 
         # Do: subscribe Admin with subtype_ids
         group_pigs.message_subscribe_users([uid], [mt_mg_nodef, mt_all_nodef])
@@ -171,6 +228,64 @@ class test_mail(TestMailBase):
         self.assertNotIn('First answer, should not be displayed', result, 'Old answer should not be in quote.')
         self.assertNotIn('My answer I am propagating', result, 'Thread header content should be in quote.')
 
+    def test_11_notification_url(self):
+        """ Tests designed to test the URL added in notification emails. """
+        cr, uid, group_pigs = self.cr, self.uid, self.group_pigs
+
+        # Partner data
+        partner_raoul = self.res_partner.browse(cr, uid, self.partner_raoul_id)
+        partner_bert_id = self.res_partner.create(cr, uid, {'name': 'bert'})
+        partner_bert = self.res_partner.browse(cr, uid, partner_bert_id)
+        # Mail data
+        mail_mail_id = self.mail_mail.create(cr, uid, {'state': 'exception'})
+        mail = self.mail_mail.browse(cr, uid, mail_mail_id)
+
+        # Test: link for nobody -> None
+        url = mail_mail._get_partner_access_link(self.mail_mail, cr, uid, mail)
+        self.assertEqual(url, None,
+                        'notification email: mails not send to a specific partner should not have any URL')
+
+        # Test: link for partner -> None
+        url = mail_mail._get_partner_access_link(self.mail_mail, cr, uid, mail, partner=partner_bert)
+        self.assertEqual(url, None,
+                        'notification email: mails send to a not-user partner should not have any URL')
+
+        # Test: link for user -> signin
+        url = mail_mail._get_partner_access_link(self.mail_mail, cr, uid, mail, partner=partner_raoul)
+        self.assertIn('action=mail.action_mail_redirect', url,
+                        'notification email: link should contain the redirect action')
+        self.assertIn('login=%s' % partner_raoul.user_ids[0].login, url,
+                        'notification email: link should contain the user login')
+
+    @mute_logger('openerp.addons.mail.mail_thread', 'openerp.osv.orm')
+    def test_12_inbox_redirection(self):
+        """ Tests designed to test the inbox redirection of emails notification URLs. """
+        cr, uid, user_admin, group_pigs = self.cr, self.uid, self.user_admin, self.group_pigs
+        model, act_id = self.ir_model_data.get_object_reference(cr, uid, 'mail', 'action_mail_inbox_feeds')
+        # Data: post a message on pigs
+        msg_id = self.group_pigs.message_post(body='My body', partner_ids=[self.partner_bert_id], type='comment', subtype='mail.mt_comment')
+
+        # No specific parameters -> should redirect to Inbox
+        action = mail_thread.message_redirect_action(self.mail_thread, cr, self.user_raoul_id, {'params': {}})
+        self.assertEqual(action.get('type'), 'ir.actions.client',
+                        'URL redirection: action without parameters should redirect to client action Inbox')
+        self.assertEqual(action.get('id'), act_id,
+                        'URL redirection: action without parameters should redirect to client action Inbox')
+
+        # Bert has read access to Pigs -> should redirect to form view of Pigs
+        action = mail_thread.message_redirect_action(self.mail_thread, cr, self.user_raoul_id, {'params': {'message_id': msg_id}})
+        self.assertEqual(action.get('type'), 'ir.actions.act_window',
+                        'URL redirection: action with message_id for read-accredited user should redirect to Pigs')
+        self.assertEqual(action.get('res_id'), group_pigs.id,
+                        'URL redirection: action with message_id for read-accredited user should redirect to Pigs')
+
+        # Bert has no read access to Pigs -> should redirect to Inbox
+        action = mail_thread.message_redirect_action(self.mail_thread, cr, self.user_bert_id, {'params': {'message_id': msg_id}})
+        self.assertEqual(action.get('type'), 'ir.actions.client',
+                        'URL redirection: action without parameters should redirect to client action Inbox')
+        self.assertEqual(action.get('id'), act_id,
+                        'URL redirection: action without parameters should redirect to client action Inbox')
+
     def test_20_message_post(self):
         """ Tests designed for message_post. """
         cr, uid, user_raoul, group_pigs = self.cr, self.uid, self.user_raoul, self.group_pigs
@@ -364,8 +479,8 @@ class test_mail(TestMailBase):
                             'message_post: notification email sent to more than one email address instead of a precise partner')
             self.assertIn(sent_email['email_to'][0], test_emailto,
                             'message_post: notification email email_to incorrect')
-            self.assertEqual(sent_email['reply_to'], '"Followers of Pigs" <r@r>',
-                            'message_post: notification email reply_to incorrect: should name Followers of Pigs, and have raoul email')
+            self.assertEqual(sent_email['reply_to'], 'r@r',  # was '"Followers of Pigs" <r@r>', but makes no sense
+                            'message_post: notification email reply_to incorrect: should have raoul email')
             self.assertEqual(_mail_subject, sent_email['subject'],
                             'message_post: notification email subject incorrect')
             self.assertIn(html_sanitize(_body2), sent_email['body'],
diff --git a/addons/mail/tests/test_mail_gateway.py b/addons/mail/tests/test_mail_gateway.py
index e4269d59d8b..ee166b82dde 100644
--- a/addons/mail/tests/test_mail_gateway.py
+++ b/addons/mail/tests/test_mail_gateway.py
@@ -20,6 +20,7 @@
 ##############################################################################
 
 from openerp.addons.mail.tests.test_mail_base import TestMailBase
+from openerp.tools import mute_logger
 
 MAIL_TEMPLATE = """Return-Path: <whatever-2a840@postmaster.twitter.com>
 To: {to}
@@ -123,6 +124,107 @@ class TestMailgateway(TestMailBase):
         self.assertEqual(partner_info['partner_id'], p_b_id,
                         'mail_thread: message_find_partner_from_emails wrong partner found')
 
+    def test_05_mail_message_mail_mail(self):
+        """ Tests designed for testing email values based on mail.message, aliases, ... """
+        cr, uid = self.cr, self.uid
+
+        # Data: clean catchall domain
+        param_ids = self.registry('ir.config_parameter').search(cr, uid, [('key', '=', 'mail.catchall.domain')])
+        self.registry('ir.config_parameter').unlink(cr, uid, param_ids)
+
+        # Do: create a mail_message with a reply_to, without message-id
+        msg_id = self.mail_message.create(cr, uid, {'subject': 'Subject', 'body': 'Body', 'reply_to': 'custom@example.com'})
+        msg = self.mail_message.browse(cr, uid, msg_id)
+        # Test: message content
+        self.assertIn('reply_to', msg.message_id,
+                        'mail_message: message_id should be specific to a mail_message with a given reply_to')
+        self.assertEqual('custom@example.com', msg.reply_to,
+                        'mail_message: incorrect reply_to')
+        # Do: create a mail_mail with the previous mail_message and specified reply_to
+        mail_id = self.mail_mail.create(cr, uid, {'mail_message_id': msg_id, 'reply_to': 'other@example.com', 'state': 'cancel'})
+        mail = self.mail_mail.browse(cr, uid, mail_id)
+        # Test: mail_mail content
+        self.assertEqual(mail.reply_to, 'other@example.com',
+                        'mail_mail: reply_to should be equal to the one coming from creation values')
+        # Do: create a mail_mail with the previous mail_message
+        mail_id = self.mail_mail.create(cr, uid, {'mail_message_id': msg_id, 'state': 'cancel'})
+        mail = self.mail_mail.browse(cr, uid, mail_id)
+        # Test: mail_mail content
+        self.assertEqual(mail.reply_to, msg.reply_to,
+                        'mail_mail: reply_to should be equal to the one coming from the mail_message')
+
+        # Do: create a mail_message without a reply_to
+        msg_id = self.mail_message.create(cr, uid, {'subject': 'Subject', 'body': 'Body', 'model': 'mail.group', 'res_id': self.group_pigs_id, 'email_from': False})
+        msg = self.mail_message.browse(cr, uid, msg_id)
+        # Test: message content
+        self.assertIn('mail.group', msg.message_id,
+                        'mail_message: message_id should contain model')
+        self.assertIn('%s' % self.group_pigs_id, msg.message_id,
+                        'mail_message: message_id should contain res_id')
+        self.assertFalse(msg.reply_to,
+                        'mail_message: should not generate a reply_to address when not specified')
+        # Do: create a mail_mail based on the previous mail_message
+        mail_id = self.mail_mail.create(cr, uid, {'mail_message_id': msg_id, 'state': 'cancel'})
+        mail = self.mail_mail.browse(cr, uid, mail_id)
+        # Test: mail_mail content
+        self.assertFalse(mail.reply_to,
+                        'mail_mail: reply_to should not have been guessed')
+        # Update message
+        self.mail_message.write(cr, uid, [msg_id], {'email_from': 'someone@example.com'})
+        msg.refresh()
+        # Do: create a mail_mail based on the previous mail_message
+        mail_id = self.mail_mail.create(cr, uid, {'mail_message_id': msg_id, 'state': 'cancel'})
+        mail = self.mail_mail.browse(cr, uid, mail_id)
+        # Test: mail_mail content
+        self.assertEqual(mail.reply_to, msg.email_from,
+                        'mail_mail: reply_to should equal to mail_message.email_from when having no document or default alias')
+
+        # Data: set catchall domain
+        self.registry('ir.config_parameter').set_param(cr, uid, 'mail.catchall.domain', 'schlouby.fr')
+        self.registry('ir.config_parameter').unlink(cr, uid, self.registry('ir.config_parameter').search(cr, uid, [('key', '=', 'mail.catchall.alias')]))
+
+        # Do: create a mail_mail based on the previous mail_message
+        mail_id = self.mail_mail.create(cr, uid, {'mail_message_id': msg_id, 'state': 'cancel'})
+        mail = self.mail_mail.browse(cr, uid, mail_id)
+        # Test: mail_mail content
+        self.assertEqual(mail.reply_to, '"Followers of Pigs" <group+pigs@schlouby.fr>',
+                        'mail_mail: reply_to should equal the mail.group alias')
+
+        # Update message
+        self.mail_message.write(cr, uid, [msg_id], {'res_id': False, 'email_from': 'someone@schlouby.fr'})
+        msg.refresh()
+        # Do: create a mail_mail based on the previous mail_message
+        mail_id = self.mail_mail.create(cr, uid, {'mail_message_id': msg_id, 'state': 'cancel'})
+        mail = self.mail_mail.browse(cr, uid, mail_id)
+        # Test: mail_mail content
+        self.assertEqual(mail.reply_to, msg.email_from,
+                        'mail_mail: reply_to should equal the mail_message email_from')
+
+        # Data: set catchall alias
+        self.registry('ir.config_parameter').set_param(self.cr, self.uid, 'mail.catchall.alias', 'gateway')
+
+        # Do: create a mail_mail based on the previous mail_message
+        mail_id = self.mail_mail.create(cr, uid, {'mail_message_id': msg_id, 'state': 'cancel'})
+        mail = self.mail_mail.browse(cr, uid, mail_id)
+        # Test: mail_mail content
+        self.assertEqual(mail.reply_to, 'gateway@schlouby.fr',
+                        'mail_mail: reply_to should equal the catchall email alias')
+
+        # Do: create a mail_mail
+        mail_id = self.mail_mail.create(cr, uid, {'state': 'cancel'})
+        mail = self.mail_mail.browse(cr, uid, mail_id)
+        # Test: mail_mail content
+        self.assertEqual(mail.reply_to, 'gateway@schlouby.fr',
+                        'mail_mail: reply_to should equal the catchall email alias')
+
+        # Do: create a mail_mail
+        mail_id = self.mail_mail.create(cr, uid, {'state': 'cancel', 'reply_to': 'someone@example.com'})
+        mail = self.mail_mail.browse(cr, uid, mail_id)
+        # Test: mail_mail content
+        self.assertEqual(mail.reply_to, 'someone@example.com',
+                        'mail_mail: reply_to should equal the rpely_to given to create')
+
+    @mute_logger('openerp.addons.mail.mail_thread', 'openerp.osv.orm')
     def test_10_message_process(self):
         """ Testing incoming emails processing. """
         cr, uid, user_raoul = self.cr, self.uid, self.user_raoul
@@ -365,6 +467,7 @@ class TestMailgateway(TestMailBase):
         self.assertEqual(msg.body, '<pre>\nPlease call me as soon as possible this afternoon!\n\n--\nSylvie\n</pre>',
                             'message_process: plaintext incoming email incorrectly parsed')
 
+    @mute_logger('openerp.addons.mail.mail_thread', 'openerp.osv.orm')
     def test_20_thread_parent_resolution(self):
         """ Testing parent/child relationships are correctly established when processing incoming mails """
         cr, uid = self.cr, self.uid
diff --git a/addons/mail/wizard/invite.py b/addons/mail/wizard/invite.py
index 4ff6584d789..a6bfc34c213 100644
--- a/addons/mail/wizard/invite.py
+++ b/addons/mail/wizard/invite.py
@@ -75,7 +75,7 @@ class invite_wizard(osv.osv_memory):
             model_name = ir_model.name_get(cr, uid, model_ids, context=context)[0][1]
 
             # send an email if option checked and if a message exists (do not send void emails)
-            if wizard.send_mail and wizard.message:
+            if wizard.send_mail and wizard.message and not wizard.message == '<br>':  # when deleting the message, cleditor keeps a <br>
                 # add signature
                 # FIXME 8.0: use notification_email_send, send a wall message and let mail handle email notification + message box
                 signature_company = self.pool.get('mail.notification').get_signature_footer(cr, uid, user_id=uid, res_model=wizard.res_model, res_id=wizard.res_id, context=context)
diff --git a/addons/marketing_campaign/marketing_campaign_demo.xml b/addons/marketing_campaign/marketing_campaign_demo.xml
index 92443fe987d..89a299e3a85 100644
--- a/addons/marketing_campaign/marketing_campaign_demo.xml
+++ b/addons/marketing_campaign/marketing_campaign_demo.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" ?>
 <openerp>
     <data>
         <!-- Email tempalte -->
@@ -66,13 +65,13 @@
 
     <!-- Transition -->
         <record id="marketing_campaign_transition_0" model="marketing.campaign.transition">
-            <field model="marketing.campaign.activity" name="activity_from_id" ref = "marketing_campaign_activity_0"/>
-            <field model="marketing.campaign.activity" name="activity_to_id" ref = "marketing_campaign_activity_1"/>
+            <field name="activity_from_id" ref="marketing_campaign_activity_0"/>
+            <field name="activity_to_id" ref="marketing_campaign_activity_1"/>
         </record>
 
         <record id="marketing_campaign_transition_1" model="marketing.campaign.transition">
-            <field model="marketing.campaign.activity" name="activity_from_id" ref = "marketing_campaign_activity_1"/>
-            <field model="marketing.campaign.activity" name="activity_to_id" ref = "marketing_campaign_activity_2"/>
+            <field name="activity_from_id" ref="marketing_campaign_activity_1"/>
+            <field name="activity_to_id" ref="marketing_campaign_activity_2"/>
         </record>
 
     <!-- Segment -->
@@ -85,9 +84,9 @@
             <field eval="time.strftime('%Y-%m-%d %H:%M:%S')" name="date_run"/>
             <field name="name">OpenERP Partner</field>
             <field name="sync_mode">create_date</field>
-            <field name="ir_filter_id" ref="filter0"></field>
+            <field name="ir_filter_id" ref="filter0"/>
             <field name="campaign_id" ref="marketing_campaign_openerppartnerchannel"/>
         </record>
 
     </data>
-</openerp>
+</openerp>
\ No newline at end of file
diff --git a/addons/marketing_campaign_crm_demo/marketing_campaign_demo.xml b/addons/marketing_campaign_crm_demo/marketing_campaign_demo.xml
index 141981a21d6..f6eb8a1d905 100644
--- a/addons/marketing_campaign_crm_demo/marketing_campaign_demo.xml
+++ b/addons/marketing_campaign_crm_demo/marketing_campaign_demo.xml
@@ -1,11 +1,10 @@
-<?xml version="1.0" ?>
 <openerp>
     <data>
         <record id="action_dummy" model="ir.actions.server">
             <field name="name">Dummy Action</field>
             <field name="model_id" ref="crm.model_crm_lead"/>
             <field name="state">dummy</field>
-            <field name="code"></field>
+            <field name="code"/>
             <field eval="5" name="sequence"/>
             <field eval="True" name="condition"/>
         </record>
@@ -40,10 +39,10 @@
             <field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
             <field name="model_id" ref="crm.model_crm_lead"/>
             <field eval="0" name="user_signature"/>
-            <field name="body_html"><![CDATA[<p>Hello,</p>
-            <p>Thanks for the genuine interest you have shown in OpenERP.</p>
-            <p>If any further information is required, do not hesitate to reply to this message.</p>
-            <p>Regards,OpenERP Team,</p>]]></field>
+            <field name="body_html">&lt;p&gt;Hello,&lt;/p&gt;
+            &lt;p&gt;Thanks for the genuine interest you have shown in OpenERP.&lt;/p&gt;
+            &lt;p&gt;If any further information is required, do not hesitate to reply to this message.&lt;/p&gt;
+            &lt;p&gt;Regards,OpenERP Team,&lt;/p&gt;</field>
             <field name="name">For OpenERP OnDemand Free Trial 2010</field>
         </record>
         <record id="email_template_2" model="email.template">
@@ -53,11 +52,11 @@
             <field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
             <field name="model_id" ref="crm.model_crm_lead"/>
             <field eval="0" name="user_signature"/>
-            <field name="body_html"><![CDATA[<p>Hello,</p>
-            <p>We have very good offer that might suit you.
-            We suggest you subscribe to the OpenERP Discovery Day on May 2010.</p>
-            <p>If any further information is required, do not hesitate to reply to this message.</p>
-            <p>Regards,OpenERP Team,</p>]]></field>
+            <field name="body_html">&lt;p&gt;Hello,&lt;/p&gt;
+            &lt;p&gt;We have very good offer that might suit you.
+            We suggest you subscribe to the OpenERP Discovery Day on May 2010.&lt;/p&gt;
+            &lt;p&gt;If any further information is required, do not hesitate to reply to this message.&lt;/p&gt;
+            &lt;p&gt;Regards,OpenERP Team,&lt;/p&gt;</field>
             <field name="name">For OpenERP Discovery Day on May 2010</field>
         </record>
 
@@ -68,10 +67,10 @@
             <field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
             <field name="model_id" ref="crm.model_crm_lead"/>
             <field eval="0" name="user_signature"/>
-            <field name="body_html"><![CDATA[<p>Hello,</p>
-            <p>Thanks for showing interest and for subscribing to the OpenERP Discovery Day.</p>
-            <p>If any further information is required, do not hesitate to reply to this message.</p>
-            <p>Regards,OpenERP Team,</p>]]></field>
+            <field name="body_html">&lt;p&gt;Hello,&lt;/p&gt;
+            &lt;p&gt;Thanks for showing interest and for subscribing to the OpenERP Discovery Day.&lt;/p&gt;
+            &lt;p&gt;If any further information is required, do not hesitate to reply to this message.&lt;/p&gt;
+            &lt;p&gt;Regards,OpenERP Team,&lt;/p&gt;</field>
             <field name="name">For OpenERP Discovery Day</field>
         </record>
 
@@ -82,10 +81,10 @@
            <field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
              <field name="model_id" ref="crm.model_crm_lead"/>
             <field eval="0" name="user_signature"/>
-            <field name="body_html"><![CDATA[<p>Hello,</p>
-            <p>Thanks for showing interest and buying the OpenERP book.</p>
+            <field name="body_html">&lt;p&gt;Hello,&lt;/p&gt;
+            &lt;p&gt;Thanks for showing interest and buying the OpenERP book.&lt;/p&gt;
             If any further information required kindly revert back.
-            <p>Regards,OpenERP Team,</p>]]></field>
+            &lt;p&gt;Regards,OpenERP Team,&lt;/p&gt;</field>
             <field name="name">For OpenERP book</field>
         </record>
 
@@ -95,11 +94,11 @@
             <field model="ir.actions.act_window" name="ref_ir_act_window" search="[('name', '=', u'For OpenERP OnDemand Free Trial 2010 Mail Form')]"/>
             <field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
             <field eval="0" name="user_signature"/>
-            <field name="body_html"><![CDATA[<p>Hello,</p>
-            <p>We have very good offer that might suit you.
-            For our gold partners,We are arranging free technical training on june,2010.</p>
-            <p>If any further information is required, do not hesitate to reply to this message.</p>
-            <p>Regards,OpenERP Team,</p>]]></field>
+            <field name="body_html">&lt;p&gt;Hello,&lt;/p&gt;
+            &lt;p&gt;We have very good offer that might suit you.
+            For our gold partners,We are arranging free technical training on june,2010.&lt;/p&gt;
+            &lt;p&gt;If any further information is required, do not hesitate to reply to this message.&lt;/p&gt;
+            &lt;p&gt;Regards,OpenERP Team,&lt;/p&gt;</field>
             <field name="name">technical training to gold partners</field>
         </record>
 
@@ -110,11 +109,11 @@
             <field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
             <field name="model_id" ref="crm.model_crm_lead"/>
             <field eval="0" name="user_signature"/>
-            <field name="body_html"><![CDATA[<p>Hello,</p>
-            <p>We have very good offer that might suit you.
-            For our silver partners,We are  paid technical training on june,2010.</p>
-            <p>If any further information is required, do not hesitate to reply to this message.</p>
-            <p>Regards,OpenERP Team,</p>]]></field>
+            <field name="body_html">&lt;p&gt;Hello,&lt;/p&gt;
+            &lt;p&gt;We have very good offer that might suit you.
+            For our silver partners,We are  paid technical training on june,2010.&lt;/p&gt;
+            &lt;p&gt;If any further information is required, do not hesitate to reply to this message.&lt;/p&gt;
+            &lt;p&gt;Regards,OpenERP Team,&lt;/p&gt;</field>
             <field name="name">training to silver partners</field>
         </record>
 
@@ -125,11 +124,11 @@
             <field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
             <field name="model_id" ref="crm.model_crm_lead"/>
             <field eval="0" name="user_signature"/>
-            <field name="body_html"><![CDATA[<p>Hello,</p>
-            <p>We have very good offer that might suit you.
-            For our silver partners, we are  offering Gold partnership.</p>
-            <p>If any further information is required, do not hesitate to reply to this message.</p>
-            <p>Regards,OpenERP Team,</p>]]></field>
+            <field name="body_html">&lt;p&gt;Hello,&lt;/p&gt;
+            &lt;p&gt;We have very good offer that might suit you.
+            For our silver partners, we are  offering Gold partnership.&lt;/p&gt;
+            &lt;p&gt;If any further information is required, do not hesitate to reply to this message.&lt;/p&gt;
+            &lt;p&gt;Regards,OpenERP Team,&lt;/p&gt;</field>
             <field name="name">gold partnership to silver partners</field>
         </record>
 
@@ -140,11 +139,11 @@
             <field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
             <field name="model_id" ref="crm.model_crm_lead"/>
             <field eval="0" name="user_signature"/>
-            <field name="body_html"><![CDATA[<p>Hello,</p>
-            <p>Thanks for showing interest and for subscribing to technical training.</p>
-            If any further information required kindly revert back.I really appreciate your co-operation on this.</p>
-            <p>If any further information is required, do not hesitate to reply to this message.</p>
-            <p>Regards,OpenERP Team,</p>]]></field>
+            <field name="body_html">&lt;p&gt;Hello,&lt;/p&gt;
+            &lt;p&gt;Thanks for showing interest and for subscribing to technical training.&lt;/p&gt;
+            If any further information required kindly revert back.I really appreciate your co-operation on this.&lt;/p&gt;
+            &lt;p&gt;If any further information is required, do not hesitate to reply to this message.&lt;/p&gt;
+            &lt;p&gt;Regards,OpenERP Team,&lt;/p&gt;</field>
             <field name="name">subscribing to technical training</field>
         </record>
         <!-- Report -->
@@ -171,7 +170,7 @@
         <record id="marketing_campaign_activity_0" model="marketing.campaign.activity">
             <field name="name">Propose a 1 month free trial for an OnDemand offer</field>
             <field name="server_action_id" ref="action_dummy"/>
-            <field model="marketing.campaign" name="campaign_id" ref="marketing_campaign_openerpondemandfreetrial0"/>
+            <field name="campaign_id" ref="marketing_campaign_openerpondemandfreetrial0"/>
             <field name="report_directory_id" ref="document_directory_campaign1"/>
             <field name="type">report</field>
             <field eval="1" name="start"/>
@@ -180,27 +179,27 @@
         <record id="marketing_campaign_activity_1" model="marketing.campaign.activity">
             <field name="name">Thanks for showing interest</field>
             <field name="server_action_id" ref="action_dummy"/>
-            <field model="marketing.campaign" name="campaign_id" ref="marketing_campaign_openerpondemandfreetrial0"/>
+            <field name="campaign_id" ref="marketing_campaign_openerpondemandfreetrial0"/>
             <field name="email_template_id" ref="email_template_1"/>
         </record>
 
         <record id="marketing_campaign_activity_2" model="marketing.campaign.activity">
             <field name="name">Propose to subscribe to the OpenERP Discovery Day on May 2010</field>
             <field name="server_action_id" ref="action_dummy"/>
-            <field model="marketing.campaign" name="campaign_id" ref="marketing_campaign_openerpondemandfreetrial0"/>
+            <field name="campaign_id" ref="marketing_campaign_openerpondemandfreetrial0"/>
              <field name="email_template_id" ref="email_template_2"/>
         </record>
 
         <record id="marketing_campaign_activity_3" model="marketing.campaign.activity">
             <field name="name">Thanks for subscribing to the OpenERP Discovery Day</field>
             <field name="server_action_id" ref="action_dummy"/>
-            <field model="marketing.campaign" name="campaign_id" ref="marketing_campaign_openerpondemandfreetrial0"/>
+            <field name="campaign_id" ref="marketing_campaign_openerpondemandfreetrial0"/>
             <field name="email_template_id" ref="email_template_3"/>
         </record>
         <record id="marketing_campaign_activity_4" model="marketing.campaign.activity">
             <field name="name">Propose to buy the OpenERP Book</field>
            <field name="server_action_id" ref="action_dummy"/>
-            <field model="marketing.campaign" name="campaign_id" ref="marketing_campaign_openerpondemandfreetrial0"/>
+            <field name="campaign_id" ref="marketing_campaign_openerpondemandfreetrial0"/>
             <field name="report_directory_id" ref="document_directory_campaign1"/>
             <field name="type">report</field>
             <field name="report_id" ref="mc_crm_lead_demo_report"/>
@@ -209,81 +208,81 @@
         <record id="marketing_campaign_activity_5" model="marketing.campaign.activity">
             <field name="name">Thanks for buying the OpenERP book</field>
             <field name="server_action_id" ref="action_dummy"/>
-            <field model="marketing.campaign" name="campaign_id" ref="marketing_campaign_openerpondemandfreetrial0"/>
+            <field name="campaign_id" ref="marketing_campaign_openerpondemandfreetrial0"/>
             <field name="email_template_id" ref="email_template_4"/>
         </record>
         <record id="marketing_campaign_activity_6" model="marketing.campaign.activity">
             <field name="name">Propose a free technical training to Gold partners</field>
             <field name="server_action_id" ref="action_dummy"/>
-            <field model="marketing.campaign" name="campaign_id" ref="marketing_campaign_openerpondemandfreetrial0"/>
+            <field name="campaign_id" ref="marketing_campaign_openerpondemandfreetrial0"/>
             <field name="email_template_id" ref="email_template_5"/>
         </record>
         <record id="marketing_campaign_activity_7" model="marketing.campaign.activity">
             <field name="name">Propose paid training to Silver partners</field>
             <field name="server_action_id" ref="action_dummy"/>
-            <field model="marketing.campaign" name="campaign_id" ref="marketing_campaign_openerpondemandfreetrial0"/>
+            <field name="campaign_id" ref="marketing_campaign_openerpondemandfreetrial0"/>
             <field name="email_template_id" ref="email_template_6"/>
         </record>
 
         <record id="marketing_campaign_activity_8" model="marketing.campaign.activity">
             <field name="name">Propose gold partnership to silver partners</field>
             <field name="server_action_id" ref="action_dummy"/>
-            <field model="marketing.campaign" name="campaign_id" ref="marketing_campaign_openerpondemandfreetrial0"/>
+            <field name="campaign_id" ref="marketing_campaign_openerpondemandfreetrial0"/>
             <field name="email_template_id" ref="email_template_7"/>
         </record>
 
          <record id="marketing_campaign_activity_9" model="marketing.campaign.activity">
             <field name="name">Thanks for subscribing to technical training</field>
             <field name="server_action_id" ref="action_dummy"/>
-            <field model="marketing.campaign" name="campaign_id" ref="marketing_campaign_openerpondemandfreetrial0"/>
+            <field name="campaign_id" ref="marketing_campaign_openerpondemandfreetrial0"/>
         <field name="email_template_id" ref="email_template_8"/>
         </record>
 
     <!-- Tranisition -->
         <record id="marketing_campaign_transition_0" model="marketing.campaign.transition">
-            <field model="marketing.campaign.activity" name="activity_from_id" ref = "marketing_campaign_activity_0"/>
-            <field model="marketing.campaign.activity" name="activity_to_id" ref = "marketing_campaign_activity_1"/>
+            <field name="activity_from_id" ref="marketing_campaign_activity_0"/>
+            <field name="activity_to_id" ref="marketing_campaign_activity_1"/>
         </record>
 
         <record id="marketing_campaign_transition_1" model="marketing.campaign.transition">
-            <field model="marketing.campaign.activity" name="activity_from_id" ref = "marketing_campaign_activity_0"/>
-            <field model="marketing.campaign.activity" name="activity_to_id" ref = "marketing_campaign_activity_2"/>
+            <field name="activity_from_id" ref="marketing_campaign_activity_0"/>
+            <field name="activity_to_id" ref="marketing_campaign_activity_2"/>
         </record>
         <record id="marketing_campaign_transition_2" model="marketing.campaign.transition">
-            <field model="marketing.campaign.activity" name="activity_from_id" ref = "marketing_campaign_activity_2"/>
-            <field model="marketing.campaign.activity" name="activity_to_id" ref = "marketing_campaign_activity_3"/>
+            <field name="activity_from_id" ref="marketing_campaign_activity_2"/>
+            <field name="activity_to_id" ref="marketing_campaign_activity_3"/>
         </record>
         <record id="marketing_campaign_transition_3" model="marketing.campaign.transition">
-            <field model="marketing.campaign.activity" name="activity_from_id" ref = "marketing_campaign_activity_2"/>
-            <field model="marketing.campaign.activity" name="activity_to_id" ref = "marketing_campaign_activity_4"/>
+            <field name="activity_from_id" ref="marketing_campaign_activity_2"/>
+            <field name="activity_to_id" ref="marketing_campaign_activity_4"/>
         </record>
         <record id="marketing_campaign_transition_4" model="marketing.campaign.transition">
-            <field model="marketing.campaign.activity" name="activity_from_id" ref = "marketing_campaign_activity_4"/>
-            <field model="marketing.campaign.activity" name="activity_to_id" ref = "marketing_campaign_activity_5"/>
+            <field name="activity_from_id" ref="marketing_campaign_activity_4"/>
+            <field name="activity_to_id" ref="marketing_campaign_activity_5"/>
         </record>
         <record id="marketing_campaign_transition_5" model="marketing.campaign.transition">
-            <field model="marketing.campaign.activity" name="activity_from_id" ref = "marketing_campaign_activity_4"/>
-            <field model="marketing.campaign.activity" name="activity_to_id" ref = "marketing_campaign_activity_6"/>
+            <field name="activity_from_id" ref="marketing_campaign_activity_4"/>
+            <field name="activity_to_id" ref="marketing_campaign_activity_6"/>
         </record>
         <record id="marketing_campaign_transition_6" model="marketing.campaign.transition">
-            <field model="marketing.campaign.activity" name="activity_from_id" ref = "marketing_campaign_activity_4"/>
-            <field model="marketing.campaign.activity" name="activity_to_id" ref = "marketing_campaign_activity_7"/>
+            <field name="activity_from_id" ref="marketing_campaign_activity_4"/>
+            <field name="activity_to_id" ref="marketing_campaign_activity_7"/>
         </record>
         <record id="marketing_campaign_transition_7" model="marketing.campaign.transition">
-            <field model="marketing.campaign.activity" name="activity_from_id" ref = "marketing_campaign_activity_6"/>
-            <field model="marketing.campaign.activity" name="activity_to_id" ref = "marketing_campaign_activity_9"/>
+            <field name="activity_from_id" ref="marketing_campaign_activity_6"/>
+            <field name="activity_to_id" ref="marketing_campaign_activity_9"/>
         </record>
         <record id="marketing_campaign_transition_8" model="marketing.campaign.transition">
-            <field model="marketing.campaign.activity" name="activity_from_id" ref = "marketing_campaign_activity_7"/>
-            <field model="marketing.campaign.activity" name="activity_to_id" ref = "marketing_campaign_activity_8"/>
+            <field name="activity_from_id" ref="marketing_campaign_activity_7"/>
+            <field name="activity_to_id" ref="marketing_campaign_activity_8"/>
         </record>
         <record id="marketing_campaign_transition_9" model="marketing.campaign.transition">
-            <field model="marketing.campaign.activity" name="activity_from_id" ref = "marketing_campaign_activity_7"/>
-            <field model="marketing.campaign.activity" name="activity_to_id" ref = "marketing_campaign_activity_9"/>
+            <field name="activity_from_id" ref="marketing_campaign_activity_7"/>
+            <field name="activity_to_id" ref="marketing_campaign_activity_9"/>
         </record>
         <record id="marketing_campaign_transition_10" model="marketing.campaign.transition">
-            <field model="marketing.campaign.activity" name="activity_from_id" ref = "marketing_campaign_activity_9"/>
-            <field model="marketing.campaign.activity" name="activity_to_id" ref = "marketing_campaign_activity_1"/>
+            <field name="activity_from_id" ref="marketing_campaign_activity_9"/>
+            <field name="activity_to_id" ref="marketing_campaign_activity_1"/>
         </record>
 
     <!-- Segment -->
@@ -296,4 +295,4 @@
         </record>
 
     </data>
-</openerp>
+</openerp>
\ No newline at end of file
diff --git a/addons/membership/process/membership_process.xml b/addons/membership/process/membership_process.xml
index d67ee864b34..b3ba426ff4a 100644
--- a/addons/membership/process/membership_process.xml
+++ b/addons/membership/process/membership_process.xml
@@ -87,16 +87,16 @@
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Product to member&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Define product for membership.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_waitingmember0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_membershipproduct0"/>
+            <field name="target_node_id" ref="process_node_waitingmember0"/>
+            <field name="source_node_id" ref="process_node_membershipproduct0"/>
         </record>
 
         <record id="process_transition_waitingtoinvoice0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Waiting to invoice&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Draft invoice is now open.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_invoicedmember0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_waitingmember0"/>
+            <field name="target_node_id" ref="process_node_invoicedmember0"/>
+            <field name="source_node_id" ref="process_node_waitingmember0"/>
         </record>
 
         <record id="process_transition_action_create0" model="process.transition.action">
@@ -110,25 +110,25 @@
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Invoice to paid&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Invoice is be paid.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_paidmember0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_invoicedmember0"/>
+            <field name="target_node_id" ref="process_node_paidmember0"/>
+            <field name="source_node_id" ref="process_node_invoicedmember0"/>
         </record>
 
         <record id="process_transition_invoicetoassociate0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;invoice to associate&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Invoiced member may be Associated member.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_associatedmember0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_invoicedmember0"/>
+            <field name="target_node_id" ref="process_node_associatedmember0"/>
+            <field name="source_node_id" ref="process_node_invoicedmember0"/>
         </record>
 
         <record id="process_transition_associationpartner0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Association Partner&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Associated partner.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_associatedmember0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_setassociation0"/>
+            <field name="target_node_id" ref="process_node_associatedmember0"/>
+            <field name="source_node_id" ref="process_node_setassociation0"/>
         </record>
 
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/mrp/html/coppernic.png b/addons/mrp/html/coppernic.png
new file mode 100644
index 00000000000..692230a5198
Binary files /dev/null and b/addons/mrp/html/coppernic.png differ
diff --git a/addons/mrp/html/index.html b/addons/mrp/html/index.html
new file mode 100644
index 00000000000..5777eb5f147
--- /dev/null
+++ b/addons/mrp/html/index.html
@@ -0,0 +1,193 @@
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <div class="oe_span12">
+            <h2 class="oe_slogan">Manufacturing Resource Planning</h2>
+            <h3 class="oe_slogan">Manage Bill of Materials, Plan Manufacturing Orders, Track Work Orders</h3>
+        </div>
+        <div class="oe_span6">
+            <div class="oe_demo oe_picture oe_screenshot">
+                <a href="https://www.openerp.com/saas_master/demo?lang=en_US&module=mrp">
+                    <img src="mrp_product.png">
+                </a>
+                <div class="oe_demo_footer oe_centeralign">Online Demo</div>
+            </div>
+        </div>
+        <div class="oe_span6">
+            <p class="oe_mt32">
+Get all your assembly or manufacturing operations managed by OpenERP. Schedule
+manufacturing orders and work orders automatically. Review the proposed
+planning with the smart kanban and gantt views. Use the advanced analytics
+features to detect bottleneck in resources capacities and inventory locations.
+            </p>
+            <div class="oe_centeralign oe_websiteonly">
+                <a href="http://www.openerp.com/start" class="oe_button oe_big oe_tacky">Start your <span class="oe_emph">free</span> trial</a>
+            </div>
+        </div>
+    </div>
+</section>
+
+
+<section class="oe_container oe_dark">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan">Schedule Manufacuring Orders Efficiently</h2>
+        <div class="oe_span6">
+            <p class="oe_mt32">
+Get manufacturing orders and work orders scheduled automatically based on your
+procurement rules, quantities forecasted and dependent demand (demand for this
+part based on another part consuming it).
+            </p>
+        </div>
+        <div class="oe_span6">
+            <img class="oe_picture oe_screenshot" src="mrp_calendar.png">
+        </div>
+    </div>
+</section>
+
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan">Define Flexible Master Data</h2>
+        <h3 class="oe_slogan">Products, Bill of Materials and Routings</h3>
+        <div class="oe_span6">
+            <img class="oe_picture oe_screenshot" src="mrp_bom.png">
+        </div>
+        <div class="oe_span6">
+            <p class="oe_mt32">
+Get the flexibility to create multi-level bill of materials, optional routing,
+version changes and phantom bill of materials. You can use BoM for kits or for
+manufacturing orders.
+            </p>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container oe_dark">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan">Get Flexibility In All Opertions</h2>
+        <div class="oe_span6">
+            <p class="oe_mt32">
+            Edit manually all proposed operations at any level of the progress.
+            With OpenERP, you will not be frustrated by a rigid system.
+            </p>
+        </div>
+        <div class="oe_span6">
+            <img class="oe_picture oe_screenshot" src="mrp_mo.png">
+        </div>
+    </div>
+</section>
+
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan">Schedule Work Orders</h2>
+        <h3 class="oe_slogan">Check resources capacities and fix bottlenecks</h3>
+        <div class="oe_span6">
+            <div class="oe_row_img oe_centered">
+                <img class="oe_picture" src="manufacturing_illu_02.png">
+            </div>
+        </div>
+        <div class="oe_span6">
+            <p class="oe_mt32">
+Define routings and plan the working time and capacity of your resources.
+Quickly identify resource requirements and bottlenecks to ensure your production
+meets your delivery schedule dates.
+            </p>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container oe_centeralign oe_padded oe_mb32">
+    <div class='oe_cover'>
+        <img src="http://www.openerp.com/ebooks/manufacturing.png">
+    </div>
+    <a href="http://www.openerp.com/ebooks/manufacturing" target="_blank" class="oe_button oe_big">Download our free E-book</a>
+</section>
+
+<section class="oe_container oe_dark">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan">A Productive User Interface</h2>
+        <h3 class="oe_slogan">Work with lists, calendars or gantt charts</h3>
+        <div class="oe_span12">
+            <p>
+Organize manufacturing orders and work orders the way you like it. Process next
+orders from the list view, control inthe calendar view and edit the proposed
+schedule in the Gantt view.
+            </p>
+        </div>
+        <div class="oe_span4">
+            <h3>Lists</h3>
+            <div class="oe_row_img oe_centered">
+            <img class="oe_picture oe_screenshot" src="mrp_list.png">
+            </div>
+        </div>
+        <div class="oe_span4">
+            <h3>Gantt Charts</h3>
+            <img class="oe_picture oe_screenshot" src="mrp_gantt.png">
+            </p>
+        </div>
+        <div class="oe_span4">
+            <h3>Calendar</h3>
+            <img class="oe_picture oe_screenshot" src="mrp_calendar.png">
+        </div>
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan">Inventory &amp; Manufacturing Analytics</h2>
+        <div class="oe_span6">
+            <div class="oe_row_img oe_centered">
+                <img class="oe_picture" src="manufacturing_illu_02.png">
+            </div>
+        </div>
+        <div class="oe_span6">
+            <p class="oe_mt32">
+Track the evolution of the stock value, according to the level of manufacturing
+activities as they progress in the transformation process.
+            </p>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container oe_dark">
+    <div class="oe_row">
+        <h2 class="oe_slogan">Fully Integrated with Operations</h2>
+        <h3 class="oe_slogan">Sales, Purchases and Accounting integration</h3>
+        <div class="oe_span6">
+          <p class='oe_mt32'>
+Get your manufacturing resource planning accurate with it's full integration
+with sales and purchases apps. The accounting integration allows real time
+accounting valuation and deeper reporting on costs and revenues on your
+manufacturing operations.
+          </p>
+        </div>
+        <div class="oe_span6">
+            <div class="oe_bg_img oe_centered">
+                <img class="oe_picture" src="mrp_integrate.png">
+            </div>
+        </div>
+   </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row">
+        <div class="oe_span12">
+            <h2 class="oe_slogan">Many companies already enjoy it</h2>
+            <h3 class="oe_slogan">Hear what they have to say !</h3>
+        </div>
+        <div class="oe_span6">
+            <div class="oe_quote">
+                <q>
+					OpenERP allowed our company to efficiently manage a growth from a turnover of 2.4m€ to 15m€ in 4 years.
+                </q>
+                <cite class="oe_cite oe_clearfix">
+                    <img class="oe_photo" src="coppernic.png">
+                    <div class="oe_author">Jacky Lecuivre</div>
+                    <div class="oe_job">President at <a href="http://coppernic.fr" target="_blank">Coppernic</a>.</div>
+                </cite>
+            </div>
+        </div>
+    </div>
+</section>
+<section class="oe_container oe_separator">
+</section>
diff --git a/addons/mrp/html/manufacturing_illu_01.png b/addons/mrp/html/manufacturing_illu_01.png
new file mode 100644
index 00000000000..771223a8dd9
Binary files /dev/null and b/addons/mrp/html/manufacturing_illu_01.png differ
diff --git a/addons/mrp/html/manufacturing_illu_02.png b/addons/mrp/html/manufacturing_illu_02.png
new file mode 100644
index 00000000000..4a1910c0b73
Binary files /dev/null and b/addons/mrp/html/manufacturing_illu_02.png differ
diff --git a/addons/mrp/html/mrp_bom.png b/addons/mrp/html/mrp_bom.png
new file mode 100644
index 00000000000..29b0fd48ca9
Binary files /dev/null and b/addons/mrp/html/mrp_bom.png differ
diff --git a/addons/mrp/html/mrp_calendar.png b/addons/mrp/html/mrp_calendar.png
new file mode 100644
index 00000000000..a2d52775a0e
Binary files /dev/null and b/addons/mrp/html/mrp_calendar.png differ
diff --git a/addons/mrp/html/mrp_gantt.png b/addons/mrp/html/mrp_gantt.png
new file mode 100644
index 00000000000..05c9315d5cd
Binary files /dev/null and b/addons/mrp/html/mrp_gantt.png differ
diff --git a/addons/mrp/html/mrp_integrate.png b/addons/mrp/html/mrp_integrate.png
new file mode 100644
index 00000000000..954f54953cb
Binary files /dev/null and b/addons/mrp/html/mrp_integrate.png differ
diff --git a/addons/mrp/html/mrp_list.png b/addons/mrp/html/mrp_list.png
new file mode 100644
index 00000000000..5813c32e6b7
Binary files /dev/null and b/addons/mrp/html/mrp_list.png differ
diff --git a/addons/mrp/html/mrp_mo.png b/addons/mrp/html/mrp_mo.png
new file mode 100644
index 00000000000..6138973570f
Binary files /dev/null and b/addons/mrp/html/mrp_mo.png differ
diff --git a/addons/mrp/html/mrp_product.png b/addons/mrp/html/mrp_product.png
new file mode 100644
index 00000000000..cbfd054d72e
Binary files /dev/null and b/addons/mrp/html/mrp_product.png differ
diff --git a/addons/mrp/i18n/mn.po b/addons/mrp/i18n/mn.po
index 8d3c0aee785..53f793c1804 100644
--- a/addons/mrp/i18n/mn.po
+++ b/addons/mrp/i18n/mn.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
-"PO-Revision-Date: 2012-07-21 12:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2013-06-04 04:00+0000\n"
+"Last-Translator: erdenebold <erdenebold10@gmail.com>\n"
 "Language-Team: Mongolian <mn@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: 2013-03-16 05:01+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-06-05 05:32+0000\n"
+"X-Generator: Launchpad (build 16660)\n"
 
 #. module: mrp
 #: help:mrp.config.settings,module_mrp_repair:0
@@ -48,7 +48,7 @@ msgstr "Дамжлагуудын Ашиглалт"
 #. module: mrp
 #: view:mrp.routing.workcenter:0
 msgid "Routing Work Centers"
-msgstr "Дамжлагуудын маршрут"
+msgstr "Шугамын дамжлагууд"
 
 #. module: mrp
 #: field:mrp.production.workcenter.line,cycle:0
@@ -86,12 +86,12 @@ msgstr ""
 #: model:ir.actions.act_window,name:mrp.mrp_routing_action
 #: model:ir.ui.menu,name:mrp.menu_mrp_routing_action
 msgid "Routings"
-msgstr "Маршрут"
+msgstr "Шугам"
 
 #. module: mrp
 #: view:mrp.bom:0
 msgid "Search Bill Of Material"
-msgstr "Жор Хайх"
+msgstr "Орц Хайх"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_stockproduct1
@@ -112,8 +112,8 @@ msgid ""
 "Number of iterations this work center has to do in the specified operation "
 "of the routing."
 msgstr ""
-"Үйлдвэрлэлийн нэг маршрутын хувьд уг дамжлага өөрийн үйлдлийг давтан "
-"гүйцэтгэх давтамжын тоо."
+"Үйлдвэрлэлийн нэг шугамын хувьд уг дамжлага өөрийн үйлдлийг давтан гүйцэтгэх "
+"давтамжын тоо."
 
 #. module: mrp
 #: view:product.product:0
@@ -214,7 +214,7 @@ msgstr ""
 #: code:addons/mrp/mrp.py:633
 #, python-format
 msgid "Cannot cancel manufacturing order!"
-msgstr ""
+msgstr "Үйлдвэрийн захиалгыг цуцлах боломжгүй!"
 
 #. module: mrp
 #: field:mrp.workcenter,costs_cycle_account_id:0
@@ -337,7 +337,7 @@ msgstr "Бараа Үйлдвэрлэх"
 #. module: mrp
 #: constraint:mrp.bom:0
 msgid "Error ! You cannot create recursive BoM."
-msgstr "Алдаа ! Тойрог хамааралтай жор үүсгэж болохгүй."
+msgstr "Алдаа ! Тойрог хамааралтай орц үүсгэж болохгүй."
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_routing_workcenter
@@ -423,7 +423,7 @@ msgstr ""
 #: field:mrp.production,product_qty:0
 #: field:mrp.production.product.line,product_qty:0
 msgid "Product Quantity"
-msgstr ""
+msgstr "Барааны тоо"
 
 #. module: mrp
 #: help:mrp.production,picking_id:0
@@ -491,13 +491,13 @@ msgstr "Товлогдсон огноо"
 #: code:addons/mrp/procurement.py:124
 #, python-format
 msgid "Manufacturing Order <em>%s</em> created."
-msgstr ""
+msgstr "Үйлдвэрлэлийн захиалга <em>%s</em> үүсгэгдлээ."
 
 #. module: mrp
 #: view:mrp.bom:0
 #: report:mrp.production.order:0
 msgid "Bill Of Material"
-msgstr "Жор"
+msgstr "Орц"
 
 #. module: mrp
 #: help:mrp.routing,location_id:0
@@ -518,7 +518,7 @@ msgstr "Нөөцийн Үнийн Хазайлт"
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.action2
 msgid "Bill of Materials Structure"
-msgstr "Жорын Бүтэц"
+msgstr "Орцын Бүтэц"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_serviceproduct0
@@ -560,7 +560,7 @@ msgstr ""
 msgid ""
 "The Bill of Material is linked to a routing, i.e. the succession of work "
 "centers."
-msgstr "Жор нь маршруттай холбогдсон, ө.х. дамжлагуудын цуваанууд"
+msgstr "Орц нь шугамтай холбогдсон, ө.х. дамжлагуудын цуваанууд"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -592,7 +592,7 @@ msgstr "Нөөцийн үнэ"
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.action_product_bom_structure
 msgid "Product BoM Structure"
-msgstr "Барааны Жорын Бүтэц"
+msgstr "Барааны Орцын Бүтэц"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -603,12 +603,12 @@ msgstr "Үйлдвэрлэл Хайх"
 #: help:mrp.routing.workcenter,sequence:0
 msgid ""
 "Gives the sequence order when displaying a list of routing Work Centers."
-msgstr "Маршруутын дамжлагуудыг жагсаалтаар харуулах дэс дарааллыг өгнө."
+msgstr "Шугамын дамжлагуудыг жагсаалтаар харуулах дэс дарааллыг өгнө."
 
 #. module: mrp
 #: field:mrp.bom,child_complete_ids:0
 msgid "BoM Hierarchy"
-msgstr "Жорын удамшил"
+msgstr "Орцын удамшил"
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_stockproduction0
@@ -637,7 +637,7 @@ msgstr "Бэлтгэлтийн Сондгойрол"
 #. module: mrp
 #: field:mrp.bom,bom_lines:0
 msgid "BoM Lines"
-msgstr "Жорын мөрүүд"
+msgstr "Орцын мөрүүд"
 
 #. module: mrp
 #: field:mrp.workcenter,time_start:0
@@ -650,13 +650,13 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the routing "
 "without removing it."
 msgstr ""
-"Идэвхтэй талбар нь худал буюу тэмдэглэгдээгүй байвал машрутыг устгалгүйгээр "
+"Идэвхтэй талбар нь худал буюу тэмдэглэгдээгүй байвал шугамыг устгалгүйгээр "
 "нуудаг."
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_billofmaterialrouting0
 msgid "Material Routing"
-msgstr "Материалын Машрут"
+msgstr "Материалын Шугам"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -676,13 +676,13 @@ msgstr "Дамжлагын Ачаалал"
 #: code:addons/mrp/procurement.py:50
 #, python-format
 msgid "No BoM defined for this product !"
-msgstr "Энэ бараанд жор тодорхойлогдоогүй байна !"
+msgstr "Энэ бараанд орц тодорхойлогдоогүй байна !"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_bom_form_action2
 #: model:ir.ui.menu,name:mrp.menu_mrp_bom_form_action2
 msgid "Bill of Material Components"
-msgstr "Жорын бүрдэлүүд"
+msgstr "Орцын бүрдэлүүд"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_stock_move
@@ -708,7 +708,7 @@ msgid ""
 "operations and to plan future loads on work centers based on production "
 "plannification."
 msgstr ""
-"Эцсийн барааг үйлдвэрлэх үйлдлүүд (дамжлагууд)-н жагсаалт. Машрут гэдэг нь "
+"Эцсийн барааг үйлдвэрлэх үйлдлүүд (дамжлагууд)-н жагсаалт. Шугам гэдэг нь "
 "үндсэндээ дамжлагуудын өртөгийг тооцоолох болон ажлын ачааллыг тооцоолоход "
 "үйлдвэрлэлийн төлөвлөгөөн дээр суурилан бодоход хэрэглэгддэг."
 
@@ -734,7 +734,7 @@ msgstr ""
 #. module: mrp
 #: constraint:mrp.bom:0
 msgid "BoM line product should not be same as BoM product."
-msgstr "Жорын мөр нь жорын бараатайгаа ижил байж болохгүй."
+msgstr "Орцын мөр нь орцын бараатайгаа ижил байж болохгүй."
 
 #. module: mrp
 #: view:mrp.production:0
@@ -744,7 +744,7 @@ msgstr "Үйлдвэрлэгдэж буй"
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_mrp_property
 msgid "Master Bill of Materials"
-msgstr "Мастер жор"
+msgstr "Мастер орц"
 
 #. module: mrp
 #: help:mrp.config.settings,module_product_manufacturer:0
@@ -907,7 +907,7 @@ msgid ""
 "All product quantities must be greater than 0.\n"
 "You should install the mrp_byproduct module if you want to manage extra "
 "products on BoMs !"
-msgstr ""
+msgstr "Бүх бүтээгдэхүүнийг тоог 0-оос эхэлж үүсгэнэ."
 
 #. module: mrp
 #: view:mrp.production:0
@@ -954,7 +954,7 @@ msgstr ""
 #. module: mrp
 #: field:mrp.bom,type:0
 msgid "BoM Type"
-msgstr "Жорын төрөл"
+msgstr "Орцын төрөл"
 
 #. module: mrp
 #: code:addons/mrp/procurement.py:52
@@ -962,7 +962,7 @@ msgstr "Жорын төрөл"
 msgid ""
 "Procurement '%s' has an exception: 'No BoM defined for this product !'"
 msgstr ""
-"'%s' татан авалтад сондгойрол байна: 'Бараанд жор тодорхойлогдоогүй !'"
+"'%s' татан авалтад сондгойрол байна: 'Бараанд орц тодорхойлогдоогүй !'"
 
 #. module: mrp
 #: view:mrp.property:0
@@ -1077,7 +1077,7 @@ msgstr "Нөөцлүүлэх"
 #. module: mrp
 #: report:bom.structure:0
 msgid "BOM Name"
-msgstr "Жорын нэр"
+msgstr "Орцын нэр"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.act_product_manufacturing_open
@@ -1167,7 +1167,7 @@ msgstr "Хийгдэж байгаа үйлдвэрлэлийн захиалгу
 #. module: mrp
 #: model:ir.actions.client,name:mrp.action_client_mrp_menu
 msgid "Open MRP Menu"
-msgstr ""
+msgstr "Нээлттэй MRP цэс"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action4
@@ -1194,7 +1194,7 @@ msgstr "Циклийн Өртөг"
 #: code:addons/mrp/wizard/change_production_qty.py:88
 #, python-format
 msgid "Cannot find bill of material for this product."
-msgstr ""
+msgstr "Энэ бараа материалаар хайх боломжгүй."
 
 #. module: mrp
 #: selection:mrp.workcenter.load,measure_unit:0
@@ -1216,8 +1216,7 @@ msgstr "Нөөцүүд"
 msgid ""
 "Time in hours for this Work Center to achieve the operation of the specified "
 "routing."
-msgstr ""
-"Заагдсан маршрутын үйлдлийг гүйцэтгэхэд энэ дамжлагын хугацаа цагаар."
+msgstr "Заагдсан шугамын үйлдлийг гүйцэтгэхэд энэ дамжлагын хугацаа цагаар."
 
 #. module: mrp
 #: field:mrp.workcenter,costs_journal_id:0
@@ -1272,7 +1271,7 @@ msgstr "Үйлдвэрлэлийг эхлүүлэхэд бэлэн Үйлдвэ
 #: field:mrp.production,bom_id:0
 #: model:process.node,name:mrp.process_node_billofmaterial0
 msgid "Bill of Material"
-msgstr "Жор"
+msgstr "Орц"
 
 #. module: mrp
 #: view:mrp.workcenter.load:0
@@ -1304,9 +1303,9 @@ msgid ""
 "Routing is indicated then,the third tab of a production order (Work Centers) "
 "will be automatically pre-completed."
 msgstr ""
-"Маршрут нь дамжлагууд ямар хугацаагаар хэдэн циклээр ашиглагдахыг "
-"илэрхийлдэг. Хэрэв маршрут байгаа бол гурав дахь үйлдвэрлэлийн дарааллын "
-"хавтас автоматаар бөглөгддөг."
+"Шугам нь дамжлагууд ямар хугацаагаар хэдэн циклээр ашиглагдахыг илэрхийлдэг. "
+"Хэрэв шугам байгаа бол гурав дахь үйлдвэрлэлийн дарааллын хавтас автоматаар "
+"бөглөгддөг."
 
 #. module: mrp
 #: code:addons/mrp/mrp.py:505
@@ -1431,7 +1430,7 @@ msgstr "Үйлдвэрлэлийн дамжлагыг хайх"
 #. module: mrp
 #: view:mrp.bom:0
 msgid "BoM Structure"
-msgstr "Жорын бүтэц"
+msgstr "Орцын бүтэц"
 
 #. module: mrp
 #: field:mrp.production,date_start:0
@@ -1541,7 +1540,7 @@ msgstr "БЗ Дугаар"
 #: code:addons/mrp/mrp.py:505
 #, python-format
 msgid "Cannot delete a manufacturing order in state '%s'."
-msgstr ""
+msgstr "Үйлдвэрлэлийн захиалгын '%s' төлөвт устгах боломжгүй."
 
 #. module: mrp
 #: selection:mrp.production,state:0
@@ -1689,7 +1688,7 @@ msgstr "Нөөц"
 #: help:mrp.bom,date_stop:0
 msgid "Validity of this BoM or component. Keep empty if it's always valid."
 msgstr ""
-"Энэ жор эсвэл бүрэлдхүүний зөв эсэхийн шалгалт. Хэрэв байнга зөв бол хоосон "
+"Орц эсвэл бүрэлдэхүүний зөв эсэхийн шалгалт. Хэрэв байнга зөв бол хоосон "
 "үлдээнэ."
 
 #. module: mrp
@@ -1710,7 +1709,7 @@ msgid ""
 "operations and to plan future loads on work centers based on production "
 "planning."
 msgstr ""
-"Барааг үйлдвэрлэх үйлдлийн жагсаалт (дамжлагын жагсаалт). Машрут нь  "
+"Барааг үйлдвэрлэх үйлдлийн жагсаалт (дамжлагын жагсаалт). Шугам нь  "
 "үйлдвэрлэлийн захиалга дээр үндэслэн дамжлагуудын өртөгийг тооцох, ажлын "
 "ирээдүйн ачааллыг тооцоолох зэрэгт голчлон хэрэглэгддэг."
 
@@ -1816,8 +1815,8 @@ msgid ""
 "are products themselves) can also have their own Bill of Material (multi-"
 "level)."
 msgstr ""
-"Жор гэдэг нь барааны задаргаа юм. Бүрэлдхүүнүүд (мөн бараанууд) нь мөн "
-"өөрийн жортой буюу олон түвшний жор байж болно."
+"Орц гэдэг нь барааны задаргаа юм. Бүрэлдэхүүнүүд (мөн бараанууд) нь мөн "
+"өөрийн орцтой буюу олон түвшний орц байж болно."
 
 #. module: mrp
 #: field:mrp.bom,company_id:0
@@ -1882,7 +1881,7 @@ msgstr "Бүрэлдэхүүнүүд"
 #: report:bom.structure:0
 #: model:ir.actions.report.xml,name:mrp.report_bom_structure
 msgid "BOM Structure"
-msgstr "Жорын бүтэц"
+msgstr "Орцын бүтэц"
 
 #. module: mrp
 #: field:mrp.config.settings,module_mrp_jit:0
@@ -1902,7 +1901,7 @@ msgstr "Хүчинтэй байх эхлэл"
 #. module: mrp
 #: selection:mrp.bom,type:0
 msgid "Normal BoM"
-msgstr "Хэвийн жор"
+msgstr "Хэвийн орц"
 
 #. module: mrp
 #: field:res.company,manufacturing_lead:0
@@ -1958,7 +1957,7 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the bills of "
 "material without removing it."
 msgstr ""
-"Идэвхтэй талбар худал буюу тэмдэглэгдээгүй бол жорыг устгалгүйгээр нууна."
+"Идэвхтэй талбар худал буюу тэмдэглэгдээгүй бол орцыг устгалгүйгээр нууна."
 
 #. module: mrp
 #: field:mrp.bom,product_rounding:0
@@ -2083,7 +2082,7 @@ msgstr ""
 #. module: mrp
 #: field:procurement.order,bom_id:0
 msgid "BoM"
-msgstr "Жор"
+msgstr "Орц"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
@@ -2145,12 +2144,12 @@ msgstr "Хангах болон Үйлдвэрлэх"
 #. module: mrp
 #: field:mrp.bom,bom_id:0
 msgid "Parent BoM"
-msgstr "Эцэг жор"
+msgstr "Эцэг орц"
 
 #. module: mrp
 #: report:bom.structure:0
 msgid "BOM Ref"
-msgstr "Жорын код"
+msgstr "Орцын код"
 
 #. module: mrp
 #: code:addons/mrp/mrp.py:765
@@ -2190,7 +2189,7 @@ msgstr "Тоо хэмжээг сонго"
 #: view:product.product:0
 #: field:product.product,bom_ids:0
 msgid "Bill of Materials"
-msgstr "Жорууд"
+msgstr "Орцууд"
 
 #. module: mrp
 #: code:addons/mrp/mrp.py:610
@@ -2322,7 +2321,7 @@ msgstr ""
 msgid ""
 "a manufacturing\n"
 "                        order"
-msgstr ""
+msgstr "үйлдвэрлэл"
 
 #. module: mrp
 #: field:mrp.config.settings,group_mrp_properties:0
@@ -2344,7 +2343,7 @@ msgstr "Үзүүлэлтийн бүлэгүүд"
 #: view:mrp.routing:0
 #: model:process.node,name:mrp.process_node_routing0
 msgid "Routing"
-msgstr "Маршрут"
+msgstr "Шугам"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_procurestockableproduct0
@@ -2390,8 +2389,8 @@ msgid ""
 "the BOM, through a run of the schedulers (MRP)."
 msgstr ""
 "Түүхий эдийг хангахын тулд (худалдан авах эсвэл үйлдвэрлэх) үйлдвэрлэлийн "
-"захиалга нь жорд тодорхойлогдсон бүрдлүүдээр татан авах захиалга үүсгэдэг ба "
-"энэ нь товлогчийг ажиллахад үүсдэг."
+"захиалга нь орцонд тодорхойлогдсон бүрдлүүдээр татан авах захиалга үүсгэдэг "
+"ба энэ нь товлогчийг ажиллахад үүсдэг."
 
 #. module: mrp
 #: help:mrp.product_price,number:0
@@ -2423,7 +2422,7 @@ msgstr "Нөөцийн Амралт, Чөлөө"
 #. module: mrp
 #: help:mrp.bom,sequence:0
 msgid "Gives the sequence order when displaying a list of bills of material."
-msgstr "Жорын жагсаалтыг харуулах дэс дарааллыг өгдөг."
+msgstr "Орцын жагсаалтыг харуулах дэс дарааллыг өгдөг."
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_config_settings
diff --git a/addons/mrp/i18n/ru.po b/addons/mrp/i18n/ru.po
index 5f7bf67a0e1..ef4cdb8675b 100644
--- a/addons/mrp/i18n/ru.po
+++ b/addons/mrp/i18n/ru.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
-"PO-Revision-Date: 2012-09-14 07:17+0000\n"
-"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
+"PO-Revision-Date: 2013-05-27 12:24+0000\n"
+"Last-Translator: Pavel <Unknown>\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: 2013-03-16 05:01+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-05-28 05:16+0000\n"
+"X-Generator: Launchpad (build 16640)\n"
 
 #. module: mrp
 #: help:mrp.config.settings,module_mrp_repair:0
@@ -131,7 +131,7 @@ msgstr "Конечный продукт"
 #. module: mrp
 #: view:mrp.production:0
 msgid "Manufacturing Orders which are currently in production."
-msgstr ""
+msgstr "Производственные заказы, которые в настоящее время в изготовлении."
 
 #. module: mrp
 #: help:mrp.bom,message_summary:0
@@ -156,7 +156,7 @@ msgstr ""
 #. module: mrp
 #: view:mrp.production:0
 msgid "Products to Finish"
-msgstr ""
+msgstr "Конечная продукция"
 
 #. module: mrp
 #: selection:mrp.bom,method:0
@@ -195,7 +195,7 @@ msgstr "Для приобретенного материала"
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
 msgid "Order Planning"
-msgstr ""
+msgstr "Планирование заказов"
 
 #. module: mrp
 #: field:mrp.config.settings,module_mrp_operations:0
@@ -206,7 +206,7 @@ msgstr ""
 #: code:addons/mrp/mrp.py:633
 #, python-format
 msgid "Cannot cancel manufacturing order!"
-msgstr ""
+msgstr "Нельзя отменить производственый заказ!"
 
 #. module: mrp
 #: field:mrp.workcenter,costs_cycle_account_id:0
@@ -253,7 +253,7 @@ msgstr ""
 #: view:mrp.production:0
 #: field:mrp.production,move_created_ids2:0
 msgid "Produced Products"
-msgstr ""
+msgstr "Производимая продукция"
 
 #. module: mrp
 #: report:mrp.production.order:0
@@ -268,7 +268,7 @@ msgstr "Основные данные"
 #. module: mrp
 #: field:mrp.config.settings,module_mrp_byproduct:0
 msgid "Produce several products from one manufacturing order"
-msgstr ""
+msgstr "Изготовить несколько продуктов по одному производственному заказу"
 
 #. module: mrp
 #: help:mrp.config.settings,group_mrp_properties:0
@@ -329,7 +329,7 @@ msgstr "Производимый продукт"
 #. module: mrp
 #: constraint:mrp.bom:0
 msgid "Error ! You cannot create recursive BoM."
-msgstr ""
+msgstr "Ошибка! Вы не можете создавать рекурсивную спецификацию."
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_routing_workcenter
@@ -381,6 +381,8 @@ msgid ""
 "Fill this product to easily track your production costs in the analytic "
 "accounting."
 msgstr ""
+"Заполнив этот продукт легко отслеживать ваши производственные издержки в "
+"аналитическом учете."
 
 #. module: mrp
 #: field:mrp.workcenter,product_id:0
diff --git a/addons/mrp/process/procurement_process.xml b/addons/mrp/process/procurement_process.xml
index b827a2731c9..dd52268e2d1 100644
--- a/addons/mrp/process/procurement_process.xml
+++ b/addons/mrp/process/procurement_process.xml
@@ -131,96 +131,96 @@
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Make to Order&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;If the service has a 'Produce' supply method, this creates a task in the project management module of OpenERP.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="procurement.process_node_serviceonorder0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_serviceproduct1"/>
+            <field name="target_node_id" ref="procurement.process_node_serviceonorder0"/>
+            <field name="source_node_id" ref="process_node_serviceproduct1"/>
         </record>
 
         <record id="process_transition_servicemts0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Make to Stock&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;This is used in case of a service without any impact in the system, a training session for instance.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="mrp.process_node_servicemts0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_serviceproduct1"/>
+            <field name="target_node_id" ref="mrp.process_node_servicemts0"/>
+            <field name="source_node_id" ref="process_node_serviceproduct1"/>
         </record>
 
         <record id="process_transition_stockmts0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Make to Stock&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;The system waits for the products to be available in the stock. These products are typically procured manually or through a minimum stock rule.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="mrp.process_node_mts0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_stockproduct1"/>
+            <field name="target_node_id" ref="mrp.process_node_mts0"/>
+            <field name="source_node_id" ref="process_node_stockproduct1"/>
         </record>
 
         <record id="process_transition_stockproduct0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Make to Order&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;The system creates an order (production or purchased) depending on the sold quantity and the products parameters.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="mrp.process_node_stock0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_stockproduct1"/>
+            <field name="target_node_id" ref="mrp.process_node_stock0"/>
+            <field name="source_node_id" ref="process_node_stockproduct1"/>
         </record>
 
         <record id="process_transition_productionprocureproducts0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Procurement of raw material&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;In order to supply raw material (to be purchased or produced), the production order creates as much procurement orders as components listed in the BOM, through a run of the schedulers (MRP).&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_procureproducts0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_productionorder0"/>
+            <field name="target_node_id" ref="process_node_procureproducts0"/>
+            <field name="source_node_id" ref="process_node_productionorder0"/>
         </record>
 
         <record id="process_transition_minimumstockprocure0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;'Minimum stock rule' material&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;The 'Minimum stock rule' allows the system to create procurement orders automatically as soon as the minimum stock is reached.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_procureproducts0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_minimumstockrule0"/>
+            <field name="target_node_id" ref="process_node_procureproducts0"/>
+            <field name="source_node_id" ref="process_node_minimumstockrule0"/>
         </record>
 
         <record id="process_transition_procurestockableproduct0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Procurement of stockable Products&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Depending on the chosen method to supply the stockable products, the procurement order creates a RFQ, a production order, ... &quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_stockproduct0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_procureproducts0"/>
+            <field name="target_node_id" ref="process_node_stockproduct0"/>
+            <field name="source_node_id" ref="process_node_procureproducts0"/>
         </record>
 
         <record id="process_transition_procureserviceproduct0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Procurement of services&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Depending on the chosen method to 'supply' the service, the procurement order creates a RFQ for a subcontracting purchase order or waits until the service is done (= the delivery of the products).&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_serviceproduct0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_procureproducts0"/>
+            <field name="target_node_id" ref="process_node_serviceproduct0"/>
+            <field name="source_node_id" ref="process_node_procureproducts0"/>
         </record>
 
         <record id="process_transition_purchaseprocure0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Automatic RFQ&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;The system launches automatically a RFQ to the preferred supplier.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="purchase.process_node_draftpurchaseorder0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_purchaseprocure0"/>
+            <field name="target_node_id" ref="purchase.process_node_draftpurchaseorder0"/>
+            <field name="source_node_id" ref="process_node_purchaseprocure0"/>
         </record>
 
          <record id="process_transition_producttostockrules0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Procurement rule&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;The Minimum Stock Rule is an automatic procurement rule based on a mini and maxi quantity. It's available in the Inventory management menu and configured by product.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_productminimumstockrule0"/>
-            <field model="process.node" name="source_node_id" ref="product.process_node_product0"/>
+            <field name="target_node_id" ref="process_node_productminimumstockrule0"/>
+            <field name="source_node_id" ref="product.process_node_product0"/>
         </record>
 
         <record id="process_transition_billofmaterialrouting0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Material Routing&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;The Bill of Material is linked to a routing, i.e. the succession of work centers.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_routing0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_billofmaterial0"/>
+            <field name="target_node_id" ref="process_node_routing0"/>
+            <field name="source_node_id" ref="process_node_billofmaterial0"/>
         </record>
 
         <record id="process_transition_bom0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Manufacturing decomposition&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;The Bill of Material is the product's decomposition. The components (that are products themselves) can also have their own Bill of Material (multi-level).&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_billofmaterial0"/>
-            <field model="process.node" name="source_node_id" ref="product.process_node_product0"/>
+            <field name="target_node_id" ref="process_node_billofmaterial0"/>
+            <field name="source_node_id" ref="product.process_node_product0"/>
         </record>
 
     </data>
diff --git a/addons/mrp/process/service_product_process.xml b/addons/mrp/process/service_product_process.xml
index 965f3f57d69..0005be6f48c 100644
--- a/addons/mrp/process/service_product_process.xml
+++ b/addons/mrp/process/service_product_process.xml
@@ -39,9 +39,9 @@
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;To Buy&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;If the service has a 'Buy' supply method, this creates a RFQ, a subcontracting demand for instance.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_orderrfq0"/>
-            <field model="process.node" name="source_node_id" ref="procurement.process_node_serviceonorder0"/>
+            <field name="target_node_id" ref="process_node_orderrfq0"/>
+            <field name="source_node_id" ref="procurement.process_node_serviceonorder0"/>
         </record>
 
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/mrp/process/stockable_product_process.xml b/addons/mrp/process/stockable_product_process.xml
index e3fa1136822..a43a09313b8 100644
--- a/addons/mrp/process/stockable_product_process.xml
+++ b/addons/mrp/process/stockable_product_process.xml
@@ -69,16 +69,16 @@
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;To Buy&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;In case the Supply method of the product is Buy, the system creates a purchase order.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_rfq0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_stock0"/>
+            <field name="target_node_id" ref="process_node_rfq0"/>
+            <field name="source_node_id" ref="process_node_stock0"/>
         </record>
 
         <record id="process_transition_stockproduction0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;To Produce&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;In case the Supply method of the product is Produce, the system creates a production order.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_production0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_stock0"/>
+            <field name="target_node_id" ref="process_node_production0"/>
+            <field name="source_node_id" ref="process_node_stock0"/>
         </record>
 
     </data>
diff --git a/addons/mrp_operations/process/mrp_operation_process.xml b/addons/mrp_operations/process/mrp_operation_process.xml
index 452434bbe92..d448b6a299a 100644
--- a/addons/mrp_operations/process/mrp_operation_process.xml
+++ b/addons/mrp_operations/process/mrp_operation_process.xml
@@ -75,32 +75,32 @@
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Creation of the work order&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;The work orders are created on the basis of the production order.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_startoperation0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_productionorder0"/>
+            <field name="target_node_id" ref="process_node_startoperation0"/>
+            <field name="source_node_id" ref="process_node_productionorder0"/>
         </record>
 
         <record id="process_transition_workstartoperation0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Details of the work order&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;There is 1 work order per work center. The information about the number of cycles or the cycle time.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_startoperation0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_workorder0"/>
+            <field name="target_node_id" ref="process_node_startoperation0"/>
+            <field name="source_node_id" ref="process_node_workorder0"/>
         </record>
 
         <record id="process_transition_startdoneoperation0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Operation done&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;When the operation is finished, the operator updates the system by finishing the work order.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_doneoperation0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_startoperation0"/>
+            <field name="target_node_id" ref="process_node_doneoperation0"/>
+            <field name="source_node_id" ref="process_node_startoperation0"/>
         </record>
 
         <record id="process_transition_startcanceloperation0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Operation cancelled&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;When the operation needs to be cancelled, you can do it in the work order form.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_canceloperation0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_startoperation0"/>
+            <field name="target_node_id" ref="process_node_canceloperation0"/>
+            <field name="source_node_id" ref="process_node_startoperation0"/>
         </record>
 
     </data>
diff --git a/addons/mrp_repair/security/mrp_repair_security.xml b/addons/mrp_repair/security/mrp_repair_security.xml
index 0b34310fc4e..e94b675b57f 100644
--- a/addons/mrp_repair/security/mrp_repair_security.xml
+++ b/addons/mrp_repair/security/mrp_repair_security.xml
@@ -11,4 +11,4 @@
     </record>
 
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/multi_company/multi_company_demo.xml b/addons/multi_company/multi_company_demo.xml
index 088aa35e915..c772a8fd67d 100644
--- a/addons/multi_company/multi_company_demo.xml
+++ b/addons/multi_company/multi_company_demo.xml
@@ -192,8 +192,8 @@
             <field name="code">SAJ-OpenERP IN</field>
             <field name="type">sale</field>
             <field name="sequence_id" ref="account.sequence_sale_journal"/>
-            <field model="account.account" name="default_credit_account_id" ref="account.a_sale"/>
-            <field model="account.account" name="default_debit_account_id" ref="account.a_sale"/>
+            <field name="default_credit_account_id" ref="account.a_sale"/>
+            <field name="default_debit_account_id" ref="account.a_sale"/>
             <field name="analytic_journal_id" ref="account.cose_journal_sale"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="company_id" ref="res_company_oerp_in"/>
@@ -204,8 +204,8 @@
             <field name="code">SCNJ-OpenERP IN</field>
             <field name="type">sale_refund</field>
             <field name="sequence_id" ref="account.sequence_refund_sales_journal"/>
-            <field model="account.account" name="default_credit_account_id" ref="account.a_sale"/>
-            <field model="account.account" name="default_debit_account_id" ref="account.a_sale"/>
+            <field name="default_credit_account_id" ref="account.a_sale"/>
+            <field name="default_debit_account_id" ref="account.a_sale"/>
             <field name="analytic_journal_id" ref="account.cose_journal_sale"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="company_id" ref="res_company_oerp_in"/>
@@ -216,8 +216,8 @@
             <field name="code">EXJ-OpenERP IN</field>
             <field name="type">purchase</field>
             <field name="sequence_id" ref="account.sequence_purchase_journal"/>
-            <field model="account.account" name="default_debit_account_id" ref="account.a_expense"/>
-            <field model="account.account" name="default_credit_account_id" ref="account.a_expense"/>
+            <field name="default_debit_account_id" ref="account.a_expense"/>
+            <field name="default_credit_account_id" ref="account.a_expense"/>
             <field name="analytic_journal_id" ref="account.exp"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="company_id" ref="res_company_oerp_in"/>
@@ -228,8 +228,8 @@
             <field name="code">ECNJ-OpenERP IN</field>
             <field name="type">purchase_refund</field>
             <field name="sequence_id" ref="account.sequence_refund_purchase_journal"/>
-            <field model="account.account" name="default_debit_account_id" ref="account.a_expense"/>
-            <field model="account.account" name="default_credit_account_id" ref="account.a_expense"/>
+            <field name="default_debit_account_id" ref="account.a_expense"/>
+            <field name="default_credit_account_id" ref="account.a_expense"/>
             <field name="analytic_journal_id" ref="account.exp"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="company_id" ref="res_company_oerp_in"/>
@@ -240,8 +240,8 @@
             <field name="code">BNK-OpenERP IN</field>
             <field name="type">bank</field>
             <field name="sequence_id" ref="account.sequence_bank_journal"/>
-            <field model="account.account" name="default_debit_account_id" ref="account.cash"/>
-            <field model="account.account" name="default_credit_account_id" ref="account.cash"/>
+            <field name="default_debit_account_id" ref="account.cash"/>
+            <field name="default_credit_account_id" ref="account.cash"/>
             <field name="analytic_journal_id" ref="account.sit"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="company_id" ref="res_company_oerp_in"/>
@@ -252,8 +252,8 @@
             <field name="code">CHK-OpenERP IN</field>
             <field name="type">bank</field>
             <field name="sequence_id" ref="account.sequence_check_journal"/>
-            <field model="account.account" name="default_debit_account_id" ref="account.cash"/>
-            <field model="account.account" name="default_credit_account_id" ref="account.cash"/>
+            <field name="default_debit_account_id" ref="account.cash"/>
+            <field name="default_credit_account_id" ref="account.cash"/>
             <field name="analytic_journal_id" ref="account.sit"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="company_id" ref="res_company_oerp_in"/>
@@ -264,8 +264,8 @@
             <field name="code">CSH-OpenERP IN</field>
             <field name="type">cash</field>
             <field name="sequence_id" ref="account.sequence_cash_journal"/>
-            <field model="account.account" name="default_debit_account_id" ref="account.cash"/>
-            <field model="account.account" name="default_credit_account_id" ref="account.cash"/>
+            <field name="default_debit_account_id" ref="account.cash"/>
+            <field name="default_credit_account_id" ref="account.cash"/>
             <field name="analytic_journal_id" ref="account.sit"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="company_id" ref="res_company_oerp_in"/>
@@ -277,8 +277,8 @@
             <field name="code">SAJ-OpenERP US</field>
             <field name="type">sale</field>
             <field name="sequence_id" ref="account.sequence_sale_journal"/>
-            <field model="account.account" name="default_credit_account_id" ref="account.a_sale"/>
-            <field model="account.account" name="default_debit_account_id" ref="account.a_sale"/>
+            <field name="default_credit_account_id" ref="account.a_sale"/>
+            <field name="default_debit_account_id" ref="account.a_sale"/>
             <field name="analytic_journal_id" ref="account.cose_journal_sale"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="company_id" ref="res_company_oerp_us"/>
@@ -289,8 +289,8 @@
             <field name="code">SCNJ-OpenERP US</field>
             <field name="type">sale_refund</field>
             <field name="sequence_id" ref="account.sequence_refund_sales_journal"/>
-            <field model="account.account" name="default_credit_account_id" ref="account.a_sale"/>
-            <field model="account.account" name="default_debit_account_id" ref="account.a_sale"/>
+            <field name="default_credit_account_id" ref="account.a_sale"/>
+            <field name="default_debit_account_id" ref="account.a_sale"/>
             <field name="analytic_journal_id" ref="account.cose_journal_sale"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="company_id" ref="res_company_oerp_us"/>
@@ -301,8 +301,8 @@
             <field name="code">EXJ-OpenERP US</field>
             <field name="type">purchase</field>
             <field name="sequence_id" ref="account.sequence_purchase_journal"/>
-            <field model="account.account" name="default_debit_account_id" ref="account.a_expense"/>
-            <field model="account.account" name="default_credit_account_id" ref="account.a_expense"/>
+            <field name="default_debit_account_id" ref="account.a_expense"/>
+            <field name="default_credit_account_id" ref="account.a_expense"/>
             <field name="analytic_journal_id" ref="account.exp"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="company_id" ref="res_company_oerp_us"/>
@@ -313,8 +313,8 @@
             <field name="code">ECNJ-OpenERP US</field>
             <field name="type">purchase_refund</field>
             <field name="sequence_id" ref="account.sequence_refund_purchase_journal"/>
-            <field model="account.account" name="default_debit_account_id" ref="account.a_expense"/>
-            <field model="account.account" name="default_credit_account_id" ref="account.a_expense"/>
+            <field name="default_debit_account_id" ref="account.a_expense"/>
+            <field name="default_credit_account_id" ref="account.a_expense"/>
             <field name="analytic_journal_id" ref="account.exp"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="company_id" ref="res_company_oerp_us"/>
@@ -325,8 +325,8 @@
             <field name="code">BNK-OpenERP US</field>
             <field name="type">bank</field>
             <field name="sequence_id" ref="account.sequence_bank_journal"/>
-            <field model="account.account" name="default_debit_account_id" ref="account.cash"/>
-            <field model="account.account" name="default_credit_account_id" ref="account.cash"/>
+            <field name="default_debit_account_id" ref="account.cash"/>
+            <field name="default_credit_account_id" ref="account.cash"/>
             <field name="analytic_journal_id" ref="account.sit"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="company_id" ref="res_company_oerp_us"/>
@@ -337,8 +337,8 @@
             <field name="code">CHK-OpenERP US</field>
             <field name="type">bank</field>
             <field name="sequence_id" ref="account.sequence_check_journal"/>
-            <field model="account.account" name="default_debit_account_id" ref="account.cash"/>
-            <field model="account.account" name="default_credit_account_id" ref="account.cash"/>
+            <field name="default_debit_account_id" ref="account.cash"/>
+            <field name="default_credit_account_id" ref="account.cash"/>
             <field name="analytic_journal_id" ref="account.sit"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="company_id" ref="res_company_oerp_us"/>
@@ -349,8 +349,8 @@
             <field name="code">CSH-OpenERP US</field>
             <field name="type">cash</field>
             <field name="sequence_id" ref="account.sequence_cash_journal"/>
-            <field model="account.account" name="default_debit_account_id" ref="account.cash"/>
-            <field model="account.account" name="default_credit_account_id" ref="account.cash"/>
+            <field name="default_debit_account_id" ref="account.cash"/>
+            <field name="default_credit_account_id" ref="account.cash"/>
             <field name="analytic_journal_id" ref="account.sit"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="company_id" ref="res_company_oerp_us"/>
@@ -363,8 +363,8 @@
             <field name="code">SAJ-OpenERP BE</field>
             <field name="type">sale</field>
             <field name="sequence_id" ref="account.sequence_sale_journal"/>
-            <field model="account.account" name="default_credit_account_id" ref="account.a_sale"/>
-            <field model="account.account" name="default_debit_account_id" ref="account.a_sale"/>
+            <field name="default_credit_account_id" ref="account.a_sale"/>
+            <field name="default_debit_account_id" ref="account.a_sale"/>
             <field name="analytic_journal_id" ref="account.cose_journal_sale"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="company_id" ref="res_company_oerp_be"/>
@@ -375,8 +375,8 @@
             <field name="code">SCNJ-OpenERP BE</field>
             <field name="type">sale_refund</field>
             <field name="sequence_id" ref="account.sequence_refund_sales_journal"/>
-            <field model="account.account" name="default_credit_account_id" ref="account.a_sale"/>
-            <field model="account.account" name="default_debit_account_id" ref="account.a_sale"/>
+            <field name="default_credit_account_id" ref="account.a_sale"/>
+            <field name="default_debit_account_id" ref="account.a_sale"/>
             <field name="analytic_journal_id" ref="account.cose_journal_sale"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="company_id" ref="res_company_oerp_be"/>
@@ -387,8 +387,8 @@
             <field name="code">EXJ-OpenERP BE</field>
             <field name="type">purchase</field>
             <field name="sequence_id" ref="account.sequence_purchase_journal"/>
-            <field model="account.account" name="default_debit_account_id" ref="account.a_expense"/>
-            <field model="account.account" name="default_credit_account_id" ref="account.a_expense"/>
+            <field name="default_debit_account_id" ref="account.a_expense"/>
+            <field name="default_credit_account_id" ref="account.a_expense"/>
             <field name="analytic_journal_id" ref="account.exp"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="company_id" ref="res_company_oerp_be"/>
@@ -399,8 +399,8 @@
             <field name="code">ECNJ-OpenERP BE</field>
             <field name="type">purchase_refund</field>
             <field name="sequence_id" ref="account.sequence_refund_purchase_journal"/>
-            <field model="account.account" name="default_debit_account_id" ref="account.a_expense"/>
-            <field model="account.account" name="default_credit_account_id" ref="account.a_expense"/>
+            <field name="default_debit_account_id" ref="account.a_expense"/>
+            <field name="default_credit_account_id" ref="account.a_expense"/>
             <field name="analytic_journal_id" ref="account.exp"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="company_id" ref="res_company_oerp_be"/>
@@ -411,8 +411,8 @@
             <field name="code">BNK-OpenERP BE</field>
             <field name="type">bank</field>
             <field name="sequence_id" ref="account.sequence_bank_journal"/>
-            <field model="account.account" name="default_debit_account_id" ref="account.cash"/>
-            <field model="account.account" name="default_credit_account_id" ref="account.cash"/>
+            <field name="default_debit_account_id" ref="account.cash"/>
+            <field name="default_credit_account_id" ref="account.cash"/>
             <field name="analytic_journal_id" ref="account.sit"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="company_id" ref="res_company_oerp_be"/>
@@ -423,8 +423,8 @@
             <field name="code">CHK-OpenERP BE</field>
             <field name="type">bank</field>
             <field name="sequence_id" ref="account.sequence_check_journal"/>
-            <field model="account.account" name="default_debit_account_id" ref="account.cash"/>
-            <field model="account.account" name="default_credit_account_id" ref="account.cash"/>
+            <field name="default_debit_account_id" ref="account.cash"/>
+            <field name="default_credit_account_id" ref="account.cash"/>
             <field name="analytic_journal_id" ref="account.sit"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="company_id" ref="res_company_oerp_be"/>
@@ -435,8 +435,8 @@
             <field name="code">CSH-OpenERP BE</field>
             <field name="type">cash</field>
             <field name="sequence_id" ref="account.sequence_cash_journal"/>
-            <field model="account.account" name="default_debit_account_id" ref="account.cash"/>
-            <field model="account.account" name="default_credit_account_id" ref="account.cash"/>
+            <field name="default_debit_account_id" ref="account.cash"/>
+            <field name="default_credit_account_id" ref="account.cash"/>
             <field name="analytic_journal_id" ref="account.sit"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="company_id" ref="res_company_oerp_be"/>
diff --git a/addons/note/html/index.html b/addons/note/html/index.html
new file mode 100644
index 00000000000..7ef37c646e9
--- /dev/null
+++ b/addons/note/html/index.html
@@ -0,0 +1,116 @@
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan">Notes</h2>
+        <h3 class="oe_slogan">Getting Things Done with Notes</h3>
+        <div class="oe_span6">
+            <div class="oe_demo oe_picture oe_screenshot">
+                <a href="https://www.openerp.com/saas_master/demo?lang=en_US&module=note">
+                    <img src="notes_sc_00.png">
+                </a>
+                <div class="oe_demo_footer oe_centeralign">Online Demo</div>
+            </div>
+        </div>
+        <div class="oe_span6">
+            <p class="oe_mt32">
+Organize yourself with efficient todo lists and notes. From personnal tasks to collaborative meeting minutes, increase your user's productivity by giving them the tools to prioritize their work, share their ideas and collaborate on documents.
+            </p>
+            <div class="oe_centeralign oe_websiteonly">
+                <a href="http://www.openerp.com/start" class="oe_button oe_big oe_tacky">Start your <span class="oe_emph">free</span> trial</a>
+            </div>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container oe_dark">
+    <div class="oe_row">
+        <div class="oe_span12">
+            <h2 class="oe_slogan">Personal to-do lists that works</h2>
+            <p class="oe_mt32">
+Quickly create to-dos, organize horizontally for the mid-term (today, this week, this month, ...), prioritize vertically for the short term and group by assigning colors. The kanban approach allows a simple visual organization of your to-dos.
+            </p>
+        </div>
+        <div class="oe_span12">
+            <img src="notes_illu_01.png">
+        </div>
+        <div class="oe_span4">
+            <h3>Beat Work Overload</h3>
+            <p>
+             Feel how good it is to rely on a structured way to organize your work instead of keeping everything in memory. Use notes to <a href="http://en.wikipedia.org/wiki/Getting_Things_Done">Get Things Done</a>.
+            </p>
+        </div>
+        <div class="oe_span4">
+            <h3>Prioritize Efficiently</h3>
+            <p>
+              Most people are lost in the flow of urgent daily tasks and have difficulties to work on important, long-term tasks. Notes gives you a simple way to allocate time very day to do important, but less urgent tasks.
+            </p>
+        </div>
+        <div class="oe_span4">
+            <h3>Find Motivation to Close Tasks</h3>
+            <p>
+              People used to work on tasks they like and not on important tasks. Start feeling good by checking tasks as done.
+            </p>
+        </div>
+    </div>
+</section>
+<section class="oe_container">
+    <div class="oe_row">
+        <h2 class="oe_slogan">Adapts to Your Creative Process</h2>
+        <h3 class="oe_slogan">Customize to your own workflow</h3>
+            <p>
+Everyone has their own way to organize activities. OpenERP Notes' smart kanban approach allows every user to customize their own steps to process it's to-dos and notes.
+            </p>
+            <img class="oe_picture oe_screenshot" src="notes_sc_03.png">
+        
+        <div class="oe_span4">
+          <h3>A Creative Person</h3>
+          <p>
+A creative person will organize notes based on idea's maturity level: Draft Ideas <i class="icon-angle-right"></i> Mature Ideas <i class="icon-angle-right"></i> Specified <i class="icon-angle-right"></i>To Do</p>
+        </div>
+        <div class="oe_span4">
+          <h3>A Frequent Traveler</h3>
+          <p>
+            An employee travelling a lot can organize their tasks based on the context to perform the task: U.S. Office | London's Office | To Review during Flights | At Home
+          </p>
+        </div>
+        <div class="oe_span4">
+          <h3>A Manager</h3>
+          <p>
+            A manager will organize their high number of tasks based on prioritizations: Todo Today | This Week | This Month | Later
+        </div>
+        
+    </div>
+</section>
+
+<section class="oe_container oe_dark">
+    <div class="oe_row">
+        <h2 class="oe_slogan">Personnal Notes</h2>
+        <h3 class="oe_slogan">Notes are private but can be shared</h3>
+        <div class="oe_span6">
+            <div class="oe_bg_img">
+                <img class="oe_picture oe_screenshot" src="notes_sc_01.png">
+            </div>
+        </div>
+        <div class="oe_span6">
+            <p class="oe_mt32">
+Write down your ideas in pads, keep your notes at your finger tips, attach related documents and use tags and colors to organize the information. Once your ideas are mature, you can share them to others users, start discussing it and collaborate by improving the specification in the pad.
+          </p>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row">
+        <h2 class="oe_slogan">Collaborative Meeting Minutes</h2>
+        <h3 class="oe_slogan">Real-time sharing and edition of notes</h3>
+        <div class="oe_span6">
+           <p class="oe_mt32">
+The real time collaborative writings on notes makes it the perfect tool to collaborate on meeting minutes. Attendees will be able to contribute to the minutes, attach important documents or discuss on the related thread.
+          </p>
+        </div>
+        <div class="oe_span6">
+            <img class="oe_picture oe_screenshot" src="notes_sc_02.png">
+        </div>
+    </div>
+</section>
+<section class="oe_container oe_separator">
+</section>
diff --git a/addons/note/html/notes_illu_01.png b/addons/note/html/notes_illu_01.png
new file mode 100644
index 00000000000..a7d4197561d
Binary files /dev/null and b/addons/note/html/notes_illu_01.png differ
diff --git a/addons/note/html/notes_sc_00.png b/addons/note/html/notes_sc_00.png
new file mode 100644
index 00000000000..7bb4f95a640
Binary files /dev/null and b/addons/note/html/notes_sc_00.png differ
diff --git a/addons/note/html/notes_sc_01.png b/addons/note/html/notes_sc_01.png
new file mode 100644
index 00000000000..ce9367abf9b
Binary files /dev/null and b/addons/note/html/notes_sc_01.png differ
diff --git a/addons/note/html/notes_sc_02.png b/addons/note/html/notes_sc_02.png
new file mode 100644
index 00000000000..e47889b33fc
Binary files /dev/null and b/addons/note/html/notes_sc_02.png differ
diff --git a/addons/note/html/notes_sc_03.png b/addons/note/html/notes_sc_03.png
new file mode 100644
index 00000000000..6d59d7e5df8
Binary files /dev/null and b/addons/note/html/notes_sc_03.png differ
diff --git a/addons/note/note.py b/addons/note/note.py
index 2d95b15107a..eb9a6397d18 100644
--- a/addons/note/note.py
+++ b/addons/note/note.py
@@ -141,12 +141,19 @@ class note_note(osv.osv):
                 #note without user's stage
                 nb_notes_ws = self.search(cr,uid, domain+[('stage_ids', 'not in', current_stage_ids)], context=context, count=True)
                 if nb_notes_ws:
-                    result += [{ #notes for unknown stage and if stage_ids is not empty
-                        '__context': {'group_by': groupby[1:]},
-                        '__domain': domain + [('stage_ids', 'not in', current_stage_ids)],
-                        'stage_id': (0, 'Unknown'),
-                        'stage_id_count':nb_notes_ws
-                    }]
+                    # add note to the first column if it's the first stage
+                    dom_not_in = ('stage_ids', 'not in', current_stage_ids)
+                    if result and result[0]['stage_id'][0] == current_stage_ids[0]:
+                        dom_in = result[0]['__domain'].pop()
+                        result[0]['__domain'] = domain + ['|', dom_in, dom_not_in]
+                    else:
+                        # add the first stage column
+                        result = [{
+                            '__context': {'group_by': groupby[1:]},
+                            '__domain': domain + [dom_not_in],
+                            'stage_id': (current_stage_ids[0], stage_name[current_stage_ids[0]]),
+                            'stage_id_count':nb_notes_ws
+                        }] + result
 
             else: # if stage_ids is empty
 
@@ -156,7 +163,7 @@ class note_note(osv.osv):
                     result = [{ #notes for unknown stage
                         '__context': {'group_by': groupby[1:]},
                         '__domain': domain,
-                        'stage_id': (0, 'Unknown'),
+                        'stage_id': False,
                         'stage_id_count':nb_notes_ws
                     }]
                 else:
@@ -187,9 +194,12 @@ class res_users(osv.Model):
         model_id = data_obj.get_object_reference(cr, uid, 'base', 'group_user') #Employee Group
         group_id = model_id and model_id[1] or False
         if group_id in [x.id for x in user.groups_id]:
-            for note_xml_id in ['note_stage_01','note_stage_02','note_stage_03','note_stage_04']:
-                data_id = data_obj._get_id(cr, uid, 'note', note_xml_id)
+            for note_xml_id in ['note_stage_00','note_stage_01','note_stage_02','note_stage_03','note_stage_04']:
+                try:
+                    data_id = data_obj._get_id(cr, uid, 'note', note_xml_id)
+                except ValueError:
+                    continue
                 stage_id  = data_obj.browse(cr, uid, data_id, context=context).res_id
                 note_obj.copy(cr, uid, stage_id, default = { 
                                         'user_id': user_id}, context=context)
-        return user_id
\ No newline at end of file
+        return user_id
diff --git a/addons/note/note_data.xml b/addons/note/note_data.xml
index 592292788b3..376b8e9053f 100644
--- a/addons/note/note_data.xml
+++ b/addons/note/note_data.xml
@@ -2,6 +2,12 @@
 <openerp>
   <data>
 
+    <record model="note.stage" id="note_stage_00">
+      <field name="name">New</field>
+      <field name="sequence" eval="0"/>
+      <field name="user_id" eval="ref('base.user_root')"/>
+    </record>
+
     <record model="note.stage" id="note_stage_01">
       <field name="name">Today</field>
       <field name="sequence">1</field>
diff --git a/addons/note/note_view.xml b/addons/note/note_view.xml
index 49a154d10cc..f3b9e4669c7 100644
--- a/addons/note/note_view.xml
+++ b/addons/note/note_view.xml
@@ -175,7 +175,7 @@
       <field name="view_type">form</field>
       <field name="view_mode">kanban,tree,form</field>
       <field name="search_view_id" ref="view_note_note_filter"/>
-      <field name="context">{'search_default_open_true':True}</field>
+      <field name="context">{}</field>
       <field name="help" type="html">
           <p class="oe_view_nocontent_create">
             Click to add a personal note.
@@ -193,7 +193,7 @@
     </record>
 
     <menuitem name="Notes" id="menu_note_notes" parent="mail.mail_my_stuff" sequence="20" action="note.action_note_note"/>
-    <menuitem name="Categories" id="menu_notes_stage" parent="mail.mail_my_stuff" action="note.action_note_stage" sequence="21" groups="base.group_no_one"/>
+    <menuitem name="Stages" id="menu_notes_stage" parent="mail.mail_my_stuff" action="note.action_note_stage" sequence="21" groups="base.group_no_one"/>
 
   </data>
 </openerp>
diff --git a/addons/note/security/ir.rule.xml b/addons/note/security/ir.rule.xml
index b0c79561355..2c6e9f3bc7f 100644
--- a/addons/note/security/ir.rule.xml
+++ b/addons/note/security/ir.rule.xml
@@ -3,7 +3,7 @@
 <data>
   <record id="note_note_rule_global" model="ir.rule">
     <field name="name">Only followers can access a sticky notes</field>
-    <field model="ir.model" ref="model_note_note" name="model_id"/>
+    <field ref="model_note_note" name="model_id"/>
     <field name="domain_force">[('message_follower_ids','=',user.partner_id.id)]</field>
     <field eval="True" name="global"/>
     <field eval="1" name="perm_unlink"/>
@@ -14,7 +14,7 @@
 
   <record id="note_stage_rule_global" model="ir.rule">
     <field name="name">Each user have his stage name</field>
-    <field model="ir.model" ref="model_note_stage" name="model_id"/>
+    <field ref="model_note_stage" name="model_id"/>
     <field name="domain_force">['|',('user_id','=',False),('user_id','=',user.id)]</field>
     <field eval="True" name="global"/>
   </record>
diff --git a/addons/pad/py_etherpad/__init__.py b/addons/pad/py_etherpad/__init__.py
index 6af310b48aa..0db607fe16f 100644
--- a/addons/pad/py_etherpad/__init__.py
+++ b/addons/pad/py_etherpad/__init__.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 """Module to talk to EtherpadLite API."""
 
 import json
diff --git a/addons/pad/static/src/css/etherpad.css b/addons/pad/static/src/css/etherpad.css
index ad47be32b02..a0002ebe97c 100644
--- a/addons/pad/static/src/css/etherpad.css
+++ b/addons/pad/static/src/css/etherpad.css
@@ -43,7 +43,7 @@
     z-index: 1000;
 }
 
-.oe_pad.oe_configured .oe_pad_content.oe_editing{
+.oe_pad .oe_pad_content.oe_editing{
     border: solid 1px #c4c4c4;
     height:500px;
     -webkit-box-shadow: 0 5px 10px rgba(0,0,0,0.1);
@@ -53,7 +53,7 @@
             box-shadow: 0 5px 10px rgba(0,0,0,0.1);
 }
 
-.oe_pad.oe_configured.oe_pad_fullscreen .oe_pad_content {
+.oe_pad.oe_pad_fullscreen .oe_pad_content {
     height: 100%;
     border: none;
     -webkit-box-shadow: none;
@@ -63,7 +63,7 @@
             box-shadow: none;
 }
 
-.oe_pad.oe_unconfigured > p {
+.oe_pad .oe_unconfigured {
     text-align: center;
     opacity: 0.75;
 }
diff --git a/addons/pad/static/src/js/pad.js b/addons/pad/static/src/js/pad.js
index 1a2de41745b..ba5ee3a3037 100644
--- a/addons/pad/static/src/js/pad.js
+++ b/addons/pad/static/src/js/pad.js
@@ -9,6 +9,7 @@ openerp.pad = function(instance) {
             this.on("change:configured", this, this.switch_configured);
         },
         initialize_content: function() {
+            var self = this;
             this.switch_configured();
             this.$('.oe_pad_switch').click(function() {
                 self.$el.toggleClass('oe_pad_fullscreen');
diff --git a/addons/plugin/plugin_handler.py b/addons/plugin/plugin_handler.py
index c278db2f19a..fc6c874fab5 100644
--- a/addons/plugin/plugin_handler.py
+++ b/addons/plugin/plugin_handler.py
@@ -110,7 +110,7 @@ class plugin_handler(osv.osv_memory):
             model_obj.message_post(cr, uid, [res_id],
                             body=msg.get('body'),
                             subject=msg.get('subject'),
-                            type='email',
+                            type='comment' if model == 'res.partner' else 'email',
                             parent_id=msg.get('parent_id'),
                             attachments=msg.get('attachments'))
             notify = _("Mail successfully pushed")
diff --git a/addons/plugin_thunderbird/static/thunderbird_plugin/install.sh b/addons/plugin_thunderbird/static/thunderbird_plugin/install.sh
index e1103b30acf..5ca7a5a934a 100755
--- a/addons/plugin_thunderbird/static/thunderbird_plugin/install.sh
+++ b/addons/plugin_thunderbird/static/thunderbird_plugin/install.sh
@@ -1,3 +1,4 @@
+#!/bin/sh
 make clean
 make 
 cp ../openerp_plugin.xpi /home/openerp/
diff --git a/addons/point_of_sale/html/index.html b/addons/point_of_sale/html/index.html
new file mode 100644
index 00000000000..130806ddb11
--- /dev/null
+++ b/addons/point_of_sale/html/index.html
@@ -0,0 +1,244 @@
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <div class="oe_span12">
+            <h2 class="oe_slogan">A very friendly Point of Sale</h2>
+            <h3 class="oe_slogan">Set up in a minute, Sell in seconds</h3>
+        </div>
+        <div class="oe_span6">
+            <div class="oe_demo oe_picture oe_screenshot">
+                <a href="https://www.openerp.com/saas_master/demo?lang=en_US&module=point_of_sale">
+                    <img src="pos_sc_02.jpg">
+                </a>
+                <div class="oe_demo_footer oe_centeralign">Online Demo</div>
+            </div>
+        </div>
+        <div class="oe_span6">
+            <p class='oe_mt32'>
+                OpenERP's Point of Sale introduces a super clean interface with no installation required
+                that runs online and offline on modern hardwares.
+            </p>
+            <p>
+                It's full integration with the company inventory and accounting, gives you real time statistics and
+                consolidations amongst all shops without the hassle of integrating several applications.
+            </p>
+            <div class="oe_centeralign oe_websiteonly">
+                <a href="http://www.openerp.com/start" class="oe_button oe_big oe_tacky">Start your <span class="oe_emph">free</span> trial</a>
+            </div>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container oe_dark">
+    <div class="oe_row">
+        <div class="oe_span12">
+            <h2 class="oe_slogan">Work with the hardware you already have</h2>
+            <h3 class="oe_slogan">Desktops, laptops, tablets, it runs on everything</h3>
+        </div>
+        <div class="oe_span12">
+            <img class='oe_centered' src="pos_devices.png">
+        </div>
+        <div class="oe_span4">
+            <h3>In your web browser</h3>
+            <p>
+            OpenERP's POS is a web application that can run on any device that can
+            display websites with little to no setup required.
+            </p>
+        </div>
+        <div class="oe_span4">
+            <h3>Touchscreen or Keyboard ?</h3>
+            <p>
+            The Point of Sale works perfectly on any kind of touch enabled device, whether it's
+			multi-touch tablets like an iPad or keyboardless resistive touchscreen terminals.
+            </p>
+        </div>
+        <div class="oe_span4">
+            <h3>Scales and Printers</h3>
+            <p>
+            Barcode scanners and printers are supported out of the box with no setup required.
+            Scales, cashboxes, and other peripherals can be used with the
+            proxy API.
+            </p>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row">
+
+        <h2 class="oe_slogan">Online and Offline</h2> 
+        <h3 class="oe_slogan">OpenERP's POS stays reliable even if your connection isn't</h3>
+
+        <div class="oe_span6">
+            <div class="oe_bg_img">
+                <img src="pos_offline.png">
+            </div>
+        </div>
+        <div class="oe_span6">
+            <p class="oe_mt32">
+                Deploy new stores with just an internet connection:
+                <b>no installation, no specific hardware required</b>. It works with any
+                <b>iPad, Tablet PC, laptop</b> or industrial POS machine.
+            </p><p>
+                While an internet connection is required to start the Point of Sale, 
+                it will stay operational even after a complete disconnection.
+            </p>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container oe_centeralign oe_padded oe_mb32">
+    <div class='oe_cover'>
+        <img src="http://www.openerp.com/ebooks/manufacturing.png">
+    </div>
+    <a href="http://www.openerp.com/ebooks/manufacturing" target="_blank" class="oe_button oe_big">Download our free E-book</a>
+</section>
+
+<section class="oe_container oe_dark">
+    <div class="oe_row">
+        <h2 class='oe_slogan'>A super clean user interface</h2>
+        <h3 class='oe_slogan'>The point of sale software retailers love to use</h3>
+    </div>
+    <div class='oe_row'>
+        <div class='oe_span4'>
+            <img class="oe_picture oe_screenshot" src="pos_ui_03.png">
+            <h3>Simple and beautifull</h3>
+            <p>
+                Say goodbye to ugly, outdated POS software and enjoy the OpenERP
+                web interface designed for modern retailer.
+            </p>
+        </div>
+        <div class='oe_span4 '>
+            <img class="oe_picture oe_screenshot" src="pos_ui_01.png">
+            <h3>Designed for Productivity</h3>
+            <p>
+            Whether it's for a restaurant or a shop, you can activate the multiple
+            tickets in parallel to not make your customers wait.
+            </p>
+        </div>
+        <div class='oe_span4 '>
+            <img class="oe_picture oe_screenshot" src="pos_ui_02.png">
+            <h3>Blasting fast search</h3>
+            <p>
+            Scan products, browse through hyerarchical categories, or get quick
+            information about products with the blasting fast filter accross
+            all your products.
+            </p>
+        </div>
+    </div>
+</section>
+
+<section class='oe_container'>
+    <div class='oe_row'>
+        <h2 class="oe_slogan">Integrated Inventory Management</h2>
+        <div class='oe_span6'>
+            <img class="oe_picture oe_screenshot" src="pos_product_form.png">
+        </div>
+        <div class='oe_span6'>
+            <p>
+            Consolidate all your sales channel in real time: stores, ecommerce, sales teams.
+            Get real time control of the inventory and accurate forecasts to manage procurements.
+            </p>
+            <p>
+			A full warehouse management system at your fingertips: get information
+			about products availabilities, trigger procurement requests, etc.
+            </p>
+        </div>
+    </div>
+</section>
+
+<section class='oe_container oe_dark'>
+    <div class='oe_row'>
+		<h2 class='oe_slogan'>Deliver in-store customer services</h2>
+		<h3 class='oe_slogan'>Repairs, warantees, deliveries, etc.</h3>
+        <div class='oe_span6'>
+            <p>
+			Give your shopper a strong experience by integrating in-store
+			customer services. Handle reparations, track warantees, follow
+			customer claims, plan delivery orders, etc.
+            </p>
+        </div>
+        <div class='oe_span6'>
+            <img class="oe_picture oe_screenshot" src="pos_customers.png">
+        </div>
+    </div>
+</section>
+
+<section class='oe_container'>
+    <div class='oe_row'>
+        <h2 class='oe_slogan'>Invoicing &amp; Accounting Integration</h2> 
+        <div class='oe_span6'>
+            <img class="oe_picture oe_screenshot" src="pos_invoice.png">
+        </div>
+        <div class='oe_span6'>
+            <p>
+			Produce customer invoices in just a few clicks.  Control sales and
+			cash in real time and use OpenERP's powerful reporting to make
+			smarter decisions to improve your store's efficiency.
+            </p><p>
+			No more hassle of having to integrate softwares: get all your sales
+			and inventory operations automatically posted in your G/L. 
+            </p>
+        </div>
+    </div>
+</section>
+
+<section class='oe_container oe_dark'>
+    <div class='oe_row'>
+        <h2 class='oe_slogan'>Self-checkout Interface</h2>
+        <div class='oe_span6'>
+            <p>
+            Reduce costs by limitting the number of required cashiers.
+			The self-checkout mode allows customers to scan products and pay by
+			themselves with a dedicated and super easy user interface.
+            </p>
+            <p>
+            Use lights and sounds to control the checkout distantly.
+            </p>
+        </div>
+        <div class='oe_span6'>
+            <img class="oe_picture oe_screenshot" src="pos_checkout.jpg">
+        </div>
+    </div>
+</section>
+
+
+<section class='oe_container'>
+    <div class='oe_row'>
+        <h2 class='oe_slogan'>Unified Data Amongst All Shops</h2>
+        <h3 class='oe_slogan'>Sync products, prices, customers with no effort</h3>
+        <div class='oe_span6'>
+            <img class="oe_picture oe_screenshot" src="pos_products.png">
+        </div>
+        <div class='oe_span6'>
+            <p>
+            Get new products, pricing strategies and promotions applied automatically to
+            selected stores. Work on a unified customer base. No complex interface is
+            required to pilot a global strategy amongst all your stores.
+            </p>
+            <p>
+			With OpenERP as a backend, you have a system proven to be perfectly
+			suitable for small stores or large multinationals.
+            </p>
+        </div>
+    </div>
+</section>
+
+<section class='oe_container oe_dark'>
+    <div class='oe_row'>
+        <h2 class='oe_slogan'>Know your customers - in store and out</h2>
+        <div class='oe_span6'>
+            <p>
+            Successful brands integrates all their customer relationship accross all their
+            channels to develop accurate customer profile and communicate with shoppers
+            as they make buying decisions, in store or online.
+            </p>
+            <p>
+            With OpenERP, you get a 360° customer view, including cross-channel sales,
+            interaction history, profiles, and more.
+            </p>
+        </div>
+        <div class='oe_span6'>
+            <img class="oe_picture oe_screenshot" src="pos_customer_form.png">
+        </div>
+    </div>
+</section>
diff --git a/addons/point_of_sale/html/pos_checkout.jpg b/addons/point_of_sale/html/pos_checkout.jpg
new file mode 100644
index 00000000000..d87e5b8499d
Binary files /dev/null and b/addons/point_of_sale/html/pos_checkout.jpg differ
diff --git a/addons/point_of_sale/html/pos_customer_form.png b/addons/point_of_sale/html/pos_customer_form.png
new file mode 100644
index 00000000000..4e89d43c4c3
Binary files /dev/null and b/addons/point_of_sale/html/pos_customer_form.png differ
diff --git a/addons/point_of_sale/html/pos_customers.png b/addons/point_of_sale/html/pos_customers.png
new file mode 100644
index 00000000000..6448074c3d9
Binary files /dev/null and b/addons/point_of_sale/html/pos_customers.png differ
diff --git a/addons/point_of_sale/html/pos_devices.png b/addons/point_of_sale/html/pos_devices.png
new file mode 100644
index 00000000000..a021a87bfac
Binary files /dev/null and b/addons/point_of_sale/html/pos_devices.png differ
diff --git a/addons/point_of_sale/html/pos_invoice.png b/addons/point_of_sale/html/pos_invoice.png
new file mode 100644
index 00000000000..aae4f6d38a5
Binary files /dev/null and b/addons/point_of_sale/html/pos_invoice.png differ
diff --git a/addons/point_of_sale/html/pos_offline.png b/addons/point_of_sale/html/pos_offline.png
new file mode 100644
index 00000000000..764cda88e87
Binary files /dev/null and b/addons/point_of_sale/html/pos_offline.png differ
diff --git a/addons/point_of_sale/html/pos_product_form.png b/addons/point_of_sale/html/pos_product_form.png
new file mode 100644
index 00000000000..a25c85b6496
Binary files /dev/null and b/addons/point_of_sale/html/pos_product_form.png differ
diff --git a/addons/point_of_sale/html/pos_products.png b/addons/point_of_sale/html/pos_products.png
new file mode 100644
index 00000000000..cbfd054d72e
Binary files /dev/null and b/addons/point_of_sale/html/pos_products.png differ
diff --git a/addons/point_of_sale/html/pos_sc_01.jpg b/addons/point_of_sale/html/pos_sc_01.jpg
new file mode 100644
index 00000000000..8fc97e00672
Binary files /dev/null and b/addons/point_of_sale/html/pos_sc_01.jpg differ
diff --git a/addons/point_of_sale/html/pos_sc_02.jpg b/addons/point_of_sale/html/pos_sc_02.jpg
new file mode 100644
index 00000000000..d26e0504933
Binary files /dev/null and b/addons/point_of_sale/html/pos_sc_02.jpg differ
diff --git a/addons/point_of_sale/html/pos_sc_03.jpg b/addons/point_of_sale/html/pos_sc_03.jpg
new file mode 100644
index 00000000000..8eb7e312791
Binary files /dev/null and b/addons/point_of_sale/html/pos_sc_03.jpg differ
diff --git a/addons/point_of_sale/html/pos_ui_01.png b/addons/point_of_sale/html/pos_ui_01.png
new file mode 100644
index 00000000000..1725f91d6f2
Binary files /dev/null and b/addons/point_of_sale/html/pos_ui_01.png differ
diff --git a/addons/point_of_sale/html/pos_ui_02.png b/addons/point_of_sale/html/pos_ui_02.png
new file mode 100644
index 00000000000..aa0eb51c0f1
Binary files /dev/null and b/addons/point_of_sale/html/pos_ui_02.png differ
diff --git a/addons/point_of_sale/html/pos_ui_03.png b/addons/point_of_sale/html/pos_ui_03.png
new file mode 100644
index 00000000000..f25f2a49c00
Binary files /dev/null and b/addons/point_of_sale/html/pos_ui_03.png differ
diff --git a/addons/point_of_sale/res_partner.py b/addons/point_of_sale/res_partner.py
index 81a0f6083be..d7969b0e21a 100644
--- a/addons/point_of_sale/res_partner.py
+++ b/addons/point_of_sale/res_partner.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 
 import math
 
diff --git a/addons/point_of_sale/res_users.py b/addons/point_of_sale/res_users.py
index 05e49a5545d..ed2c6fae598 100644
--- a/addons/point_of_sale/res_users.py
+++ b/addons/point_of_sale/res_users.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 
 import math
 
diff --git a/addons/point_of_sale/static/lib/mousewheel/jquery.mousewheel-3.0.6.js b/addons/point_of_sale/static/lib/mousewheel/jquery.mousewheel-3.0.6.js
old mode 100755
new mode 100644
diff --git a/addons/point_of_sale/static/src/js/db.js b/addons/point_of_sale/static/src/js/db.js
index a79b111b5c5..e47ce66f648 100644
--- a/addons/point_of_sale/static/src/js/db.js
+++ b/addons/point_of_sale/static/src/js/db.js
@@ -204,8 +204,8 @@ function openerp_pos_db(instance, module){
                     this.packagings_by_product_id[pack.product_id[0]] = [];
                 }
                 this.packagings_by_product_id[pack.product_id[0]].push(pack);
-                if(pack.ean13){
-                    this.packagings_by_ean13[pack.ean13] = pack;
+                if(pack.ean){
+                    this.packagings_by_ean13[pack.ean] = pack;
                 }
             }
         },
diff --git a/addons/point_of_sale/static/src/js/models.js b/addons/point_of_sale/static/src/js/models.js
index 98ba49c8856..13003bcf19f 100644
--- a/addons/point_of_sale/static/src/js/models.js
+++ b/addons/point_of_sale/static/src/js/models.js
@@ -323,7 +323,7 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
 
     module.Product = Backbone.Model.extend({
         get_image_url: function(){
-            return instance.session.url('/web/binary/image', {model: 'product.product', field: 'image', id: this.get('id')});
+            return instance.session.url('/web/binary/image', {model: 'product.product', field: 'image_medium', id: this.get('id')});
         },
     });
 
diff --git a/addons/point_of_sale/static/src/js/widgets.js b/addons/point_of_sale/static/src/js/widgets.js
index cec48dbe72f..a533f0a8ee6 100644
--- a/addons/point_of_sale/static/src/js/widgets.js
+++ b/addons/point_of_sale/static/src/js/widgets.js
@@ -319,6 +319,14 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
                 this.payment_line.set_amount(amount);
             }
         },
+        checkAmount: function(e){
+            if (e.which !== 0 && e.charCode !== 0) {
+                if(isNaN(String.fromCharCode(e.charCode))){
+                    return (String.fromCharCode(e.charCode) === "." && e.currentTarget.value.toString().split(".").length < 2)?true:false;
+                }
+            }
+            return true
+        },
         changedAmount: function() {
         	if (this.amount !== this.payment_line.get_amount()){
         		this.renderElement();
@@ -328,7 +336,8 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
             var self = this;
             this.name =   this.payment_line.get_cashregister().get('journal_id')[1];
             this._super();
-            this.$('input').keyup(function(event){
+            this.$('input').keypress(_.bind(this.checkAmount, this))
+			.keyup(function(event){
                 self.changeAmount(event);
             });
             this.$('.delete-payment-line').click(function() {
@@ -498,7 +507,7 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
         },
 
         get_image_url: function(category){
-            return instance.session.url('/web/binary/image', {model: 'pos.category', field: 'image', id: category.id});
+            return instance.session.url('/web/binary/image', {model: 'pos.category', field: 'image_medium', id: category.id});
         },
 
         renderElement: function(){
diff --git a/addons/point_of_sale/wizard/pos_box.py b/addons/point_of_sale/wizard/pos_box.py
index 471153695f4..e1fa90844d7 100644
--- a/addons/point_of_sale/wizard/pos_box.py
+++ b/addons/point_of_sale/wizard/pos_box.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 
 from openerp.osv import osv, fields
 from openerp.tools.translate import _
diff --git a/addons/point_of_sale/wizard/pos_payment.xml b/addons/point_of_sale/wizard/pos_payment.xml
index 3b1cde3e488..2e828521757 100644
--- a/addons/point_of_sale/wizard/pos_payment.xml
+++ b/addons/point_of_sale/wizard/pos_payment.xml
@@ -15,7 +15,7 @@
                 <footer>
                     <button name="check" string="Make Payment" type="object" class="oe_highlight"/>
                     or 
-                    <button icon="gtk-stop" special="cancel" string="Cancel" class="oe_link"/>
+                    <button special="cancel" string="Cancel" class="oe_link"/>
                 </footer>
             </form>
             </field>
diff --git a/addons/point_of_sale/wizard/pos_session_opening.py b/addons/point_of_sale/wizard/pos_session_opening.py
index 039dd90ae6b..39e7c564831 100644
--- a/addons/point_of_sale/wizard/pos_session_opening.py
+++ b/addons/point_of_sale/wizard/pos_session_opening.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 
 from openerp.osv import osv, fields
 from openerp.tools.translate import _
diff --git a/addons/portal/__init__.py b/addons/portal/__init__.py
index 0045a557a49..1f60accc83d 100644
--- a/addons/portal/__init__.py
+++ b/addons/portal/__init__.py
@@ -20,7 +20,9 @@
 ##############################################################################
 
 import portal
+import mail_thread
 import mail_mail
+import mail_message
 import wizard
 import acquirer
 
diff --git a/addons/portal/i18n/ko.po b/addons/portal/i18n/ko.po
new file mode 100644
index 00000000000..b1d03cc0e7e
--- /dev/null
+++ b/addons/portal/i18n/ko.po
@@ -0,0 +1,497 @@
+# Korean 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: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2013-05-14 01:12+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Korean <ko@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: 2013-05-15 05:15+0000\n"
+"X-Generator: Launchpad (build 16617)\n"
+
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid "Mako"
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/wizard/share_wizard.py:50
+#, python-format
+msgid "Please select at least one user to share with"
+msgstr ""
+
+#. module: portal
+#: view:portal.wizard:0
+msgid ""
+"Select which contacts should belong to the portal in the list below.\n"
+"                        The email address of each selected contact must be "
+"valid and unique.\n"
+"                        If necessary, you can fix any contact's email "
+"address directly in the list."
+msgstr ""
+
+#. module: portal
+#: model:mail.group,name:portal.company_jobs
+msgid "Company Jobs"
+msgstr ""
+
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid "amount: the total amount to pay, as a float"
+msgstr ""
+
+#. module: portal
+#: view:portal.wizard.user:0
+msgid "Contacts"
+msgstr "연락처"
+
+#. module: portal
+#: view:share.wizard:0
+#: field:share.wizard,group_ids:0
+msgid "Existing groups"
+msgstr "기존 그룹"
+
+#. module: portal
+#: view:res.groups:0
+msgid "Portal Groups"
+msgstr "포털 그룹"
+
+#. module: portal
+#: field:portal.wizard,welcome_message:0
+msgid "Invitation Message"
+msgstr "초대 메시지"
+
+#. module: portal
+#: view:res.groups:0
+msgid "Non-Portal Groups"
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/wizard/share_wizard.py:54
+#, python-format
+msgid "Please select at least one group to share with"
+msgstr ""
+
+#. module: portal
+#: view:share.wizard:0
+msgid "Details"
+msgstr ""
+
+#. module: portal
+#: model:ir.ui.menu,name:portal.portal_orders
+msgid "Quotations and Sales Orders"
+msgstr ""
+
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid "reference: the reference number of the document to pay"
+msgstr ""
+
+#. module: portal
+#: help:portal.payment.acquirer,visible:0
+msgid ""
+"Make this payment acquirer available in portal forms (Customer invoices, "
+"etc.)"
+msgstr ""
+
+#. module: portal
+#: model:ir.model,name:portal.model_share_wizard
+msgid "Share Wizard"
+msgstr ""
+
+#. module: portal
+#: field:portal.wizard.user,email:0
+msgid "Email"
+msgstr ""
+
+#. module: portal
+#: model:ir.actions.client,help:portal.action_news
+msgid ""
+"<p>\n"
+"                    Youd don't have unread company's news.\n"
+"                </p>\n"
+"            "
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/wizard/portal_wizard.py:194
+#, python-format
+msgid ""
+"You must have an email address in your User Preferences to send emails."
+msgstr ""
+
+#. module: portal
+#: model:ir.actions.client,name:portal.action_jobs
+#: model:ir.ui.menu,name:portal.portal_jobs
+msgid "Jobs"
+msgstr ""
+
+#. module: portal
+#: field:portal.wizard,user_ids:0
+msgid "Users"
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/acquirer.py:82
+#, python-format
+msgid "Pay safely online"
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/acquirer.py:77
+#, python-format
+msgid "No online payment acquirers configured"
+msgstr ""
+
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid ""
+"kind: the kind of document on which the payment form is rendered (translated "
+"to user language, e.g. \"Invoice\")"
+msgstr ""
+
+#. module: portal
+#: help:portal.wizard,portal_id:0
+msgid "The portal that users can be added in or removed from."
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/wizard/share_wizard.py:38
+#, python-format
+msgid "Users you already shared with"
+msgstr ""
+
+#. module: portal
+#: model:ir.actions.client,help:portal.action_jobs
+msgid ""
+"<p>\n"
+"                    Youd don't have unread job offers.\n"
+"                </p>\n"
+"            "
+msgstr ""
+
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid ""
+", so it may use Mako expressions.\n"
+"                                The Mako evaluation context provides:"
+msgstr ""
+
+#. module: portal
+#: model:ir.ui.menu,name:portal.portal_menu
+#: field:portal.wizard,portal_id:0
+#: field:res.groups,is_portal:0
+#: model:res.groups,name:portal.group_portal
+msgid "Portal"
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/wizard/portal_wizard.py:34
+#, python-format
+msgid "Your OpenERP account at %(company)s"
+msgstr ""
+
+#. module: portal
+#: model:res.groups,name:portal.group_anonymous
+msgid "Anonymous"
+msgstr ""
+
+#. module: portal
+#: field:portal.wizard.user,in_portal:0
+msgid "In Portal"
+msgstr ""
+
+#. module: portal
+#: model:ir.actions.client,name:portal.action_news
+#: model:ir.ui.menu,name:portal.portal_company_news
+msgid "News"
+msgstr ""
+
+#. module: portal
+#: model:ir.ui.menu,name:portal.portal_after_sales
+msgid "After Sale Services"
+msgstr ""
+
+#. module: portal
+#: model:res.groups,comment:portal.group_portal
+msgid ""
+"Portal members have specific access rights (such as record rules and "
+"restricted menus).\n"
+"                They usually do not belong to the usual OpenERP groups."
+msgstr ""
+
+#. module: portal
+#: model:ir.actions.act_window,name:portal.action_acquirer_list
+#: view:portal.payment.acquirer:0
+msgid "Payment Acquirers"
+msgstr ""
+
+#. module: portal
+#: model:ir.ui.menu,name:portal.portal_projects
+msgid "Projects"
+msgstr ""
+
+#. module: portal
+#: model:ir.actions.client,name:portal.action_mail_inbox_feeds_portal
+#: model:ir.ui.menu,name:portal.portal_inbox
+msgid "Inbox"
+msgstr ""
+
+#. module: portal
+#: view:share.wizard:0
+#: field:share.wizard,user_ids:0
+msgid "Existing users"
+msgstr ""
+
+#. module: portal
+#: field:portal.wizard.user,wizard_id:0
+msgid "Wizard"
+msgstr ""
+
+#. module: portal
+#: field:portal.payment.acquirer,name:0
+msgid "Name"
+msgstr ""
+
+#. module: portal
+#: model:ir.model,name:portal.model_res_groups
+msgid "Access Groups"
+msgstr ""
+
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid "uid: the current user id"
+msgstr ""
+
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid ""
+"quote(): a method to quote special string character to make them suitable "
+"for inclusion in a URL"
+msgstr ""
+
+#. module: portal
+#: help:res.groups,is_portal:0
+msgid "If checked, this group is usable as a portal."
+msgstr ""
+
+#. module: portal
+#: field:portal.payment.acquirer,form_template:0
+msgid "Payment form template (HTML)"
+msgstr ""
+
+#. module: portal
+#: field:portal.wizard.user,partner_id:0
+msgid "Contact"
+msgstr ""
+
+#. module: portal
+#: model:ir.model,name:portal.model_mail_mail
+msgid "Outgoing Mails"
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/wizard/portal_wizard.py:193
+#, python-format
+msgid "Email required"
+msgstr ""
+
+#. module: portal
+#: model:ir.ui.menu,name:portal.portal_messages
+msgid "Messaging"
+msgstr ""
+
+#. module: portal
+#: model:res.groups,comment:portal.group_anonymous
+msgid ""
+"Anonymous users have specific access rights (such as record rules and "
+"restricted menus).\n"
+"                They usually do not belong to the usual OpenERP groups."
+msgstr ""
+
+#. module: portal
+#: model:ir.model,name:portal.model_portal_payment_acquirer
+msgid "Online Payment Acquirer"
+msgstr ""
+
+#. module: portal
+#: model:mail.group,name:portal.company_news_feed
+msgid "Company News"
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/acquirer.py:76
+#, python-format
+msgid ""
+"You can finish the configuration in the <a href=\"%s\">Bank&Cash settings</a>"
+msgstr ""
+
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid "cr: the current database cursor"
+msgstr ""
+
+#. module: portal
+#: model:ir.actions.client,help:portal.action_mail_inbox_feeds_portal
+msgid ""
+"<p>\n"
+"                    <b>Good Job!</b> Your inbox is empty.\n"
+"                </p><p>\n"
+"                    Your inbox contains private messages or emails sent to "
+"you\n"
+"                    as well as information related to documents or people "
+"you\n"
+"                    follow.\n"
+"                </p>\n"
+"            "
+msgstr ""
+
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid ""
+"object: the document on which the payment form is rendered (usually an "
+"invoice or sales order record)"
+msgstr ""
+
+#. module: portal
+#: help:portal.wizard,welcome_message:0
+msgid "This text is included in the email sent to new users of the portal."
+msgstr ""
+
+#. module: portal
+#: model:ir.ui.menu,name:portal.portal_company
+msgid "About Us"
+msgstr ""
+
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid ""
+"currency: the currency record in which the document is issued (e.g. "
+"currency.name could be EUR)"
+msgstr ""
+
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid "Payment Acquirer"
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/wizard/portal_wizard.py:35
+#, python-format
+msgid ""
+"Dear %(name)s,\n"
+"\n"
+"You have been given access to %(portal)s.\n"
+"\n"
+"Your login account data is:\n"
+"Database: %(db)s\n"
+"Username: %(login)s\n"
+"\n"
+"In order to complete the signin process, click on the following url:\n"
+"%(url)s\n"
+"\n"
+"%(welcome_message)s\n"
+"\n"
+"--\n"
+"OpenERP - Open Source Business Applications\n"
+"http://www.openerp.com\n"
+msgstr ""
+
+#. module: portal
+#: view:portal.wizard:0
+msgid "or"
+msgstr ""
+
+#. module: portal
+#: model:portal.payment.acquirer,form_template:portal.paypal_acquirer
+msgid ""
+"\n"
+"% if object.company_id.paypal_account:\n"
+"<form action=\"https://www.paypal.com/cgi-bin/webscr\" method=\"post\" "
+"target=\"_blank\">\n"
+"  <input type=\"hidden\" name=\"cmd\" value=\"_xclick\"/>\n"
+"  <input type=\"hidden\" name=\"business\" "
+"value=\"${object.company_id.paypal_account}\"/>\n"
+"  <input type=\"hidden\" name=\"item_name\" "
+"value=\"${object.company_id.name} ${kind.title()} ${reference}\"/>\n"
+"  <input type=\"hidden\" name=\"amount\" value=\"${amount}\"/>\n"
+"  <input type=\"hidden\" name=\"currency_code\" "
+"value=\"${currency.name}\"/>\n"
+"  <input type=\"image\" name=\"submit\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"</form>\n"
+"% endif\n"
+"            "
+msgstr ""
+
+#. module: portal
+#: model:ir.model,name:portal.model_portal_wizard_user
+msgid "Portal User Config"
+msgstr ""
+
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid ""
+"If the template renders to an empty result in a certain context it will be "
+"ignored, as if it was inactive."
+msgstr ""
+
+#. module: portal
+#: field:portal.payment.acquirer,visible:0
+msgid "Visible"
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/wizard/share_wizard.py:39
+#, python-format
+msgid "Existing Groups (e.g Portal Groups)"
+msgstr ""
+
+#. module: portal
+#: view:portal.wizard:0
+msgid "Cancel"
+msgstr ""
+
+#. module: portal
+#: view:portal.wizard:0
+msgid "Apply"
+msgstr ""
+
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid "ctx: the current context dictionary"
+msgstr ""
+
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid ""
+"This is an HTML form template to submit a payment through this acquirer.\n"
+"                                The template will be rendered with"
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/mail_mail.py:42
+#, python-format
+msgid ""
+"Access your personal documents through <a href=\"%s\">our Customer Portal</a>"
+msgstr ""
+
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid "Form Template"
+msgstr ""
+
+#. module: portal
+#: model:ir.actions.act_window,name:portal.partner_wizard_action
+#: model:ir.model,name:portal.model_portal_wizard
+#: view:portal.wizard:0
+msgid "Portal Access Management"
+msgstr ""
diff --git a/addons/portal/mail_mail.py b/addons/portal/mail_mail.py
index bc982671bfe..e412732fdc9 100644
--- a/addons/portal/mail_mail.py
+++ b/addons/portal/mail_mail.py
@@ -21,7 +21,6 @@
 
 from openerp import SUPERUSER_ID
 from openerp.osv import osv
-from openerp.osv.orm import except_orm
 from openerp.tools.translate import _
 
 
@@ -29,27 +28,19 @@ class mail_mail(osv.Model):
     """ Update of mail_mail class, to add the signin URL to notifications. """
     _inherit = 'mail.mail'
 
-    def send_get_mail_body_footer(self, cr, uid, mail, partner=None, context=None):
-        """ add a signin link inside the body of a mail.mail
-            :param mail: mail.mail browse_record
-            :param partner: browse_record of the specific recipient partner
-            :return: the resulting body_html
+    def _get_partner_access_link(self, cr, uid, mail, partner=None, context=None):
+        """ Generate URLs for links in mails:
+            - partner is not an user: signup_url
+            - partner is an user: fallback on classic URL
         """
+        if context is None:
+            context = {}
         partner_obj = self.pool.get('res.partner')
-        if partner:
-            contex_signup = dict(context or {}, signup_valid=True)
-            partner = partner_obj.browse(cr, SUPERUSER_ID, partner.id, context=contex_signup)
-            body_footer = _("""<small>Access your messages and documents through <a style='color:inherit' href="%s">our Customer Portal</a></small>""") % partner.signup_url
-            # partner is an user: add a link to the document if read access
-            if partner.user_ids and mail.model and mail.res_id \
-                    and self.check_access_rights(cr, partner.user_ids[0].id, 'read', raise_exception=False):
-                related_user = partner.user_ids[0]
-                try:
-                    self.pool[mail.model].check_access_rule(cr, related_user.id, [mail.res_id], 'read', context=context)
-                    url = partner_obj._get_signup_url_for_action(cr, related_user.id, [partner.id], action='', res_id=mail.res_id, model=mail.model, context=context)[partner.id]
-                    text = _("""<small>Access this document <a style='color:inherit' href="%s">directly in OpenERP</a></small>""") % url
-                except except_orm, e:
-                    pass
-            return body_footer
+        if partner and not partner.user_ids:
+            contex_signup = dict(context, signup_valid=True)
+            signup_url = partner_obj._get_signup_url_for_action(cr, SUPERUSER_ID, [partner.id],
+                                                                    action='login', model=mail.model, res_id=mail.res_id,
+                                                                    context=contex_signup)[partner.id]
+            return _("""<small>Access your messages and documents through <a style='color:inherit' href="%s">our Customer Portal</a></small>""") % signup_url
         else:
-            return super(mail_mail, self).send_get_mail_body_footer(cr, uid, mail, partner=partner, context=context)
+            return super(mail_mail, self)._get_partner_access_link(cr, uid, mail, partner=partner, context=context)
diff --git a/addons/portal/mail_message.py b/addons/portal/mail_message.py
new file mode 100644
index 00000000000..d6a38f27378
--- /dev/null
+++ b/addons/portal/mail_message.py
@@ -0,0 +1,57 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2011 OpenERP S.A (<http://www.openerp.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from openerp.osv import osv, orm
+from openerp.tools.translate import _
+
+
+class mail_message(osv.Model):
+    """ Update of mail_message class, to restrict mail access. """
+    _inherit = 'mail.message'
+
+    def _search(self, cr, uid, args, offset=0, limit=None, order=None,
+        context=None, count=False, access_rights_uid=None):
+        """ Override that adds specific access rights of mail.message, to remove
+            all internal notes if uid is a non-employee
+        """
+        group_ids = self.pool.get('res.users').browse(cr, uid, uid, context=context).groups_id
+        group_user_id = self.pool.get("ir.model.data").get_object_reference(cr, uid, 'base', 'group_user')[1]
+        if group_user_id not in [group.id for group in group_ids]:
+            args = ['&', '|', ('type', '!=', 'comment'), ('subtype_id', '!=', False)] + list(args)
+
+        return super(mail_message, self)._search(cr, uid, args, offset=offset, limit=limit, order=order,
+            context=context, count=False, access_rights_uid=access_rights_uid)
+
+    def check_access_rule(self, cr, uid, ids, operation, context=None):
+        """ Add Access rules of mail.message for non-employee user:
+            - read:
+                - raise if the type is comment and subtype NULL (internal note)
+        """
+        group_ids = self.pool.get('res.users').browse(cr, uid, uid, context=context).groups_id
+        group_user_id = self.pool.get("ir.model.data").get_object_reference(cr, uid, 'base', 'group_user')[1]
+        if group_user_id not in [group.id for group in group_ids]:
+            cr.execute('SELECT DISTINCT id FROM "%s" WHERE type = %%s AND subtype_id IS NULL AND id = ANY (%%s)' % (self._table), ('comment', ids,))
+            if cr.fetchall():
+                raise orm.except_orm(_('Access Denied'),
+                        _('The requested operation cannot be completed due to security restrictions. Please contact your system administrator.\n\n(Document type: %s, Operation: %s)') % \
+                        (self._description, operation))
+
+        return super(mail_message, self).check_access_rule(cr, uid, ids=ids, operation=operation, context=context)
diff --git a/addons/portal/mail_thread.py b/addons/portal/mail_thread.py
new file mode 100644
index 00000000000..44bc4d0bde8
--- /dev/null
+++ b/addons/portal/mail_thread.py
@@ -0,0 +1,43 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2013-TODAY OpenERP S.A (<http://www.openerp.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from openerp import SUPERUSER_ID
+from openerp.osv import osv
+
+
+class mail_thread(osv.AbstractModel):
+    """ Update of mail_mail class, to add the signin URL to notifications. """
+    _inherit = 'mail.thread'
+
+    def _get_inbox_action_xml_id(self, cr, uid, context=None):
+        """ For a given message, return an action that either
+            - opens the form view of the related document if model, res_id, and
+              read access to the document
+            - opens the Inbox with a default search on the conversation if model,
+              res_id
+            - opens the Inbox with context propagated
+        """
+        cur_user = self.pool.get('res.users').browse(cr, SUPERUSER_ID, uid, context=context)
+        # if uid is a portal user -> action is different
+        if any(group.is_portal for group in cur_user.groups_id):
+            return ('portal', 'action_mail_inbox_feeds_portal')
+        else:
+            return super(mail_thread, self)._get_inbox_action_xml_id(cr, uid, context=context)
diff --git a/addons/portal/portal_demo.xml b/addons/portal/portal_demo.xml
index c05189fd2ab..3660754b4ad 100644
--- a/addons/portal/portal_demo.xml
+++ b/addons/portal/portal_demo.xml
@@ -40,7 +40,7 @@ Mr Demo Portal</field>
         <record id="message_company_news0_comment0" model="mail.message">
             <field name="model">mail.group</field>
             <field name="res_id" ref="company_news_feed"/>
-            <field name="body"><![CDATA[<p>As your first portal member, I am very pleased to be able to be able to communicate directly with you. Be sure I'll read all news carefully!</p>]]></field>
+            <field name="body"><![CDATA[<p>As your first portal member, I am very pleased to be able to communicate directly with you. Be sure I'll read all news carefully!</p>]]></field>
             <field name="parent_id" ref="message_company_news0"/>
             <field name="type">comment</field>
             <field name="subtype_id" ref="mail.mt_comment"/>
diff --git a/addons/portal/security/ir.model.access.csv b/addons/portal/security/ir.model.access.csv
index 31bd7332c2f..26b0b4895e8 100644
--- a/addons/portal/security/ir.model.access.csv
+++ b/addons/portal/security/ir.model.access.csv
@@ -3,7 +3,7 @@ access_mail_message_portal,mail.message.portal,mail.model_mail_message,group_por
 access_mail_mail_portal,mail.mail.portal,mail.model_mail_mail,group_portal,1,1,1,0
 access_mail_notification_portal,mail.notification.portal,mail.model_mail_notification,group_portal,1,1,1,0
 access_mail_followers_portal,mail.followers.portal,mail.model_mail_followers,group_portal,1,1,0,0
-access_res_partner,res.partner,base.model_res_partner,portal.group_portal,1,0,0,0
+access_res_partner_portal,res.partner.portal,base.model_res_partner,portal.group_portal,1,0,0,0
 access_acquirer,portal.payment.acquirer,portal.model_portal_payment_acquirer,,1,0,0,0
 access_acquirer_all,portal.payment.acquirer,portal.model_portal_payment_acquirer,base.group_system,1,1,1,1
 access_ir_attachment_group_portal,ir.attachment group_portal,base.model_ir_attachment,portal.group_portal,1,0,1,0
\ No newline at end of file
diff --git a/addons/portal/tests/test_portal.py b/addons/portal/tests/test_portal.py
index 07becf5cdd9..e2b66e65af6 100644
--- a/addons/portal/tests/test_portal.py
+++ b/addons/portal/tests/test_portal.py
@@ -40,7 +40,9 @@ class test_portal(TestMailBase):
         self.partner_chell_id = self.user_chell.partner_id.id
 
         # Create a PigsPortal group
-        self.group_port_id = self.mail_group.create(cr, uid, {'name': 'PigsPortal', 'public': 'groups', 'group_public_id': self.group_portal_id})
+        self.group_port_id = self.mail_group.create(cr, uid,
+                        {'name': 'PigsPortal', 'public': 'groups', 'group_public_id': self.group_portal_id},
+                        {'mail_create_nolog': True})
 
         # Set an email address for the user running the tests, used as Sender for outgoing mails
         self.res_users.write(cr, uid, uid, {'email': 'test@localhost'})
@@ -130,3 +132,94 @@ class test_portal(TestMailBase):
                             'invite: body of invitation email is incorrect')
             self.assertTrue(partner_carine.signup_url in sent_email.get('body'),
                             'invite: body of invitation email does not contain signup url')
+
+    def test_20_notification_url(self):
+        """ Tests designed to test the URL added in notification emails. """
+        cr, uid, group_pigs = self.cr, self.uid, self.group_pigs
+
+        # Partner data
+        partner_raoul = self.res_partner.browse(cr, uid, self.partner_raoul_id)
+        partner_bert_id = self.res_partner.create(cr, uid, {'name': 'bert'})
+        partner_bert = self.res_partner.browse(cr, uid, partner_bert_id)
+        # Mail data
+        mail_mail_id = self.mail_mail.create(cr, uid, {'state': 'exception'})
+        mail = self.mail_mail.browse(cr, uid, mail_mail_id)
+
+        # Test: link for nobody -> None
+        url = self.mail_mail._get_partner_access_link(cr, uid, mail)
+        self.assertEqual(url, None,
+                        'notification email: mails not send to a specific partner should not have any URL')
+
+        # Test: link for partner -> signup URL
+        url = self.mail_mail._get_partner_access_link(cr, uid, mail, partner=partner_bert)
+        self.assertIn(partner_bert.signup_url, url,
+                        'notification email: mails send to a not-user partner should contain the signup URL')
+
+        # Test: link for user -> signin
+        url = self.mail_mail._get_partner_access_link(cr, uid, mail, partner=partner_raoul)
+        self.assertIn('action=mail.action_mail_redirect', url,
+                        'notification email: link should contain the redirect action')
+        self.assertIn('login=%s' % partner_raoul.user_ids[0].login, url,
+                        'notification email: link should contain the user login')
+
+    @mute_logger('openerp.addons.mail.mail_thread', 'openerp.osv.orm')
+    def test_21_inbox_redirection(self):
+        """ Tests designed to test the inbox redirection of emails notification URLs. """
+        cr, uid, user_admin, group_pigs = self.cr, self.uid, self.user_admin, self.group_pigs
+        model, act_id = self.ir_model_data.get_object_reference(cr, uid, 'mail', 'action_mail_inbox_feeds')
+        model, port_act_id = self.ir_model_data.get_object_reference(cr, uid, 'portal', 'action_mail_inbox_feeds_portal')
+        # Data: post a message on pigs
+        msg_id = self.group_pigs.message_post(body='My body', partner_ids=[self.partner_bert_id, self.partner_chell_id], type='comment', subtype='mail.mt_comment')
+
+        # No specific parameters -> should redirect to Inbox
+        action = self.mail_thread.message_redirect_action(cr, self.user_raoul_id, {'params': {}})
+        self.assertEqual(action.get('type'), 'ir.actions.client',
+                        'URL redirection: action without parameters should redirect to client action Inbox')
+        self.assertEqual(action.get('id'), act_id,
+                        'URL redirection: action without parameters should redirect to client action Inbox')
+
+        # Bert has read access to Pigs -> should redirect to form view of Pigs
+        action = self.mail_thread.message_redirect_action(cr, self.user_raoul_id, {'params': {'message_id': msg_id}})
+        self.assertEqual(action.get('type'), 'ir.actions.act_window',
+                        'URL redirection: action with message_id for read-accredited user should redirect to Pigs')
+        self.assertEqual(action.get('res_id'), group_pigs.id,
+                        'URL redirection: action with message_id for read-accredited user should redirect to Pigs')
+
+        # Bert has no read access to Pigs -> should redirect to Inbox
+        action = self.mail_thread.message_redirect_action(cr, self.user_bert_id, {'params': {'message_id': msg_id}})
+        self.assertEqual(action.get('type'), 'ir.actions.client',
+                        'URL redirection: action without parameters should redirect to client action Inbox')
+        self.assertEqual(action.get('id'), act_id,
+                        'URL redirection: action without parameters should redirect to client action Inbox')
+
+        # Chell has no read access to pigs -> should redirect to Portal Inbox
+        action = self.mail_thread.message_redirect_action(cr, self.user_chell_id, {'params': {'message_id': msg_id}})
+        self.assertEqual(action.get('type'), 'ir.actions.client',
+                        'URL redirection: action without parameters should redirect to client action Inbox')
+        self.assertEqual(action.get('id'), port_act_id,
+                        'URL redirection: action without parameters should redirect to client action Inbox')
+
+    def test_30_message_read(self):
+        cr, uid, group_port_id = self.cr, self.uid, self.group_port_id
+
+        # Data: custom subtypes
+        mt_group_public_id = self.mail_message_subtype.create(cr, uid, {'name': 'group_public', 'description': 'Group changed'})
+        self.ir_model_data.create(cr, uid, {'name': 'mt_group_public', 'model': 'mail.message.subtype', 'module': 'mail', 'res_id': mt_group_public_id})
+        # Data: post messages with various subtypes
+        msg1_id = self.mail_group.message_post(cr, uid, group_port_id, body='Body1', type='comment', subtype='mail.mt_comment')
+        msg2_id = self.mail_group.message_post(cr, uid, group_port_id, body='Body2', type='comment', subtype='mail.mt_group_public')
+        msg3_id = self.mail_group.message_post(cr, uid, group_port_id, body='Body3', type='comment', subtype='mail.mt_comment')
+        msg4_id = self.mail_group.message_post(cr, uid, group_port_id, body='Body4', type='comment')
+        msg5_id = self.mail_group.message_post(cr, uid, group_port_id, body='Body5', type='notification')
+
+        # Do: Chell search messages: should not see internal notes (comment without subtype)
+        msg_ids = self.mail_message.search(cr, self.user_chell_id, [('model', '=', 'mail.group'), ('res_id', '=', group_port_id)])
+        self.assertEqual(set(msg_ids), set([msg1_id, msg2_id, msg3_id, msg5_id]),
+                        'mail_message: portal user has access to messages he should not read')
+
+        # Do: Chell read messages she can read
+        self.mail_message.read(cr, self.user_chell_id, msg_ids, ['body', 'type', 'subtype_id'])
+
+        # Do: Chell read a message she should not be able to read
+        with self.assertRaises(except_orm):
+            self.mail_message.read(cr, self.user_chell_id, [msg4_id], ['body', 'type', 'subtype_id'])
diff --git a/addons/portal/wizard/portal_wizard.py b/addons/portal/wizard/portal_wizard.py
index e3047cd5edb..e363afa47cb 100644
--- a/addons/portal/wizard/portal_wizard.py
+++ b/addons/portal/wizard/portal_wizard.py
@@ -172,7 +172,7 @@ class wizard_user(osv.osv_memory):
             @return: browse record of model res.users
         """
         res_users = self.pool.get('res.users')
-        create_context = dict(context or {}, noshortcut=True)       # to prevent shortcut creation
+        create_context = dict(context or {}, noshortcut=True, no_reset_password=True)       # to prevent shortcut creation
         values = {
             'login': extract_email(wizard_user.email),
             'partner_id': wizard_user.partner_id.id,
diff --git a/addons/portal_crm/i18n/fr.po b/addons/portal_crm/i18n/fr.po
new file mode 100644
index 00000000000..a0633c60306
--- /dev/null
+++ b/addons/portal_crm/i18n/fr.po
@@ -0,0 +1,546 @@
+# French 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: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2013-05-22 16:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: French <fr@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: 2013-05-23 05:19+0000\n"
+"X-Generator: Launchpad (build 16640)\n"
+
+#. module: portal_crm
+#: selection:portal_crm.crm_contact_us,type:0
+msgid "Lead"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,title:0
+msgid "Title"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,probability:0
+msgid "Success Rate (%)"
+msgstr ""
+
+#. module: portal_crm
+#: view:portal_crm.crm_contact_us:0
+msgid "Contact us"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,date_action:0
+msgid "Next Action Date"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,fax:0
+msgid "Fax"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,zip:0
+msgid "Zip"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,day_open:0
+msgid "Days to Open"
+msgstr ""
+
+#. module: portal_crm
+#: view:portal_crm.crm_contact_us:0
+msgid "Thank you for your interest, we'll respond to your request shortly."
+msgstr ""
+
+#. module: portal_crm
+#: selection:portal_crm.crm_contact_us,priority:0
+msgid "Highest"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,mobile:0
+msgid "Mobile"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,description:0
+msgid "Notes"
+msgstr "Notes"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,color:0
+msgid "Color Index"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,partner_latitude:0
+msgid "Geo Latitude"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,partner_name:0
+msgid "Customer Name"
+msgstr ""
+
+#. module: portal_crm
+#: selection:portal_crm.crm_contact_us,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,channel_id:0
+msgid "Communication channel (mail, direct, phone, ...)"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,type_id:0
+msgid "Campaign"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,ref:0
+msgid "Reference"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,date_action_next:0
+#: field:portal_crm.crm_contact_us,title_action:0
+msgid "Next Action"
+msgstr ""
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: portal_crm
+#: model:ir.actions.act_window,name:portal_crm.action_contact_us
+msgid "Contact Us"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,name:0
+msgid "Subject"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,opt_out:0
+msgid "Opt-Out"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,priority:0
+msgid "Priority"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,state_id:0
+msgid "State"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,partner_id:0
+msgid "Linked partner (optional). Usually created when converting the lead."
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,payment_mode:0
+msgid "Payment Mode"
+msgstr ""
+
+#. module: portal_crm
+#: selection:portal_crm.crm_contact_us,state:0
+msgid "New"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,type:0
+msgid "Type"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,email_from:0
+msgid "Email"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,channel_id:0
+msgid "Channel"
+msgstr ""
+
+#. module: portal_crm
+#: view:portal_crm.crm_contact_us:0
+msgid "Name"
+msgstr ""
+
+#. module: portal_crm
+#: selection:portal_crm.crm_contact_us,priority:0
+msgid "Lowest"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,create_date:0
+msgid "Creation Date"
+msgstr ""
+
+#. module: portal_crm
+#: view:portal_crm.crm_contact_us:0
+msgid "Close"
+msgstr ""
+
+#. module: portal_crm
+#: selection:portal_crm.crm_contact_us,state:0
+msgid "Pending"
+msgstr ""
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,type:0
+msgid "Type is used to separate Leads and Opportunities"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,categ_ids:0
+msgid "Categories"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,stage_id:0
+msgid "Stage"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,user_login:0
+msgid "User Login"
+msgstr ""
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,opt_out:0
+msgid ""
+"If opt-out is checked, this contact has refused to receive emails or "
+"unsubscribed to a campaign."
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,contact_name:0
+msgid "Contact Name"
+msgstr ""
+
+#. module: portal_crm
+#: model:ir.ui.menu,name:portal_crm.portal_company_contact
+msgid "Contact"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,partner_address_email:0
+msgid "Partner Contact Email"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,planned_revenue:0
+msgid "Expected Revenue"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,task_ids:0
+msgid "Tasks"
+msgstr ""
+
+#. module: portal_crm
+#: view:portal_crm.crm_contact_us:0
+msgid "Contact form"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,company_currency:0
+msgid "Currency"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,write_date:0
+msgid "Update Date"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,date_deadline:0
+msgid "Expected Closing"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,ref2:0
+msgid "Reference 2"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,user_email:0
+msgid "User Email"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,date_open:0
+msgid "Opened"
+msgstr ""
+
+#. module: portal_crm
+#: selection:portal_crm.crm_contact_us,state:0
+msgid "In Progress"
+msgstr ""
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,partner_name:0
+msgid ""
+"The name of the future partner company that will be created while converting "
+"the lead into opportunity"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,planned_cost:0
+msgid "Planned Costs"
+msgstr ""
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,date_deadline:0
+msgid "Estimate of the date on which the opportunity will be won."
+msgstr ""
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,email_cc:0
+msgid ""
+"These email addresses will be added to the CC field of all inbound and "
+"outbound emails for this record before being sent. Separate multiple email "
+"addresses with a comma"
+msgstr ""
+
+#. module: portal_crm
+#: selection:portal_crm.crm_contact_us,priority:0
+msgid "Low"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,date_closed:0
+#: selection:portal_crm.crm_contact_us,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,date_assign:0
+msgid "Assignation Date"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,state:0
+msgid "Status"
+msgstr ""
+
+#. module: portal_crm
+#: selection:portal_crm.crm_contact_us,priority:0
+msgid "Normal"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,email_cc:0
+msgid "Global CC"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,street2:0
+msgid "Street2"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,id:0
+msgid "ID"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,phone:0
+msgid "Phone"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,message_is_follower:0
+msgid "Is a Follower"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,active:0
+msgid "Active"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,user_id:0
+msgid "Salesperson"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,day_close:0
+msgid "Days to Close"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,company_ids:0
+msgid "Companies"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,section_id:0
+msgid ""
+"When sending mails, the default email address is taken from the sales team."
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,partner_address_name:0
+msgid "Partner Contact Name"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,partner_longitude:0
+msgid "Geo Longitude"
+msgstr ""
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,date_assign:0
+msgid "Last date this case was forwarded/assigned to a partner"
+msgstr ""
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,email_from:0
+msgid "Email address of the contact"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,city:0
+msgid "City"
+msgstr ""
+
+#. module: portal_crm
+#: view:portal_crm.crm_contact_us:0
+msgid "Submit"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,function:0
+msgid "Function"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,referred:0
+msgid "Referred By"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,partner_assigned_id:0
+msgid "Assigned Partner"
+msgstr ""
+
+#. module: portal_crm
+#: selection:portal_crm.crm_contact_us,type:0
+msgid "Opportunity"
+msgstr ""
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,partner_assigned_id:0
+msgid "Partner this case has been forwarded/assigned to."
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,country_id:0
+msgid "Country"
+msgstr ""
+
+#. module: portal_crm
+#: view:portal_crm.crm_contact_us:0
+msgid "Thank you"
+msgstr ""
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,state:0
+msgid ""
+"The Status is set to 'Draft', when a case is created. If the case is in "
+"progress the Status is set to 'Open'. When the case is over, the Status is "
+"set to 'Done'. If the case needs to be reviewed then the Status is  set to "
+"'Pending'."
+msgstr ""
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,type_id:0
+msgid ""
+"From which campaign (seminar, marketing campaign, mass mailing, ...) did "
+"this contact come from?"
+msgstr ""
+
+#. module: portal_crm
+#: selection:portal_crm.crm_contact_us,priority:0
+msgid "High"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,section_id:0
+msgid "Sales Team"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,street:0
+msgid "Street"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,date_action_last:0
+msgid "Last Action"
+msgstr ""
+
+#. module: portal_crm
+#: model:ir.model,name:portal_crm.model_portal_crm_crm_contact_us
+msgid "Contact form for the portal"
+msgstr ""
diff --git a/addons/portal_event/i18n/fr.po b/addons/portal_event/i18n/fr.po
new file mode 100644
index 00000000000..81c0a603fc6
--- /dev/null
+++ b/addons/portal_event/i18n/fr.po
@@ -0,0 +1,59 @@
+# French 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: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2013-05-22 16:32+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: French <fr@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: 2013-05-23 05:19+0000\n"
+"X-Generator: Launchpad (build 16640)\n"
+
+#. module: portal_event
+#: view:event.event:0
+msgid "Portal Settings"
+msgstr ""
+
+#. module: portal_event
+#: model:ir.actions.act_window,help:portal_event.action_event_view
+msgid "There are no public events."
+msgstr ""
+
+#. module: portal_event
+#: selection:event.event,visibility:0
+msgid "Private"
+msgstr ""
+
+#. module: portal_event
+#: model:ir.model,name:portal_event.model_event_event
+msgid "Event"
+msgstr ""
+
+#. module: portal_event
+#: model:ir.actions.act_window,name:portal_event.action_event_view
+#: model:ir.ui.menu,name:portal_event.portal_company_events
+msgid "Events"
+msgstr ""
+
+#. module: portal_event
+#: field:event.event,visibility:0
+msgid "Visibility"
+msgstr ""
+
+#. module: portal_event
+#: help:event.event,visibility:0
+msgid "Event's visibility in the portal's contact page"
+msgstr ""
+
+#. module: portal_event
+#: selection:event.event,visibility:0
+msgid "Public"
+msgstr ""
diff --git a/addons/portal_event/portal_event_view.xml b/addons/portal_event/portal_event_view.xml
old mode 100755
new mode 100644
diff --git a/addons/portal_hr_employees/hr_employee_view.xml b/addons/portal_hr_employees/hr_employee_view.xml
index a3182cd5b1c..ace0daaff87 100644
--- a/addons/portal_hr_employees/hr_employee_view.xml
+++ b/addons/portal_hr_employees/hr_employee_view.xml
@@ -35,11 +35,35 @@
         <record model="ir.ui.view" id="portal_hr_kanban_view_employees">
             <field name="name">HR - Employess Kanban</field>
             <field name="model">hr.employee</field>
-            <field name="inherit_id" ref="hr.hr_kanban_view_employees"/>
             <field name="arch" type="xml">
-                <xpath expr="//div[@class='oe_employee_details']" position="inside">
-                    <t t-if="record.public_info.raw_value"><field name="public_info"/></t>
-                </xpath>
+                <kanban>
+                    <field name="last_login"/>
+                    <templates>
+                        <t t-name="kanban-box">
+                            <div class="oe_employee_vignette">
+                                <div class="oe_employee_image">
+                                    <a type="open"><img t-att-src="kanban_image('hr.employee', 'image_medium', record.id.value)" class="oe_employee_picture"/></a>
+                                </div>
+                                <div class="oe_employee_details">
+                                    <h4>
+                                        <a type="open"><field name="name"/></a>
+                                    </h4>
+                                    <ul>
+                                        <li t-if="record.job_id.raw_value"><field name="job_id"/></li>
+                                        <li t-if="record.work_location.raw_value"><field name="work_location"/></li>
+                                        <li t-if="record.work_phone.raw_value">Tel: <field name="work_phone"/></li>
+                                        <li t-if="record.mobile_phone.raw_value">Mobile: <field name="mobile_phone"/></li>
+                                        <li t-if="record.work_email.raw_value"><a t-attf-href="mailto:#{record.work_email.value}"><field name="work_email"/></a></li>
+                                        <li t-if="record.public_info.raw_value"><field name="public_info"/></li>
+                                    </ul>
+                                </div>
+                            </div>
+                            <script>
+                                $('.oe_employee_picture').load(function() { if($(this).width() > $(this).height()) { $(this).addClass('oe_employee_picture_wide') } });
+                            </script>
+                        </t>
+                    </templates>
+                </kanban>
             </field>
         </record>
 
diff --git a/addons/portal_hr_employees/i18n/fr.po b/addons/portal_hr_employees/i18n/fr.po
new file mode 100644
index 00000000000..3fdc48a35de
--- /dev/null
+++ b/addons/portal_hr_employees/i18n/fr.po
@@ -0,0 +1,95 @@
+# French 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: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2013-05-22 16:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: French <fr@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: 2013-05-23 05:19+0000\n"
+"X-Generator: Launchpad (build 16640)\n"
+
+#. module: portal_hr_employees
+#: view:hr.employee:0
+msgid "Coach"
+msgstr ""
+
+#. module: portal_hr_employees
+#: model:ir.actions.act_window,name:portal_hr_employees.action_team
+#: view:portal_crm.crm_contact_us:0
+msgid "Our Team"
+msgstr ""
+
+#. module: portal_hr_employees
+#: view:hr.employee:0
+msgid "Group By..."
+msgstr ""
+
+#. module: portal_hr_employees
+#: view:hr.employee:0
+msgid "Company"
+msgstr ""
+
+#. module: portal_hr_employees
+#: selection:hr.employee,visibility:0
+msgid "Public"
+msgstr ""
+
+#. module: portal_hr_employees
+#: help:hr.employee,visibility:0
+msgid "Employee's visibility in the portal's contact page"
+msgstr ""
+
+#. module: portal_hr_employees
+#: selection:hr.employee,visibility:0
+msgid "Private"
+msgstr ""
+
+#. module: portal_hr_employees
+#: view:hr.employee:0
+msgid "Manager"
+msgstr ""
+
+#. module: portal_hr_employees
+#: model:ir.model,name:portal_hr_employees.model_hr_employee
+msgid "Employee"
+msgstr ""
+
+#. module: portal_hr_employees
+#: view:hr.employee:0
+msgid "Job"
+msgstr ""
+
+#. module: portal_hr_employees
+#: field:hr.employee,visibility:0
+msgid "Visibility"
+msgstr ""
+
+#. module: portal_hr_employees
+#: field:hr.employee,public_info:0
+msgid "Public Info"
+msgstr ""
+
+#. module: portal_hr_employees
+#: model:ir.model,name:portal_hr_employees.model_portal_crm_crm_contact_us
+msgid "Contact form for the portal"
+msgstr ""
+
+#. module: portal_hr_employees
+#: view:hr.employee:0
+msgid "Department"
+msgstr ""
+
+#. module: portal_hr_employees
+#: view:hr.employee:0
+#: field:portal_crm.crm_contact_us,employee_ids:0
+msgid "Employees"
+msgstr ""
diff --git a/addons/portal_project/security/portal_security.xml b/addons/portal_project/security/portal_security.xml
index 8d58ed70aeb..67e57766ebd 100644
--- a/addons/portal_project/security/portal_security.xml
+++ b/addons/portal_project/security/portal_security.xml
@@ -33,27 +33,26 @@
         </record>
 
         <record model="ir.rule" id="project.task_visibility_rule">
-            <field name="name">Project/Task: employees: public, portal, employee or following or assigned</field>
+            <field name="name">Project/Task: employees: public, portal, employee or (followers and following)</field>
             <field name="domain_force">['|',
-                                            ('user_id', '=', user.id),
-                                            '|',
-                                                ('project_id.privacy_visibility', 'in', ['public', 'portal', 'employees']),
-                                                '&amp;',
-                                                    ('project_id.privacy_visibility', '=', 'followers'),
-                                                    ('message_follower_ids', 'in', [user.partner_id.id]),
+                                            ('project_id.privacy_visibility', 'in', ['public', 'portal', 'employees']),
+                                            '&amp;',
+                                                ('project_id.privacy_visibility', '=', 'followers'),
+                                                ('message_follower_ids', 'in', [user.partner_id.id]),
                                         ]</field>
         </record>
 
         <record id="portal_task_rule" model="ir.rule">
-            <field name="name">Project/Task: portal users: public or portal and following</field>
+            <field name="name">Project/Task: portal users: public or (portal and colleagues following) or (followers and following)</field>
             <field name="model_id" ref="project.model_project_task"/>
-            <field name="domain_force">['|',
-                                            ('project_id.privacy_visibility', '=', 'public'),
+            <field name="domain_force">['|', '|',
+                                            ('project_id.privacy_visibility', 'in', ['public']),
                                             '&amp;',
-                                                ('project_id.privacy_visibility', 'in', ['portal', 'followers']),
-                                                '|',
-                                                    ('message_follower_ids','in', [user.partner_id.id]),
-                                                    ('user_id', '=', user.id),
+                                                ('project_id.privacy_visibility', '=', 'portal'),
+                                                ('message_follower_ids', 'child_of', [user.partner_id.commercial_partner_id.id]),
+                                            '&amp;',
+                                                ('project_id.privacy_visibility', '=', 'followers'),
+                                                ('message_follower_ids', 'in', [user.partner_id.id]),
                                         ]</field>
             <field name="groups" eval="[(4, ref('portal.group_portal'))]"/>
         </record>
diff --git a/addons/portal_project_issue/i18n/fr.po b/addons/portal_project_issue/i18n/fr.po
new file mode 100644
index 00000000000..48fc9e2ea59
--- /dev/null
+++ b/addons/portal_project_issue/i18n/fr.po
@@ -0,0 +1,40 @@
+# French 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: 2012-12-21 17:06+0000\n"
+"PO-Revision-Date: 2013-05-22 08:03+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: French <fr@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: 2013-05-23 05:19+0000\n"
+"X-Generator: Launchpad (build 16640)\n"
+
+#. module: portal_project_issue
+#: view:project.issue:0
+msgid "Creation:"
+msgstr ""
+
+#. module: portal_project_issue
+#: model:ir.actions.act_window,help:portal_project_issue.project_issue_categ_act0
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create an issue.\n"
+"              </p><p>\n"
+"                You can track your issues from this menu and the action we\n"
+"                will take.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: portal_project_issue
+#: model:ir.actions.act_window,name:portal_project_issue.project_issue_categ_act0
+msgid "Issues"
+msgstr ""
diff --git a/addons/portal_project_issue/security/portal_security.xml b/addons/portal_project_issue/security/portal_security.xml
index f6cd8d89be7..598c1620a82 100644
--- a/addons/portal_project_issue/security/portal_security.xml
+++ b/addons/portal_project_issue/security/portal_security.xml
@@ -3,28 +3,27 @@
     <data noupdate="1">
 
         <record id="portal_issue_rule" model="ir.rule">
-            <field name="name">Project/Issue: portal users: public or portal and following</field>
+            <field name="name">Project/Issue: portal users: public or (portal and colleagues following) or (followers and following)</field>
             <field name="model_id" ref="project_issue.model_project_issue"/>
-            <field name="domain_force">['|',
-                                            ('project_id.privacy_visibility', '=', 'public'),
+            <field name="domain_force">['|', '|',
+                                            ('project_id.privacy_visibility', 'in', ['public']),
                                             '&amp;',
-                                                ('project_id.privacy_visibility', 'in', ['portal', 'followers']),
-                                                '|',
-                                                    ('message_follower_ids','in', [user.partner_id.id]),
-                                                    ('user_id', '=', user.id),
+                                                ('project_id.privacy_visibility', '=', 'portal'),
+                                                ('message_follower_ids', 'child_of', [user.partner_id.commercial_partner_id.id]),
+                                            '&amp;',
+                                                ('project_id.privacy_visibility', '=', 'followers'),
+                                                ('message_follower_ids', 'in', [user.partner_id.id]),
                                         ]</field>
             <field name="groups" eval="[(4, ref('portal.group_portal'))]"/>
         </record>
 
         <record model="ir.rule" id="project_issue.issue_user_rule">
-            <field name="name">Project/Issue: employees: public, portal, employee or following or assigned</field>
+            <field name="name">Project/Issue: employees: public, portal, employee or (followers and following)</field>
             <field name="domain_force">['|',
-                                            ('user_id', '=', user.id),
-                                            '|',
-                                                ('project_id.privacy_visibility', 'in', ['public', 'portal', 'employees']),
-                                                '&amp;',
-                                                    ('project_id.privacy_visibility', '=', 'followers'),
-                                                    ('message_follower_ids', 'in', [user.partner_id.id]),
+                                            ('project_id.privacy_visibility', 'in', ['public', 'portal', 'employees']),
+                                            '&amp;',
+                                                ('project_id.privacy_visibility', '=', 'followers'),
+                                                ('message_follower_ids', 'in', [user.partner_id.id]),
                                         ]</field>
         </record>
 
diff --git a/addons/portal_project_long_term/security/portal_security.xml b/addons/portal_project_long_term/security/portal_security.xml
index eab70ebe734..d8aec542847 100644
--- a/addons/portal_project_long_term/security/portal_security.xml
+++ b/addons/portal_project_long_term/security/portal_security.xml
@@ -3,16 +3,9 @@
     <data>
 
         <record id="portal_project_long_term_rule" model="ir.rule">
-            <field name="name">Project/Phase: portal users: public or portal and following</field>
+            <field name="name">Project/Phase: portal users: public or (portal and colleagues following) or (followers and following)</field>
             <field name="model_id" ref="project_long_term.model_project_phase"/>
-            <field name="domain_force">['|',
-                                            ('project_id.privacy_visibility', '=', 'public'),
-                                            '&amp;',
-                                                ('project_id.privacy_visibility', 'in', ['portal', 'followers']),
-                                                '|',
-                                                    ('message_follower_ids','in', [user.partner_id.id]),
-                                                    ('user_id', '=', user.id),
-                                        ]</field>
+            <field name="domain_force">[('project_id.privacy_visibility', 'in', ['public', 'portal'])]</field>
             <field name="groups" eval="[(4, ref('portal.group_portal'))]"/>
         </record>
 
diff --git a/addons/portal_sale/portal_sale.py b/addons/portal_sale/portal_sale.py
index cd3b702d3c5..07300c5d463 100644
--- a/addons/portal_sale/portal_sale.py
+++ b/addons/portal_sale/portal_sale.py
@@ -104,25 +104,6 @@ class account_invoice(osv.Model):
             pass
         return action_dict
 
-    def invoice_validate(self, cr, uid, ids, context=None):
-        # fetch the partner's id and subscribe the partner to the invoice
-        document = self.browse(cr, uid, ids[0], context=context)
-        partner = document.partner_id
-        # TDE note: this code should be improved: used a real invite wizard instead of an ugly email
-        if partner.id not in document.message_follower_ids:
-            self.message_subscribe(cr, uid, ids, [partner.id], context=context)
-            mail_values = {
-                'recipient_ids': [(4, partner.id)],
-                'subject': 'Invitation to follow %s' % document.name_get()[0][1],
-                'body_html': 'You have been invited to follow %s' % document.name_get()[0][1],
-                'auto_delete': True,
-                'type': 'email',
-            }
-            mail_obj = self.pool.get('mail.mail')
-            mail_id = mail_obj.create(cr, uid, mail_values, context=context)
-            mail_obj.send(cr, uid, [mail_id], context=context)
-        return super(account_invoice, self).invoice_validate(cr, uid, ids, context=context)
-
     def get_signup_url(self, cr, uid, ids, context=None):
         assert len(ids) == 1
         document = self.browse(cr, uid, ids[0], context=context)
diff --git a/addons/procurement/stock_orderpoint.xml b/addons/procurement/stock_orderpoint.xml
index 31c48046d64..67d610c65c9 100644
--- a/addons/procurement/stock_orderpoint.xml
+++ b/addons/procurement/stock_orderpoint.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data noupdate="1">
 
@@ -7,50 +6,50 @@
         <record id="stock_warehouse_orderpoint_0" model="stock.warehouse.orderpoint">
             <field name="product_max_qty">25.0</field>
             <field name="product_min_qty">5.0</field>
-            <field model="product.uom" name="product_uom" ref="product.product_uom_dozen"/>
+            <field name="product_uom" ref="product.product_uom_dozen"/>
             <field model="stock.warehouse" name="warehouse_id" search="[]"/>
-            <field model="product.product" name="product_id" ref="product.product_product_36"/>
+            <field name="product_id" ref="product.product_product_36"/>
             <field name="location_id" ref="stock.stock_location_stock"/>
         </record>
         <record id="stock_warehouse_orderpoint_1" model="stock.warehouse.orderpoint">
             <field name="product_max_qty">10.0</field>
             <field name="product_min_qty">5.0</field>
-            <field model="product.uom" name="product_uom" ref="product.product_uom_unit"/>
+            <field name="product_uom" ref="product.product_uom_unit"/>
             <field model="stock.warehouse" name="warehouse_id" search="[]"/>
-            <field model="product.product" name="product_id" ref="product.product_product_28"/>
+            <field name="product_id" ref="product.product_product_28"/>
             <field name="location_id" ref="stock.stock_location_stock"/>
         </record>
         <record id="stock_warehouse_orderpoint_2" model="stock.warehouse.orderpoint">
             <field name="product_max_qty">12.0</field>
             <field name="product_min_qty">5.0</field>
-            <field model="product.uom" name="product_uom" ref="product.product_uom_unit"/>
+            <field name="product_uom" ref="product.product_uom_unit"/>
             <field model="stock.warehouse" name="warehouse_id" search="[]"/>
-            <field model="product.product" name="product_id" ref="product.product_product_20"/>
+            <field name="product_id" ref="product.product_product_20"/>
             <field name="location_id" ref="stock.stock_location_stock"/>
         </record>
         <record id="stock_warehouse_orderpoint_3" model="stock.warehouse.orderpoint">
             <field name="product_max_qty">50.0</field>
             <field name="product_min_qty">10.0</field>
-            <field model="product.uom" name="product_uom" ref="product.product_uom_unit"/>
+            <field name="product_uom" ref="product.product_uom_unit"/>
             <field model="stock.warehouse" name="warehouse_id" search="[]"/>
-            <field model="product.product" name="product_id" ref="product.product_product_46"/>
+            <field name="product_id" ref="product.product_product_46"/>
             <field name="location_id" ref="stock.stock_location_stock"/>
         </record>
         <record id="stock_warehouse_orderpoint_4" model="stock.warehouse.orderpoint">
             <field name="product_max_qty">15.0</field>
             <field name="product_min_qty">5.0</field>
-            <field model="product.uom" name="product_uom" ref="product.product_uom_unit"/>
+            <field name="product_uom" ref="product.product_uom_unit"/>
             <field model="stock.warehouse" name="warehouse_id" search="[]"/>
-            <field model="product.product" name="product_id" ref="product.product_product_23"/>
+            <field name="product_id" ref="product.product_product_23"/>
             <field name="location_id" ref="stock.stock_location_stock"/>
         </record>
         <record id="stock_warehouse_orderpoint_5" model="stock.warehouse.orderpoint">
             <field name="product_max_qty">5.0</field>
             <field name="product_min_qty">3.0</field>
-            <field model="product.uom" name="product_uom" ref="product.product_uom_unit"/>
+            <field name="product_uom" ref="product.product_uom_unit"/>
             <field model="stock.warehouse" name="warehouse_id" search="[]"/>
-            <field model="product.product" name="product_id" ref="product.product_product_48"/>
+            <field name="product_id" ref="product.product_product_48"/>
             <field name="location_id" ref="stock.stock_location_stock"/>
         </record>
     </data>
-</openerp>
+</openerp>
\ No newline at end of file
diff --git a/addons/product/process/product_process.xml b/addons/product/process/product_process.xml
index 03ce904abad..652710fac94 100644
--- a/addons/product/process/product_process.xml
+++ b/addons/product/process/product_process.xml
@@ -43,8 +43,8 @@
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Supplier of the product&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;1 or several supplier(s) can be linked to a product. All information stands in the product form.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_supplier0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_product0"/>
+            <field name="target_node_id" ref="process_node_supplier0"/>
+            <field name="source_node_id" ref="process_node_product0"/>
         </record>
 
     </data>
diff --git a/addons/product/product.py b/addons/product/product.py
index 518e455ddc1..656812bebbb 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -292,9 +292,14 @@ class product_template(osv.osv):
     _columns = {
         'name': fields.char('Name', size=128, required=True, translate=True, select=True),
         'product_manager': fields.many2one('res.users','Product Manager'),
-        'description': fields.text('Description',translate=True),
-        'description_purchase': fields.text('Purchase Description',translate=True),
-        'description_sale': fields.text('Sale Description',translate=True),
+        'description': fields.text('Description',translate=True,
+            help="A precise description of the Product, used only for internal information purposes."),
+        'description_purchase': fields.text('Purchase Description',translate=True,
+            help="A description of the Product that you want to communicate to your suppliers. "
+                 "This description will be copied to every Purchase Order, Reception and Supplier Invoice/Refund."),
+        'description_sale': fields.text('Sale Description',translate=True,
+            help="A description of the Product that you want to communicate to your customers. "
+                 "This description will be copied to every Sale Order, Delivery Order and Customer Invoice/Refund"),
         'type': fields.selection([('consu', 'Consumable'),('service','Service')], 'Product Type', required=True, help="Consumable are product where you don't manage stock, a service is a non-material product provided by a company or an individual."),
         'produce_delay': fields.float('Manufacturing Lead Time', help="Average delay in days to produce this product. In the case of multi-level BOM, the manufacturing lead times of the components will be added."),
         'rental': fields.boolean('Can be Rent'),
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 00e925fd6a0..bcc0ae838ae 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -88,6 +88,7 @@
                                         <div name="ean">
                                             <field name="ean13" placeholder="e.g. 5901234123457"/>
                                         </div>
+                                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                                     </group>
                                 </group>
                                 <field name="description" placeholder="describe the product characteristics..."/>
diff --git a/addons/product/report/product_label.xsl b/addons/product/report/product_label.xsl
index 641db73ea7d..5dbb2d64a28 100644
--- a/addons/product/report/product_label.xsl
+++ b/addons/product/report/product_label.xsl
@@ -67,7 +67,7 @@
                         <para style="nospace"><xsl:value-of select="code"/></para>
                     </td>
                     <td>
-                        <para style="nospace" t="1"><xsl:value-of select="price"/> <xsl:value-of select="currency"/></para>
+                        <para style="nospace" t="1"><xsl:value-of select="price"/><xsl:text>  </xsl:text><xsl:value-of select="currency"/></para>
                     </td>
                 </tr>
                 <tr>
diff --git a/addons/project/html/Mario-Riva.png b/addons/project/html/Mario-Riva.png
new file mode 100644
index 00000000000..35b030a4265
Binary files /dev/null and b/addons/project/html/Mario-Riva.png differ
diff --git a/addons/project/html/Yoshi-Tashiro.png b/addons/project/html/Yoshi-Tashiro.png
new file mode 100644
index 00000000000..f3457a9088e
Binary files /dev/null and b/addons/project/html/Yoshi-Tashiro.png differ
diff --git a/addons/project/html/index.html b/addons/project/html/index.html
new file mode 100644
index 00000000000..93f1be8a41d
--- /dev/null
+++ b/addons/project/html/index.html
@@ -0,0 +1,197 @@
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan">Project Management</h2>
+        <h3 class="oe_slogan">Infinitely flexible. Incredibly easy to use. </h3>
+        <div class="oe_span6">
+            <div class="oe_demo oe_picture oe_screenshot">
+                <a href="https://www.openerp.com/saas_master/demo?lang=en_US&module=project">
+                    <img src="project_01.png">
+                </a>
+                <div class="oe_demo_footer oe_centeralign">Online Demo</div>
+            </div>
+        </div>
+        <div class="oe_span6">
+            <p class='oe_mt32'>
+OpenERP's collaborative and realtime project management helps your team get
+work done. Keep track of everything, from the big picture to the minute
+details, from the customer contract to the billing.
+            </p>
+            <div class="oe_centeralign oe_websiteonly">
+                <a href="http://www.openerp.com/start" class="oe_button oe_big oe_tacky">Start your <span class="oe_emph">free</span> trial</a>
+            </div>
+        </div>
+    </div>
+</section>  
+
+<section class="oe_container oe_dark">
+    <div class="oe_row oe_padded">
+        <h2 class="oe_slogan">Designed to fit your own process</h2>
+        <div class="oe_span12">
+            <p>
+Organize projects around your own processes. Work on tasks and issues using the kanban view, schedule tasks using the gantt chart
+and control deadlines in the calendar view. Every project may have it's own stages
+allowing teams to optimize their job.
+            </p>
+        </div>
+        <div class="oe_span4">
+            <h3>Kanban</h3>
+            <div class="oe_row_img oe_centered">
+            <img class="oe_picture oe_screenshot" src="project_kanban.png">
+            </div>
+        </div>
+        <div class="oe_span4 ">
+            <h3>Gantt Charts</h3>
+            <img class="oe_picture oe_screenshot" src="project_gantt.png">
+            </p>
+        </div>
+        <div class="oe_span4 ">
+            <h3>Calendar</h3>
+            <img class="oe_picture oe_screenshot" src="project_calendar.png">
+        </div>
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row">
+        <h2 class="oe_slogan">Easy to use</h2>
+        <div class="oe_span6">
+                <img class="oe_picture oe_screenshot" src="project_easy.png">
+        </div>
+        <div class="oe_span6">
+            <p class='oe_mt32'>
+Get organized as fast as you can think. The easy-to-use interface takes no time
+to learn, and every action is instantaneous, so there’s nothing standing
+between you and your sweet productive flow.
+            </p>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container oe_dark">
+    <h2 class="oe_slogan">Work Together</h2>
+    <h3 class="oe_slogan">Real time chats, document sharing, email integration</h3>
+    <div class="oe_row">
+        <div class="oe_span6">
+            <p class='oe_mt32'>
+Use open chatter to communicate with your team or customers and share comments
+and documents on tasks and issues. Integrate discussion fast with the email
+integration.
+            </p><p>
+Talk to others users or customers with the live chat feature.
+            </p>
+        </div>
+        <div class="oe_span6">
+            <img class="oe_picture oe_screenshot" src="project_chat.png">
+        </div>
+   </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row">
+        <h2 class="oe_slogan">Collaborative Writing</h2>
+        <h3 class="oe_slogan">The power of etherpad, inside your tasks</h3>
+        <div class="oe_span6">
+            <img class="oe_picture oe_screenshot" src="project_etherpad.png">
+        </div>
+        <div class="oe_span6">
+            <p class='oe_mt32'>
+Collaboratively edit the same specifications or meeting minutes right inside the
+application. The incorporated etherpad feature allows several people to work
+on the same tasks, at the same time.
+            </p>
+            <p>
+This is very efficient for scrum meetings, meeting minutes or complex
+specifications. Every user has their own color and you can replay the whole
+creation of the content.
+            </p>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container oe_dark">
+    <div class="oe_row">
+        <h2 class="oe_slogan">Get Work Done</h2>
+        <div class="oe_span6">
+            <p class='oe_mt32'>
+Get alerts on followed events to stay up to date with what interests you. Use
+instant green/red visual indicators to scan through what has been done and what
+requires your attention.
+            </p>
+        </div>
+        <div class="oe_span6">
+            <img class="oe_picture oe_screenshot" src="project_kpi.png">
+        </div>
+   </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row">
+        <h2 class="oe_slogan">Timesheets, Contracts &amp; Invoicing</h2>
+        <div class="oe_span6">
+            <img class="oe_screenshot oe_picture" src="project_timesheet.png">
+        </div>
+        <div class="oe_span6">
+            <p class='oe_mt32'>
+Projects are automatically integrated with customer contracts allowing you to
+invoice based on time &amp; materials and record timesheets easily.
+            </p>
+        </div>
+    </div>
+</section>
+
+
+<section class="oe_container oe_dark">
+    <div class="oe_row">
+        <h2 class="oe_slogan">Track Issues</h2>
+        <h3 class="oe_slogan">Support services, helpdesk, bug tracker, etc.</h3>
+        <div class="oe_span6">
+            <p class='oe_mt32'>
+Single out the issues that arise in a project in order to have a better focus
+on resolving them. Integrate customer interaction on every issue and get
+accurate reports on your team's performance.
+            </p>
+        </div>
+        <div class="oe_span6">
+            <div class="oe_bg_img oe_centered">
+                <img class="oe_picture" src="project_illu_01.png">
+            </div>
+        </div>
+   </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row">
+        <div class="oe_span12">
+            <h2 class="oe_slogan">Many companies already enjoy it</h2>
+            <h3 class="oe_slogan">Hear what they have to say !</h3>
+        </div>
+        <div class="oe_span6">
+            <div class="oe_quote">
+                <q>
+                    OpenERP provides essential platform for our project management.
+                    Things are better organized and much more visible with it.
+                </q>
+                <cite class="oe_cite oe_clearfix">
+                    <img class="oe_photo" src="Yoshi-Tashiro.png">
+                    <div class="oe_author">Yoshi Tashiro</div>
+                    <div class="oe_job">Managing Director, <a href="http://www.roomsfor.hk" target="_blank">RoomsFor (Hong Kong)</a></div>
+                </cite>
+            </div>
+        </div>
+        <div class="oe_span6">
+            <div class="oe_quote">
+                <q>
+                    The possibility to link the Project Management to Sales and Manufacturing widely
+                    extends the range of possible applications beyond the needs of service companies.
+                </q>
+                <cite class="oe_cite oe_clearfix">
+                    <img class="oe_photo" src="Mario-Riva.png">
+                    <div class="oe_author">Mario Riva</div>
+                    <div class="oe_job">COO, <a href="http://www.agilebg.com" target="_blank">Agile Business Group</a>.</div>
+                </cite>
+            </div>
+        </div>
+    </div>
+</section>
+<section class="oe_container oe_separator">
+</section>
diff --git a/addons/project/html/project_01.png b/addons/project/html/project_01.png
new file mode 100644
index 00000000000..0c86a2965d5
Binary files /dev/null and b/addons/project/html/project_01.png differ
diff --git a/addons/project/html/project_calendar.png b/addons/project/html/project_calendar.png
new file mode 100644
index 00000000000..f8c8fca7662
Binary files /dev/null and b/addons/project/html/project_calendar.png differ
diff --git a/addons/project/html/project_chat.png b/addons/project/html/project_chat.png
new file mode 100644
index 00000000000..8cb771e876f
Binary files /dev/null and b/addons/project/html/project_chat.png differ
diff --git a/addons/project/html/project_easy.png b/addons/project/html/project_easy.png
new file mode 100644
index 00000000000..4ffde14b42b
Binary files /dev/null and b/addons/project/html/project_easy.png differ
diff --git a/addons/project/html/project_etherpad.png b/addons/project/html/project_etherpad.png
new file mode 100644
index 00000000000..038b210ee18
Binary files /dev/null and b/addons/project/html/project_etherpad.png differ
diff --git a/addons/project/html/project_gantt.png b/addons/project/html/project_gantt.png
new file mode 100644
index 00000000000..34486b98558
Binary files /dev/null and b/addons/project/html/project_gantt.png differ
diff --git a/addons/project/html/project_illu_01.png b/addons/project/html/project_illu_01.png
new file mode 100644
index 00000000000..4fff4837faa
Binary files /dev/null and b/addons/project/html/project_illu_01.png differ
diff --git a/addons/project/html/project_kanban.png b/addons/project/html/project_kanban.png
new file mode 100644
index 00000000000..c541d3b5d08
Binary files /dev/null and b/addons/project/html/project_kanban.png differ
diff --git a/addons/project/html/project_kpi.png b/addons/project/html/project_kpi.png
new file mode 100644
index 00000000000..c58f8176098
Binary files /dev/null and b/addons/project/html/project_kpi.png differ
diff --git a/addons/project/html/project_timesheet.png b/addons/project/html/project_timesheet.png
new file mode 100644
index 00000000000..d06c3a924ec
Binary files /dev/null and b/addons/project/html/project_timesheet.png differ
diff --git a/addons/project/i18n/ru.po b/addons/project/i18n/ru.po
index 1743d66e55d..b64662f916b 100644
--- a/addons/project/i18n/ru.po
+++ b/addons/project/i18n/ru.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
-"PO-Revision-Date: 2013-03-14 06:44+0000\n"
+"PO-Revision-Date: 2013-05-28 06:22+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@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: 2013-03-16 04:56+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-05-29 05:37+0000\n"
+"X-Generator: Launchpad (build 16640)\n"
 
 #. module: project
 #: view:project.project:0
@@ -27,6 +27,8 @@ msgid ""
 "If checked, this contract will be available in the project menu and you will "
 "be able to manage tasks or track issues"
 msgstr ""
+"Если выбрано, этот контракт станет активным в меню проекта, и вы сможете "
+"редактировать задачи или отслеживать проблемы"
 
 #. module: project
 #: field:project.project,progress_rate:0
@@ -217,7 +219,7 @@ msgstr "Предложение контакта"
 #. module: project
 #: help:project.config.settings,group_time_work_estimation_tasks:0
 msgid "Allows you to compute Time Estimation on tasks."
-msgstr ""
+msgstr "Позволяет вычислить расход времени на задачи."
 
 #. module: project
 #: field:report.project.task.user,user_id:0
@@ -913,6 +915,8 @@ msgid ""
 "Provides management of issues/bugs in projects.\n"
 "                This installs the module project_issue."
 msgstr ""
+"Обеспечивает управление проблем / ошибок в проектах.\n"
+"                 Устанавливает модуль project_issue."
 
 #. module: project
 #: help:project.task,kanban_state:0
@@ -927,7 +931,7 @@ msgstr ""
 #. module: project
 #: view:project.task:0
 msgid "10"
-msgstr ""
+msgstr "10"
 
 #. module: project
 #: help:project.project,analytic_account_id:0
@@ -953,7 +957,7 @@ msgstr "Отменить"
 #. module: project
 #: view:project.project:0
 msgid "Other Info"
-msgstr ""
+msgstr "Прочая информация"
 
 #. module: project
 #: view:project.task.delegate:0
@@ -981,6 +985,8 @@ msgid ""
 "Follow this project to automatically track the events associated to tasks "
 "and issues of this project."
 msgstr ""
+"Позволяет проекту автоматически отслеживать события, связанные с задачами и "
+"проблемами этого проекта."
 
 #. module: project
 #: view:project.task:0
@@ -990,7 +996,7 @@ msgstr "Исполнитель"
 #. module: project
 #: model:mail.message.subtype,name:project.mt_task_stage
 msgid "Stage Changed"
-msgstr ""
+msgstr "Стадия изменена"
 
 #. module: project
 #: view:project.project:0
@@ -1006,7 +1012,7 @@ msgstr "Важное"
 #. module: project
 #: field:project.category,name:0
 msgid "Name"
-msgstr ""
+msgstr "Название"
 
 #. module: project
 #: selection:report.project.task.user,month:0
@@ -1033,7 +1039,7 @@ msgstr "Общие"
 #: help:project.project,message_ids:0
 #: help:project.task,message_ids:0
 msgid "Messages and communication history"
-msgstr ""
+msgstr "Сообщения и история общения"
 
 #. module: project
 #: view:project.project:0
@@ -1041,6 +1047,8 @@ msgid ""
 "To invoice or setup invoicing and renewal options, go to the related "
 "contract:"
 msgstr ""
+"Для выставления счета или изменения счета и обновления вариантов, перейти к "
+"соответствующему контракту:"
 
 #. module: project
 #: field:project.task.delegate,state:0
@@ -1097,7 +1105,7 @@ msgstr "Порученные задания"
 #: view:project.task:0
 #: field:project.task,message_unread:0
 msgid "Unread Messages"
-msgstr ""
+msgstr "Непрочитанные"
 
 #. module: project
 #: view:project.task:0
@@ -1139,7 +1147,7 @@ msgstr "Показывать только срочные задания"
 #. module: project
 #: model:project.category,name:project.project_category_04
 msgid "Usability"
-msgstr ""
+msgstr "Удобство использования"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -1156,7 +1164,7 @@ msgstr "Выполнил(а)"
 #: code:addons/project/project.py:181
 #, python-format
 msgid "Invalid Action!"
-msgstr ""
+msgstr "Неверное действие!"
 
 #. module: project
 #: help:project.task.type,state:0
@@ -1165,6 +1173,9 @@ msgid ""
 "stage. For example, if a stage is related to the status 'Close', when your "
 "document reaches this stage, it is automatically closed."
 msgstr ""
+"Статус документа автоматически изменяется по выбранному этапу. Например, "
+"если стадия связана со статусом «Закрыть» , когда ваш документ достигает "
+"этой стадии, оно автоматически закрывается."
 
 #. module: project
 #: view:project.task:0
@@ -1174,7 +1185,7 @@ msgstr "Доп. информация"
 #. module: project
 #: view:project.task:0
 msgid "Edit..."
-msgstr ""
+msgstr "Изменить..."
 
 #. module: project
 #: view:report.project.task.user:0
@@ -1185,7 +1196,7 @@ msgstr "№ задачи"
 #. module: project
 #: field:project.project,doc_count:0
 msgid "Number of documents attached"
-msgstr ""
+msgstr "Количество прикрепленных документов"
 
 #. module: project
 #: field:project.task,priority:0
@@ -1205,6 +1216,9 @@ msgid ""
 "automatically synchronizedwith Tasks (or optionally Issues if the Issue "
 "Tracker module is installed)."
 msgstr ""
+"Внутренние e-mail, связанный с этим проектом. Входящие письма автоматически "
+"синхронизируются с заданиями (или проблемами, если модуль Issue Tracker "
+"установлен)."
 
 #. module: project
 #: model:ir.actions.act_window,help:project.open_task_type_form
@@ -1237,7 +1251,7 @@ msgstr "%s (копия)"
 #. module: project
 #: model:mail.message.subtype,name:project.mt_project_task_stage
 msgid "Task Stage Changed"
-msgstr ""
+msgstr "Этап задачи изменен"
 
 #. module: project
 #: view:project.task:0
@@ -1269,12 +1283,12 @@ msgstr "Время отсрочки"
 #. module: project
 #: view:project.project:0
 msgid "Team"
-msgstr ""
+msgstr "Группа"
 
 #. module: project
 #: help:project.config.settings,time_unit:0
 msgid "This will set the unit of measure used in projects and tasks."
-msgstr ""
+msgstr "Установить единицу измерения, используемую в проектах и задачах."
 
 #. module: project
 #: selection:project.task,priority:0
@@ -1328,7 +1342,7 @@ msgstr "Заголовок вашего проверочного задания"
 #. module: project
 #: field:project.config.settings,time_unit:0
 msgid "Working time unit"
-msgstr ""
+msgstr "Единица рабочего времени"
 
 #. module: project
 #: view:project.project:0
@@ -1344,7 +1358,7 @@ msgstr "Низкий"
 #. module: project
 #: selection:project.project,state:0
 msgid "Closed"
-msgstr ""
+msgstr "Закрыто"
 
 #. module: project
 #: view:project.project:0
@@ -1366,7 +1380,7 @@ msgstr "В ожидании"
 #: view:project.category:0
 #: field:project.task,categ_ids:0
 msgid "Tags"
-msgstr ""
+msgstr "Теги"
 
 #. module: project
 #: model:ir.model,name:project.model_project_task_history
@@ -1386,7 +1400,7 @@ msgstr ""
 #. module: project
 #: help:project.config.settings,group_manage_delegation_task:0
 msgid "Allows you to delegate tasks to other users."
-msgstr ""
+msgstr "Позволяет делегировать задачи другим пользователям."
 
 #. module: project
 #: field:project.project,active:0
@@ -1415,7 +1429,7 @@ msgstr ""
 #. module: project
 #: view:project.config.settings:0
 msgid "Helpdesk & Support"
-msgstr ""
+msgstr "Поддержка"
 
 #. module: project
 #: help:report.project.task.user,opening_days:0
@@ -1441,7 +1455,7 @@ msgstr ""
 #: code:addons/project/project.py:220
 #, python-format
 msgid "Attachments"
-msgstr ""
+msgstr "Вложения"
 
 #. module: project
 #: view:project.task:0
@@ -1464,6 +1478,8 @@ msgid ""
 "You cannot delete a project containing tasks. You can either delete all the "
 "project's tasks and then delete the project or simply deactivate the project."
 msgstr ""
+"Вы не можете удалить проект, содержащий задачи. Вы можете либо удалить все "
+"задачи проекта, а затем удалить проект или просто сделать проект неактивным."
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_draftopentask0
@@ -1474,7 +1490,7 @@ msgstr "Открытые"
 #. module: project
 #: field:project.project,privacy_visibility:0
 msgid "Privacy / Visibility"
-msgstr ""
+msgstr "Безопасность/Видимость"
 
 #. module: project
 #: view:project.task:0
@@ -1488,7 +1504,7 @@ msgstr "Оставшееся время"
 #. module: project
 #: model:mail.message.subtype,description:project.mt_task_stage
 msgid "Stage changed"
-msgstr ""
+msgstr "Этап изменен"
 
 #. module: project
 #: constraint:project.task:0
@@ -1521,7 +1537,7 @@ msgstr "Общее время"
 #. module: project
 #: model:ir.model,name:project.model_project_config_settings
 msgid "project.config.settings"
-msgstr ""
+msgstr "project.config.settings"
 
 #. module: project
 #: model:project.task.type,name:project.project_tt_development
@@ -1586,12 +1602,12 @@ msgstr "Назначить на"
 #. module: project
 #: model:res.groups,name:project.group_time_work_estimation_tasks
 msgid "Time Estimation on Tasks"
-msgstr ""
+msgstr "Оценка времени на задачи"
 
 #. module: project
 #: field:project.task,total_hours:0
 msgid "Total"
-msgstr ""
+msgstr "Всего"
 
 #. module: project
 #: model:process.node,note:project.process_node_taskbydelegate0
@@ -1601,7 +1617,7 @@ msgstr "Поручить ваше задание другому пользова
 #. module: project
 #: model:mail.message.subtype,description:project.mt_task_started
 msgid "Task started"
-msgstr ""
+msgstr "Задание начато"
 
 #. module: project
 #: help:project.task.reevaluate,remaining_hours:0
@@ -1614,6 +1630,8 @@ msgid ""
 "This stage is not visible, for example in status bar or kanban view, when "
 "there are no records in that stage to display."
 msgstr ""
+"Эта стадия не видима, например в статус-баре или виде канбан, когда нет "
+"записей на этой стадии для отображения."
 
 #. module: project
 #: view:project.task:0
@@ -1643,7 +1661,7 @@ msgstr "Проекты в ожидании"
 #. module: project
 #: view:project.task:0
 msgid "Remaining"
-msgstr ""
+msgstr "Осталось"
 
 #. module: project
 #: field:project.task,progress:0
@@ -1672,17 +1690,17 @@ msgstr ""
 #. module: project
 #: field:project.config.settings,module_project_issue:0
 msgid "Track issues and bugs"
-msgstr ""
+msgstr "Отслеживание проблем и ошибок"
 
 #. module: project
 #: field:project.config.settings,module_project_mrp:0
 msgid "Generate tasks from sale orders"
-msgstr ""
+msgstr "Создание задач из заказов"
 
 #. module: project
 #: model:ir.ui.menu,name:project.menu_task_types_view
 msgid "Task Stages"
-msgstr ""
+msgstr "Этапы задач"
 
 #. module: project
 #: model:process.node,note:project.process_node_drafttask0
@@ -1693,7 +1711,7 @@ msgstr "Определить требования и установить зап
 #: field:project.project,message_ids:0
 #: field:project.task,message_ids:0
 msgid "Messages"
-msgstr ""
+msgstr "Сообщения"
 
 #. module: project
 #: field:project.project,color:0
@@ -1752,17 +1770,17 @@ msgstr "Дата окончания"
 #. module: project
 #: field:project.task.type,state:0
 msgid "Related Status"
-msgstr ""
+msgstr "Связанный статус"
 
 #. module: project
 #: view:project.project:0
 msgid "Documents"
-msgstr ""
+msgstr "Документы"
 
 #. module: project
 #: model:mail.message.subtype,description:project.mt_task_new
 msgid "Task created"
-msgstr ""
+msgstr "Задача создана"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -1774,7 +1792,7 @@ msgstr "# дней"
 #: field:project.project,message_follower_ids:0
 #: field:project.task,message_follower_ids:0
 msgid "Followers"
-msgstr ""
+msgstr "Подписчики"
 
 #. module: project
 #: selection:project.project,state:0
@@ -1812,7 +1830,7 @@ msgstr "Проверка задания"
 #. module: project
 #: field:project.config.settings,module_project_long_term:0
 msgid "Manage resources planning on gantt view"
-msgstr ""
+msgstr "Управление планированием ресурсов на диаграмме Ганта"
 
 #. module: project
 #: view:project.task:0
@@ -1871,7 +1889,7 @@ msgstr "Проекты"
 #. module: project
 #: model:res.groups,name:project.group_tasks_work_on_tasks
 msgid "Task's Work on Tasks"
-msgstr ""
+msgstr "Задачи, работающие на задачи"
 
 #. module: project
 #: help:project.task.delegate,name:0
@@ -1914,7 +1932,7 @@ msgstr "Декабрь"
 #: view:project.task.delegate:0
 #: view:project.task.reevaluate:0
 msgid "or"
-msgstr ""
+msgstr "или"
 
 #. module: project
 #: help:project.config.settings,module_project_mrp:0
@@ -1938,7 +1956,7 @@ msgstr ""
 #. module: project
 #: model:project.category,name:project.project_category_03
 msgid "Experiment"
-msgstr ""
+msgstr "Эксперимент"
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_opendrafttask0
@@ -1998,7 +2016,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:project.action_config_settings
 #: view:project.config.settings:0
 msgid "Configure Project"
-msgstr ""
+msgstr "Настроить проект"
 
 #. module: project
 #: view:project.task.history.cumulative:0
@@ -2030,7 +2048,7 @@ msgstr "Пожалуйста, сначала удалите проект, ссы
 #: model:mail.message.subtype,name:project.mt_project_task_new
 #: model:mail.message.subtype,name:project.mt_task_new
 msgid "Task Created"
-msgstr ""
+msgstr "Задание создано"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -2048,12 +2066,12 @@ msgstr "Проекты, в которых я менеджер"
 #: selection:project.task.history,kanban_state:0
 #: selection:project.task.history.cumulative,kanban_state:0
 msgid "Ready for next stage"
-msgstr ""
+msgstr "Готово к следующей стадии"
 
 #. module: project
 #: field:project.task.type,case_default:0
 msgid "Default for New Projects"
-msgstr ""
+msgstr "По умолчанию для нового проекта"
 
 #. module: project
 #: view:project.task:0
@@ -2098,7 +2116,7 @@ msgstr ""
 #. module: project
 #: model:mail.message.subtype,description:project.mt_task_closed
 msgid "Task closed"
-msgstr ""
+msgstr "Задание закрыто"
 
 #. module: project
 #: selection:report.project.task.user,month:0
@@ -2130,13 +2148,13 @@ msgstr ""
 #. module: project
 #: selection:project.project,privacy_visibility:0
 msgid "Followers Only"
-msgstr ""
+msgstr "Только для подписчиков"
 
 #. module: project
 #: view:board.board:0
 #: field:project.project,task_count:0
 msgid "Open Tasks"
-msgstr ""
+msgstr "Открытые задачи"
 
 #. module: project
 #: field:project.project,priority:0
diff --git a/addons/project/i18n/th.po b/addons/project/i18n/th.po
new file mode 100644
index 00000000000..7dfd58eee63
--- /dev/null
+++ b/addons/project/i18n/th.po
@@ -0,0 +1,2109 @@
+# Thai 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: 2012-12-21 17:04+0000\n"
+"PO-Revision-Date: 2013-05-15 07:02+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Thai <th@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: 2013-05-16 05:12+0000\n"
+"X-Generator: Launchpad (build 16626)\n"
+
+#. module: project
+#: view:project.project:0
+msgid "Email Interface"
+msgstr ""
+
+#. module: project
+#: help:account.analytic.account,use_tasks:0
+msgid ""
+"If checked, this contract will be available in the project menu and you will "
+"be able to manage tasks or track issues"
+msgstr ""
+
+#. module: project
+#: field:project.project,progress_rate:0
+#: view:report.project.task.user:0
+#: field:report.project.task.user,progress:0
+msgid "Progress"
+msgstr ""
+
+#. module: project
+#: model:process.node,name:project.process_node_taskbydelegate0
+msgid "Task by delegate"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+msgid "Parent"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.dblc_proj
+msgid "Project's tasks"
+msgstr ""
+
+#. module: project
+#: field:project.task.type,name:0
+msgid "Stage Name"
+msgstr ""
+
+#. module: project
+#: model:process.transition.action,name:project.process_transition_action_openpendingtask0
+msgid "Set pending"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+msgid "New Project Based on Template"
+msgstr ""
+
+#. module: project
+#: view:report.project.task.user:0
+#: field:report.project.task.user,day:0
+msgid "Day"
+msgstr ""
+
+#. module: project
+#: model:project.task.type,name:project.project_tt_merge
+msgid "Merge"
+msgstr ""
+
+#. module: project
+#: view:res.partner:0
+msgid "Start Task"
+msgstr ""
+
+#. module: project
+#: code:addons/project/project.py:932
+#, python-format
+msgid "Warning !"
+msgstr ""
+
+#. module: project
+#: help:project.project,message_unread:0
+#: help:project.task,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: project
+#: model:process.node,name:project.process_node_donetask0
+msgid "Done task"
+msgstr ""
+
+#. module: project
+#: model:process.node,note:project.process_node_donetask0
+msgid "Task is Completed"
+msgstr ""
+
+#. module: project
+#: view:res.partner:0
+msgid "False"
+msgstr ""
+
+#. module: project
+#: model:project.task.type,name:project.project_tt_testing
+msgid "Testing"
+msgstr ""
+
+#. module: project
+#: model:ir.model,name:project.model_account_analytic_account
+msgid "Analytic Account"
+msgstr ""
+
+#. module: project
+#: field:project.config.settings,group_time_work_estimation_tasks:0
+msgid "Manage time estimation on tasks"
+msgstr ""
+
+#. module: project
+#: help:project.project,message_summary:0
+#: help:project.task,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
+msgstr ""
+
+#. module: project
+#: code:addons/project/project.py:432
+#: code:addons/project/project.py:1318
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: project
+#: model:ir.model,name:project.model_res_partner
+msgid "Partner"
+msgstr ""
+
+#. module: project
+#: field:project.config.settings,group_manage_delegation_task:0
+msgid "Allow task delegation"
+msgstr ""
+
+#. module: project
+#: field:project.task.delegate,planned_hours:0
+#: view:report.project.task.user:0
+#: field:report.project.task.user,hours_planned:0
+msgid "Planned Hours"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+msgid "Reset as Project"
+msgstr ""
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "In progress tasks"
+msgstr ""
+
+#. module: project
+#: help:project.project,progress_rate:0
+msgid "Percent of tasks closed according to the total of tasks todo."
+msgstr ""
+
+#. module: project
+#: model:ir.actions.client,name:project.action_client_project_menu
+msgid "Open Project Menu"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,help:project.action_project_task_user_tree
+msgid ""
+"This report allows you to analyse the performance of your projects and "
+"users. You can analyse the quantities of tasks, the hours spent compared to "
+"the planned hours, the average number of days to open or close a task, etc."
+msgstr ""
+
+#. module: project
+#: view:project.task.delegate:0
+msgid "Validation Task Title"
+msgstr ""
+
+#. module: project
+#: model:res.groups,name:project.group_delegate_task
+msgid "Task Delegation"
+msgstr ""
+
+#. module: project
+#: field:project.project,planned_hours:0
+#: field:project.task.history,planned_hours:0
+#: field:project.task.history.cumulative,planned_hours:0
+msgid "Planned Time"
+msgstr ""
+
+#. module: project
+#: selection:project.project,privacy_visibility:0
+msgid "Public"
+msgstr ""
+
+#. module: project
+#: model:project.category,name:project.project_category_01
+msgid "Contact's suggestion"
+msgstr ""
+
+#. module: project
+#: help:project.config.settings,group_time_work_estimation_tasks:0
+msgid "Allows you to compute Time Estimation on tasks."
+msgstr ""
+
+#. module: project
+#: field:report.project.task.user,user_id:0
+msgid "Assigned To"
+msgstr ""
+
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_closed
+#: model:mail.message.subtype,name:project.mt_task_closed
+msgid "Task Done"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+#: view:report.project.task.user:0
+#: field:report.project.task.user,partner_id:0
+msgid "Contact"
+msgstr ""
+
+#. module: project
+#: model:process.transition,name:project.process_transition_delegate0
+#: view:project.task:0
+msgid "Delegate"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.open_view_template_project
+#: view:project.project:0
+msgid "Templates of Projects"
+msgstr ""
+
+#. module: project
+#: field:project.project,analytic_account_id:0
+msgid "Contract/Analytic"
+msgstr ""
+
+#. module: project
+#: view:project.config.settings:0
+msgid "Project Management"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_delegate
+#: view:project.task.delegate:0
+msgid "Project Task Delegate"
+msgstr ""
+
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_started
+#: model:mail.message.subtype,name:project.mt_task_started
+msgid "Task Started"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "Very Important"
+msgstr ""
+
+#. module: project
+#: view:project.config.settings:0
+msgid "Support"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+msgid "Member"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "Cancel Task"
+msgstr ""
+
+#. module: project
+#: help:project.project,members:0
+msgid ""
+"Project's members are users who can have an access to the tasks related to "
+"this project."
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+#: field:project.task,manager_id:0
+msgid "Project Manager"
+msgstr ""
+
+#. module: project
+#: field:project.project,state:0
+#: field:project.task,state:0
+#: field:project.task.history,state:0
+#: field:project.task.history.cumulative,state:0
+#: field:report.project.task.user,state:0
+msgid "Status"
+msgstr ""
+
+#. module: project
+#: selection:report.project.task.user,month:0
+msgid "August"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+#: field:project.project,complete_name:0
+msgid "Project Name"
+msgstr ""
+
+#. module: project
+#: selection:report.project.task.user,month:0
+msgid "June"
+msgstr ""
+
+#. module: project
+#: selection:report.project.task.user,month:0
+msgid "October"
+msgstr ""
+
+#. module: project
+#: help:project.project,total_hours:0
+msgid ""
+"Sum of total hours of all tasks related to this project and its child "
+"projects."
+msgstr ""
+
+#. module: project
+#: help:project.project,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the project "
+"without removing it."
+msgstr ""
+
+#. module: project
+#: model:process.transition,note:project.process_transition_opendonetask0
+msgid "When task is completed, it will come into the done state."
+msgstr ""
+
+#. module: project
+#: field:project.project,message_summary:0
+#: field:project.task,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+msgid "Append this project to another one using analytic accounts hierarchy"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+#: view:project.task.history.cumulative:0
+msgid "In Progress Tasks"
+msgstr ""
+
+#. module: project
+#: help:res.company,project_time_mode_id:0
+msgid ""
+"This will set the unit of measure used in projects and tasks.\n"
+"If you use the timesheet linked to projects (project_timesheet module), "
+"don't forget to setup the right unit of measure in your employees."
+msgstr ""
+
+#. module: project
+#: field:project.task,user_id:0
+#: view:report.project.task.user:0
+msgid "Assigned to"
+msgstr ""
+
+#. module: project
+#: code:addons/project/project.py:1021
+#, python-format
+msgid "Delegated User should be specified"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+msgid "Project(s) Manager"
+msgstr ""
+
+#. module: project
+#: selection:project.project,state:0
+#: view:project.task:0
+#: selection:project.task,state:0
+#: selection:project.task.history,state:0
+#: selection:project.task.history.cumulative,state:0
+#: selection:project.task.type,state:0
+#: selection:report.project.task.user,state:0
+msgid "In Progress"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "Reactivate"
+msgstr ""
+
+#. module: project
+#: field:project.project,resource_calendar_id:0
+msgid "Working Time"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_reevaluate
+msgid "Re-evaluate Task"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "Validate planned time"
+msgstr ""
+
+#. module: project
+#: field:project.config.settings,module_pad:0
+msgid "Use integrated collaborative note pads on task"
+msgstr ""
+
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_blocked
+#: model:mail.message.subtype,name:project.mt_task_blocked
+msgid "Task Blocked"
+msgstr ""
+
+#. module: project
+#: model:process.node,note:project.process_node_opentask0
+msgid "Encode your working hours."
+msgstr ""
+
+#. module: project
+#: field:project.project,alias_id:0
+msgid "Alias"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "oe_kanban_text_red"
+msgstr ""
+
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_blocked
+msgid "Task blocked"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "Delegation"
+msgstr ""
+
+#. module: project
+#: field:project.task,create_date:0
+msgid "Create Date"
+msgstr ""
+
+#. module: project
+#: view:res.partner:0
+msgid "For changing to open state"
+msgstr ""
+
+#. module: project
+#: view:project.config.settings:0
+msgid "Apply"
+msgstr ""
+
+#. module: project
+#: model:ir.model,name:project.model_project_task_delegate
+msgid "Task Delegate"
+msgstr ""
+
+#. module: project
+#: help:project.task.delegate,new_task_description:0
+msgid "Reinclude the description of the task in the task of the user"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+msgid "Project Settings"
+msgstr ""
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "My tasks"
+msgstr ""
+
+#. module: project
+#: model:process.transition,name:project.process_transition_opendonetask0
+msgid "Open Done Task"
+msgstr ""
+
+#. module: project
+#: field:project.task.delegate,planned_hours_me:0
+msgid "Hours to Validate"
+msgstr ""
+
+#. module: project
+#: help:project.task,remaining_hours:0
+msgid ""
+"Total remaining time, can be re-estimated periodically by the assignee of "
+"the task."
+msgstr ""
+
+#. module: project
+#: selection:report.project.task.user,month:0
+msgid "March"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+#: model:ir.actions.act_window,name:project.my_open_tasks_action
+#: view:project.task:0
+#: view:project.task.history.cumulative:0
+msgid "My Tasks"
+msgstr ""
+
+#. module: project
+#: constraint:project.task:0
+msgid "Error ! You cannot create recursive tasks."
+msgstr ""
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "Pending tasks"
+msgstr ""
+
+#. module: project
+#: view:project.task.reevaluate:0
+msgid "_Evaluate"
+msgstr ""
+
+#. module: project
+#: view:report.project.task.user:0
+#: field:report.project.task.user,opening_days:0
+msgid "Days to Open"
+msgstr ""
+
+#. module: project
+#: selection:report.project.task.user,priority:0
+msgid "Very urgent"
+msgstr ""
+
+#. module: project
+#: help:project.task.delegate,project_id:0
+#: help:project.task.delegate,user_id:0
+msgid "User you want to delegate this task to"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+msgid "Set as Template"
+msgstr ""
+
+#. module: project
+#: model:ir.model,name:project.model_project_task
+#: view:project.config.settings:0
+#: view:project.project:0
+#: view:project.task:0
+#: field:project.task.history,task_id:0
+#: field:project.task.history.cumulative,task_id:0
+#: field:project.task.work,task_id:0
+#: view:report.project.task.user:0
+msgid "Task"
+msgstr ""
+
+#. module: project
+#: help:project.config.settings,group_tasks_work_on_tasks:0
+msgid "Allows you to compute work on tasks."
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+msgid "Administration"
+msgstr ""
+
+#. module: project
+#: field:project.config.settings,group_tasks_work_on_tasks:0
+msgid "Log work activities on tasks"
+msgstr ""
+
+#. module: project
+#: model:project.task.type,name:project.project_tt_analysis
+msgid "Analysis"
+msgstr ""
+
+#. module: project
+#: field:project.task,name:0
+#: field:report.project.task.user,name:0
+msgid "Task Summary"
+msgstr ""
+
+#. module: project
+#: field:project.task,active:0
+msgid "Not a Template Task"
+msgstr ""
+
+#. module: project
+#: field:project.task,planned_hours:0
+msgid "Initially Planned Hours"
+msgstr ""
+
+#. module: project
+#: model:process.transition,note:project.process_transition_delegate0
+msgid "Delegates tasks to the other user"
+msgstr ""
+
+#. module: project
+#: help:project.task,effective_hours:0
+msgid "Computed using the sum of the task work done."
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,help:project.open_view_project_all
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                  Click to start a new project.\n"
+"                </p><p>\n"
+"                  Projects are used to organize your activities; plan\n"
+"                  tasks, track issues, invoice timesheets. You can define\n"
+"                  internal projects (R&amp;D, Improve Sales Process),\n"
+"                  private projects (My Todos) or customer ones.\n"
+"                </p><p>\n"
+"                  You will be able collaborate with internal users on\n"
+"                  projects or invite customers to share your activities.\n"
+"                </p>\n"
+"            "
+msgstr ""
+
+#. module: project
+#: view:project.config.settings:0
+msgid "Planning"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+#: field:project.task,date_deadline:0
+#: field:report.project.task.user,date_deadline:0
+msgid "Deadline"
+msgstr ""
+
+#. module: project
+#: view:project.task.history.cumulative:0
+msgid "Ready"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "New Tasks"
+msgstr ""
+
+#. module: project
+#: field:project.config.settings,module_project_issue_sheet:0
+msgid "Invoice working time on issues"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+#: view:project.task:0
+#: field:project.task.history,end_date:0
+#: field:project.task.history.cumulative,end_date:0
+msgid "End Date"
+msgstr ""
+
+#. module: project
+#: model:project.task.type,name:project.project_tt_specification
+msgid "Specification"
+msgstr ""
+
+#. module: project
+#: model:process.transition,note:project.process_transition_draftopentask0
+msgid "From draft state, it will come into the open state."
+msgstr ""
+
+#. module: project
+#: view:project.task.history.cumulative:0
+msgid "Task's Analysis"
+msgstr ""
+
+#. module: project
+#: view:project.task.delegate:0
+#: field:project.task.delegate,new_task_description:0
+msgid "New Task Description"
+msgstr ""
+
+#. module: project
+#: field:report.project.task.user,delay_endings_days:0
+msgid "Overpassed Deadline"
+msgstr ""
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "New tasks"
+msgstr ""
+
+#. module: project
+#: selection:project.task,priority:0
+#: selection:report.project.task.user,priority:0
+msgid "Medium"
+msgstr ""
+
+#. module: project
+#: field:project.project,total_hours:0
+msgid "Total Time"
+msgstr ""
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "Creation Date"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+msgid "Miscellaneous"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+#: field:project.task,stage_id:0
+#: field:project.task.history,type_id:0
+#: field:project.task.history.cumulative,type_id:0
+msgid "Stage"
+msgstr ""
+
+#. module: project
+#: model:process.transition,name:project.process_transition_draftopentask0
+msgid "Draft Open task"
+msgstr ""
+
+#. module: project
+#: field:project.project,alias_model:0
+msgid "Alias Model"
+msgstr ""
+
+#. module: project
+#: help:report.project.task.user,closing_days:0
+msgid "Number of Days to close the task"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "My Board"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.open_task_type_form
+msgid "Stages"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+#: view:project.task:0
+msgid "Delete"
+msgstr ""
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "In progress"
+msgstr ""
+
+#. module: project
+#: selection:report.project.task.user,month:0
+msgid "September"
+msgstr ""
+
+#. module: project
+#: selection:report.project.task.user,priority:0
+msgid "Urgent"
+msgstr ""
+
+#. module: project
+#: model:project.category,name:project.project_category_02
+msgid "Feature request"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "Delegated tasks"
+msgstr ""
+
+#. module: project
+#: model:ir.model,name:project.model_project_task_work
+msgid "Project Task Work"
+msgstr ""
+
+#. module: project
+#: code:addons/project/wizard/project_task_delegate.py:81
+#, python-format
+msgid "CHECK: %s"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+msgid "Close Project"
+msgstr ""
+
+#. module: project
+#: field:project.project,tasks:0
+msgid "Task Activities"
+msgstr ""
+
+#. module: project
+#: field:project.project,effective_hours:0
+#: field:project.task.work,hours:0
+msgid "Time Spent"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+#: view:project.task:0
+msgid "í"
+msgstr ""
+
+#. module: project
+#: field:account.analytic.account,company_uom_id:0
+msgid "unknown"
+msgstr ""
+
+#. module: project
+#: field:project.project,message_is_follower:0
+#: field:project.task,message_is_follower:0
+msgid "Is a Follower"
+msgstr ""
+
+#. module: project
+#: field:project.task,work_ids:0
+msgid "Work done"
+msgstr ""
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: project
+#: model:ir.ui.menu,name:project.menu_tasks_config
+msgid "GTD"
+msgstr ""
+
+#. module: project
+#: help:project.task,state:0
+msgid ""
+"The status is set to 'Draft', when a case is created.                      "
+"If the case is in progress the status is set to 'Open'.                      "
+"When the case is over, the status is set to 'Done'.                      If "
+"the case needs to be reviewed then the status is                       set "
+"to 'Pending'."
+msgstr ""
+
+#. module: project
+#: model:ir.model,name:project.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: project
+#: field:project.task.type,fold:0
+msgid "Folded by Default"
+msgstr ""
+
+#. module: project
+#: field:project.task.history,date:0
+#: field:project.task.history.cumulative,date:0
+#: field:project.task.work,date:0
+msgid "Date"
+msgstr ""
+
+#. module: project
+#: help:project.config.settings,module_project_issue:0
+msgid ""
+"Provides management of issues/bugs in projects.\n"
+"                This installs the module project_issue."
+msgstr ""
+
+#. module: project
+#: help:project.task,kanban_state:0
+msgid ""
+"A task's kanban state indicates special situations affecting it:\n"
+" * Normal is the default situation\n"
+" * Blocked indicates something is preventing the progress of this task\n"
+" * Ready for next stage indicates the task is ready to be pulled to the next "
+"stage"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "10"
+msgstr ""
+
+#. module: project
+#: help:project.project,analytic_account_id:0
+msgid ""
+"Link this project to an analytic account if you need financial management on "
+"projects. It enables you to connect projects with budgets, planning, cost "
+"and revenue analysis, timesheets on projects, etc."
+msgstr ""
+
+#. module: project
+#: model:process.transition.action,name:project.process_transition_action_draftcanceltask0
+#: model:process.transition.action,name:project.process_transition_action_opencanceltask0
+#: view:project.config.settings:0
+#: view:project.task.delegate:0
+#: view:project.task.reevaluate:0
+msgid "Cancel"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+msgid "Other Info"
+msgstr ""
+
+#. module: project
+#: view:project.task.delegate:0
+msgid "_Delegate"
+msgstr ""
+
+#. module: project
+#: selection:project.task,priority:0
+#: selection:report.project.task.user,priority:0
+msgid "Very Low"
+msgstr ""
+
+#. module: project
+#: help:project.project,effective_hours:0
+msgid ""
+"Sum of spent hours of all tasks related to this project and its child "
+"projects."
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+msgid ""
+"Follow this project to automatically track the events associated to tasks "
+"and issues of this project."
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "Users"
+msgstr ""
+
+#. module: project
+#: model:mail.message.subtype,name:project.mt_task_stage
+msgid "Stage Changed"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+#: model:res.groups,name:project.group_project_manager
+msgid "Manager"
+msgstr ""
+
+#. module: project
+#: selection:project.task,priority:0
+msgid "Important"
+msgstr ""
+
+#. module: project
+#: field:project.category,name:0
+msgid "Name"
+msgstr ""
+
+#. module: project
+#: selection:report.project.task.user,month:0
+msgid "November"
+msgstr ""
+
+#. module: project
+#: view:project.task.reevaluate:0
+msgid "Reevaluate Task"
+msgstr ""
+
+#. module: project
+#: model:ir.model,name:project.model_project_task_type
+#: view:project.task.type:0
+msgid "Task Stage"
+msgstr ""
+
+#. module: project
+#: view:project.task.type:0
+msgid "Common"
+msgstr ""
+
+#. module: project
+#: help:project.project,message_ids:0
+#: help:project.task,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+msgid ""
+"To invoice or setup invoicing and renewal options, go to the related "
+"contract:"
+msgstr ""
+
+#. module: project
+#: field:project.task.delegate,state:0
+msgid "Validation State"
+msgstr ""
+
+#. module: project
+#: field:project.task.work,name:0
+msgid "Work summary"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+#: view:project.task:0
+#: view:report.project.task.user:0
+msgid "Group By..."
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+#: selection:project.project,state:0
+msgid "Template"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+msgid "Re-open project"
+msgstr ""
+
+#. module: project
+#: help:project.project,priority:0
+msgid "Gives the sequence order when displaying the list of projects"
+msgstr ""
+
+#. module: project
+#: constraint:project.project:0
+msgid "Error! project start-date must be lower then project end-date."
+msgstr ""
+
+#. module: project
+#: field:project.project,members:0
+msgid "Project Members"
+msgstr ""
+
+#. module: project
+#: field:project.task,child_ids:0
+msgid "Delegated Tasks"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+#: field:project.project,message_unread:0
+#: view:project.task:0
+#: field:project.task,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+#: field:project.task,parent_ids:0
+msgid "Parent Tasks"
+msgstr ""
+
+#. module: project
+#: model:process.node,name:project.process_node_opentask0
+msgid "Open task"
+msgstr ""
+
+#. module: project
+#: view:project.task.type:0
+msgid "Stages common to all projects"
+msgstr ""
+
+#. module: project
+#: model:process.node,name:project.process_node_drafttask0
+msgid "Draft task"
+msgstr ""
+
+#. module: project
+#: field:project.task,notes:0
+msgid "Notes"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+#: view:project.task.history.cumulative:0
+msgid "Pending Tasks"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "Show only tasks having a deadline"
+msgstr ""
+
+#. module: project
+#: model:project.category,name:project.project_category_04
+msgid "Usability"
+msgstr ""
+
+#. module: project
+#: view:report.project.task.user:0
+#: field:report.project.task.user,hours_delay:0
+msgid "Avg. Plan.-Eff."
+msgstr ""
+
+#. module: project
+#: field:project.task.work,user_id:0
+msgid "Done by"
+msgstr ""
+
+#. module: project
+#: code:addons/project/project.py:181
+#, python-format
+msgid "Invalid Action!"
+msgstr ""
+
+#. module: project
+#: help:project.task.type,state:0
+msgid ""
+"The status of your document is automatically changed regarding the selected "
+"stage. For example, if a stage is related to the status 'Close', when your "
+"document reaches this stage, it is automatically closed."
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "Extra Info"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "Edit..."
+msgstr ""
+
+#. module: project
+#: view:report.project.task.user:0
+#: field:report.project.task.user,nbr:0
+msgid "# of tasks"
+msgstr ""
+
+#. module: project
+#: field:project.project,doc_count:0
+msgid "Number of documents attached"
+msgstr ""
+
+#. module: project
+#: field:project.task,priority:0
+#: field:report.project.task.user,priority:0
+msgid "Priority"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+msgid "Open Projects"
+msgstr ""
+
+#. module: project
+#: help:project.project,alias_id:0
+msgid ""
+"Internal email associated with this project. Incoming emails are "
+"automatically synchronizedwith Tasks (or optionally Issues if the Issue "
+"Tracker module is installed)."
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,help:project.open_task_type_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to add a stage in the task pipeline.\n"
+"              </p><p>\n"
+"                Define the steps that will be used in the project from the\n"
+"                creation of the task, up to the closing of the task or "
+"issue.\n"
+"                You will use these stages in order to track the progress in\n"
+"                solving a task or an issue.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: project
+#: help:project.task,total_hours:0
+msgid "Computed as: Time Spent + Remaining Time."
+msgstr ""
+
+#. module: project
+#: code:addons/project/project.py:356
+#: code:addons/project/project.py:377
+#: code:addons/project/project.py:709
+#, python-format
+msgid "%s (copy)"
+msgstr ""
+
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_stage
+msgid "Task Stage Changed"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+#: field:project.task.history,remaining_hours:0
+#: field:project.task.history.cumulative,remaining_hours:0
+msgid "Remaining Time"
+msgstr ""
+
+#. module: project
+#: field:project.task.delegate,name:0
+msgid "Delegated Title"
+msgstr ""
+
+#. module: project
+#: selection:report.project.task.user,month:0
+msgid "July"
+msgstr ""
+
+#. module: project
+#: model:ir.model,name:project.model_project_task_reevaluate
+msgid "project.task.reevaluate"
+msgstr ""
+
+#. module: project
+#: field:project.task,delay_hours:0
+msgid "Delay Hours"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+msgid "Team"
+msgstr ""
+
+#. module: project
+#: help:project.config.settings,time_unit:0
+msgid "This will set the unit of measure used in projects and tasks."
+msgstr ""
+
+#. module: project
+#: selection:project.task,priority:0
+msgid "Very important"
+msgstr ""
+
+#. module: project
+#: view:report.project.task.user:0
+#: field:report.project.task.user,month:0
+msgid "Month"
+msgstr ""
+
+#. module: project
+#: model:project.task.type,name:project.project_tt_design
+msgid "Design"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "Start Date"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+#: selection:project.task,kanban_state:0
+#: selection:project.task.history,kanban_state:0
+#: view:project.task.history.cumulative:0
+#: selection:project.task.history.cumulative,kanban_state:0
+msgid "Blocked"
+msgstr ""
+
+#. module: project
+#: help:project.task,progress:0
+msgid ""
+"If the task has a progress of 99.99% you should close the task if it's "
+"finished or reevaluate the time"
+msgstr ""
+
+#. module: project
+#: field:project.task,user_email:0
+msgid "User Email"
+msgstr ""
+
+#. module: project
+#: help:project.task.delegate,prefix:0
+msgid "Title for your validation task"
+msgstr ""
+
+#. module: project
+#: field:project.config.settings,time_unit:0
+msgid "Working time unit"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+msgid "Projects in which I am a member."
+msgstr ""
+
+#. module: project
+#: selection:project.task,priority:0
+#: selection:report.project.task.user,priority:0
+msgid "Low"
+msgstr ""
+
+#. module: project
+#: selection:project.project,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+#: selection:project.project,state:0
+#: view:project.task:0
+#: selection:project.task,state:0
+#: selection:project.task.delegate,state:0
+#: selection:project.task.history,state:0
+#: selection:project.task.history.cumulative,state:0
+#: selection:project.task.type,state:0
+#: view:report.project.task.user:0
+#: selection:report.project.task.user,state:0
+msgid "Pending"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.project_category_action
+#: model:ir.ui.menu,name:project.menu_project_category_act
+#: view:project.category:0
+#: field:project.task,categ_ids:0
+msgid "Tags"
+msgstr ""
+
+#. module: project
+#: model:ir.model,name:project.model_project_task_history
+#: model:ir.model,name:project.model_project_task_history_cumulative
+msgid "History of Tasks"
+msgstr ""
+
+#. module: project
+#: help:project.task.delegate,state:0
+msgid ""
+"New state of your own task. Pending will be reopened automatically when the "
+"delegated task is closed"
+msgstr ""
+
+#. module: project
+#: help:project.config.settings,group_manage_delegation_task:0
+msgid "Allows you to delegate tasks to other users."
+msgstr ""
+
+#. module: project
+#: field:project.project,active:0
+msgid "Active"
+msgstr ""
+
+#. module: project
+#: model:ir.model,name:project.model_project_category
+msgid "Category of project's task, issue, ..."
+msgstr ""
+
+#. module: project
+#: help:project.project,resource_calendar_id:0
+msgid "Timetable working hours to adjust the gantt diagram report"
+msgstr ""
+
+#. module: project
+#: help:project.task,delay_hours:0
+msgid ""
+"Computed as difference between planned hours by the project manager and the "
+"total hours of the task."
+msgstr ""
+
+#. module: project
+#: view:project.config.settings:0
+msgid "Helpdesk & Support"
+msgstr ""
+
+#. module: project
+#: help:report.project.task.user,opening_days:0
+msgid "Number of Days to Open the task"
+msgstr ""
+
+#. module: project
+#: field:project.task,delegated_user_id:0
+msgid "Delegated To"
+msgstr ""
+
+#. module: project
+#: help:project.task,planned_hours:0
+msgid ""
+"Estimated time to do the task, usually set by the project manager when the "
+"task is in draft state."
+msgstr ""
+
+#. module: project
+#: code:addons/project/project.py:220
+#, python-format
+msgid "Attachments"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+#: selection:project.task,state:0
+#: selection:project.task.delegate,state:0
+#: selection:project.task.history,state:0
+#: selection:project.task.history.cumulative,state:0
+#: model:project.task.type,name:project.project_tt_deployment
+#: selection:project.task.type,state:0
+#: view:report.project.task.user:0
+#: selection:report.project.task.user,state:0
+#: view:res.partner:0
+msgid "Done"
+msgstr ""
+
+#. module: project
+#: code:addons/project/project.py:182
+#, python-format
+msgid ""
+"You cannot delete a project containing tasks. You can either delete all the "
+"project's tasks and then delete the project or simply deactivate the project."
+msgstr ""
+
+#. module: project
+#: model:process.transition.action,name:project.process_transition_action_draftopentask0
+#: view:project.project:0
+msgid "Open"
+msgstr ""
+
+#. module: project
+#: field:project.project,privacy_visibility:0
+msgid "Privacy / Visibility"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+#: field:project.task,remaining_hours:0
+#: field:project.task.reevaluate,remaining_hours:0
+#: view:report.project.task.user:0
+#: field:report.project.task.user,remaining_hours:0
+msgid "Remaining Hours"
+msgstr ""
+
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_stage
+msgid "Stage changed"
+msgstr ""
+
+#. module: project
+#: constraint:project.task:0
+msgid "Error ! Task end-date must be greater then task start-date"
+msgstr ""
+
+#. module: project
+#: field:project.task.history,user_id:0
+#: field:project.task.history.cumulative,user_id:0
+msgid "Responsible"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+msgid "Search Project"
+msgstr ""
+
+#. module: project
+#: view:project.task.delegate:0
+msgid "Delegated Task"
+msgstr ""
+
+#. module: project
+#: view:report.project.task.user:0
+#: field:report.project.task.user,total_hours:0
+msgid "Total Hours"
+msgstr ""
+
+#. module: project
+#: model:ir.model,name:project.model_project_config_settings
+msgid "project.config.settings"
+msgstr ""
+
+#. module: project
+#: model:project.task.type,name:project.project_tt_development
+msgid "Development"
+msgstr ""
+
+#. module: project
+#: help:project.task,active:0
+msgid ""
+"This field is computed automatically and have the same behavior than the "
+"boolean 'active' field: if the task is linked to a template or unactivated "
+"project, it will be hidden unless specifically asked."
+msgstr ""
+
+#. module: project
+#: model:res.request.link,name:project.req_link_task
+msgid "Project task"
+msgstr ""
+
+#. module: project
+#: field:project.task,effective_hours:0
+msgid "Hours Spent"
+msgstr ""
+
+#. module: project
+#: help:project.config.settings,module_pad:0
+msgid ""
+"Lets the company customize which Pad installation should be used to link to "
+"new pads\n"
+"                (by default, http://ietherpad.com/).\n"
+"                This installs the module pad."
+msgstr ""
+
+#. module: project
+#: field:project.task,id:0
+msgid "ID"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_view_task_overpassed_draft
+msgid "Overpassed Tasks"
+msgstr ""
+
+#. module: project
+#: code:addons/project/project.py:932
+#, python-format
+msgid ""
+"Child task still open.\n"
+"Please cancel or complete child task first."
+msgstr ""
+
+#. module: project
+#: field:project.task.delegate,user_id:0
+msgid "Assign To"
+msgstr ""
+
+#. module: project
+#: model:res.groups,name:project.group_time_work_estimation_tasks
+msgid "Time Estimation on Tasks"
+msgstr ""
+
+#. module: project
+#: field:project.task,total_hours:0
+msgid "Total"
+msgstr ""
+
+#. module: project
+#: model:process.node,note:project.process_node_taskbydelegate0
+msgid "Delegate your task to the other user"
+msgstr ""
+
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_started
+msgid "Task started"
+msgstr ""
+
+#. module: project
+#: help:project.task.reevaluate,remaining_hours:0
+msgid "Put here the remaining hours required to close the task."
+msgstr ""
+
+#. module: project
+#: help:project.task.type,fold:0
+msgid ""
+"This stage is not visible, for example in status bar or kanban view, when "
+"there are no records in that stage to display."
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "Deadlines"
+msgstr ""
+
+#. module: project
+#: code:addons/project/wizard/project_task_delegate.py:69
+#: code:addons/project/wizard/project_task_delegate.py:70
+#: code:addons/project/wizard/project_task_delegate.py:77
+#: code:addons/project/wizard/project_task_delegate.py:78
+#, python-format
+msgid "CHECK: "
+msgstr ""
+
+#. module: project
+#: code:addons/project/project.py:432
+#, python-format
+msgid "You must assign members on the project '%s' !"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+msgid "Pending Projects"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "Remaining"
+msgstr ""
+
+#. module: project
+#: field:project.task,progress:0
+msgid "Progress (%)"
+msgstr ""
+
+#. module: project
+#: field:project.task,company_id:0
+#: field:project.task.work,company_id:0
+#: view:report.project.task.user:0
+#: field:report.project.task.user,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: project
+#: help:project.config.settings,module_project_timesheet:0
+msgid ""
+"This allows you to transfer the entries under tasks defined for Project "
+"Management to\n"
+"                the timesheet line entries for particular date and user, "
+"with the effect of creating,\n"
+"                editing and deleting either ways.\n"
+"                This installs the module project_timesheet."
+msgstr ""
+
+#. module: project
+#: field:project.config.settings,module_project_issue:0
+msgid "Track issues and bugs"
+msgstr ""
+
+#. module: project
+#: field:project.config.settings,module_project_mrp:0
+msgid "Generate tasks from sale orders"
+msgstr ""
+
+#. module: project
+#: model:ir.ui.menu,name:project.menu_task_types_view
+msgid "Task Stages"
+msgstr ""
+
+#. module: project
+#: model:process.node,note:project.process_node_drafttask0
+msgid "Define the Requirements and Set Planned Hours."
+msgstr ""
+
+#. module: project
+#: field:project.project,message_ids:0
+#: field:project.task,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: project
+#: field:project.project,color:0
+#: field:project.task,color:0
+msgid "Color Index"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.open_board_project
+#: model:ir.model,name:project.model_project_project
+#: model:ir.ui.menu,name:project.menu_project_dashboard
+#: model:ir.ui.menu,name:project.menu_project_management
+#: view:project.project:0
+#: view:project.task:0
+#: field:project.task,project_id:0
+#: field:project.task.delegate,project_id:0
+#: field:project.task.history.cumulative,project_id:0
+#: view:report.project.task.user:0
+#: field:report.project.task.user,project_id:0
+#: model:res.request.link,name:project.req_link_project
+msgid "Project"
+msgstr ""
+
+#. module: project
+#: selection:project.project,state:0
+#: selection:project.task,state:0
+#: selection:project.task.history,state:0
+#: selection:project.task.history.cumulative,state:0
+#: model:project.task.type,name:project.project_tt_cancel
+#: selection:project.task.type,state:0
+#: selection:report.project.task.user,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,help:project.act_project_project_2_project_task_all
+#: model:ir.actions.act_window,help:project.action_view_task
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new task.\n"
+"              </p><p>\n"
+"                OpenERP's project management allows you to manage the "
+"pipeline\n"
+"                of tasks in order to get things done efficiently. You can\n"
+"                track progress, discuss on tasks, attach documents, etc.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: project
+#: field:project.task,date_end:0
+#: field:report.project.task.user,date_end:0
+msgid "Ending Date"
+msgstr ""
+
+#. module: project
+#: field:project.task.type,state:0
+msgid "Related Status"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+msgid "Documents"
+msgstr ""
+
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_new
+msgid "Task created"
+msgstr ""
+
+#. module: project
+#: view:report.project.task.user:0
+#: field:report.project.task.user,no_of_days:0
+msgid "# of Days"
+msgstr ""
+
+#. module: project
+#: field:project.project,message_follower_ids:0
+#: field:project.task,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: project
+#: selection:project.project,state:0
+#: view:project.task:0
+#: selection:project.task,state:0
+#: selection:project.task.history,state:0
+#: selection:project.task.history.cumulative,state:0
+#: selection:project.task.type,state:0
+#: view:report.project.task.user:0
+msgid "New"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_view_task_history_cumulative
+#: model:ir.ui.menu,name:project.menu_action_view_task_history_cumulative
+msgid "Cumulative Flow"
+msgstr ""
+
+#. module: project
+#: view:report.project.task.user:0
+#: field:report.project.task.user,hours_effective:0
+msgid "Effective Hours"
+msgstr ""
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "OverPass delay"
+msgstr ""
+
+#. module: project
+#: view:project.task.delegate:0
+msgid "Validation Task"
+msgstr ""
+
+#. module: project
+#: field:project.config.settings,module_project_long_term:0
+msgid "Manage resources planning on gantt view"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+#: view:project.task.history.cumulative:0
+msgid "Unassigned Tasks"
+msgstr ""
+
+#. module: project
+#: help:project.project,planned_hours:0
+msgid ""
+"Sum of planned hours of all tasks related to this project and its child "
+"projects."
+msgstr ""
+
+#. module: project
+#: view:res.partner:0
+msgid "For changing to done state"
+msgstr ""
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "My Task"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+#: view:project.task.history.cumulative:0
+#: view:report.project.task.user:0
+msgid "My Projects"
+msgstr ""
+
+#. module: project
+#: help:project.task,sequence:0
+msgid "Gives the sequence order when displaying a list of tasks."
+msgstr ""
+
+#. module: project
+#: field:project.task,date_start:0
+#: field:report.project.task.user,date_start:0
+msgid "Starting Date"
+msgstr ""
+
+#. module: project
+#: code:addons/project/project.py:398
+#: model:ir.actions.act_window,name:project.open_view_project_all
+#: model:ir.ui.menu,name:project.menu_projects
+#: view:project.project:0
+#: field:project.task.type,project_ids:0
+#: view:res.company:0
+#, python-format
+msgid "Projects"
+msgstr ""
+
+#. module: project
+#: model:res.groups,name:project.group_tasks_work_on_tasks
+msgid "Task's Work on Tasks"
+msgstr ""
+
+#. module: project
+#: help:project.task.delegate,name:0
+msgid "New title of the task delegated to the user"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_user_tree
+#: model:ir.ui.menu,name:project.menu_project_task_user_tree
+#: view:report.project.task.user:0
+msgid "Tasks Analysis"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+#: view:project.task.history.cumulative:0
+msgid "Project Tasks"
+msgstr ""
+
+#. module: project
+#: field:account.analytic.account,use_tasks:0
+#: model:ir.actions.act_window,name:project.act_project_project_2_project_task_all
+#: model:ir.actions.act_window,name:project.action_view_task
+#: model:ir.ui.menu,name:project.menu_action_view_task
+#: model:process.process,name:project.process_process_tasksprocess0
+#: view:project.project:0
+#: view:project.task:0
+#: view:res.partner:0
+#: field:res.partner,task_ids:0
+msgid "Tasks"
+msgstr ""
+
+#. module: project
+#: selection:report.project.task.user,month:0
+msgid "December"
+msgstr ""
+
+#. module: project
+#: view:project.config.settings:0
+#: view:project.task.delegate:0
+#: view:project.task.reevaluate:0
+msgid "or"
+msgstr ""
+
+#. module: project
+#: help:project.config.settings,module_project_mrp:0
+msgid ""
+"This feature automatically creates project tasks from service products in "
+"sale orders.\n"
+"                More precisely, tasks are created for procurement lines with "
+"product of type 'Service',\n"
+"                procurement method 'Make to Order', and supply method "
+"'Manufacture'.\n"
+"                This installs the module project_mrp."
+msgstr ""
+
+#. module: project
+#: help:project.task.delegate,planned_hours:0
+msgid "Estimated time to close this task by the delegated user"
+msgstr ""
+
+#. module: project
+#: model:project.category,name:project.project_category_03
+msgid "Experiment"
+msgstr ""
+
+#. module: project
+#: model:process.transition.action,name:project.process_transition_action_opendrafttask0
+#: selection:report.project.task.user,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: project
+#: field:project.task,kanban_state:0
+#: field:project.task.history,kanban_state:0
+#: field:project.task.history.cumulative,kanban_state:0
+msgid "Kanban State"
+msgstr ""
+
+#. module: project
+#: field:project.config.settings,module_project_timesheet:0
+msgid "Record timesheet lines per tasks"
+msgstr ""
+
+#. module: project
+#: model:ir.model,name:project.model_report_project_task_user
+msgid "Tasks by user and project"
+msgstr ""
+
+#. module: project
+#: field:res.company,project_time_mode_id:0
+msgid "Project Time Unit"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+#: selection:project.task,kanban_state:0
+#: selection:project.task.history,kanban_state:0
+#: selection:project.task.history.cumulative,kanban_state:0
+msgid "Normal"
+msgstr ""
+
+#. module: project
+#: view:report.project.task.user:0
+#: field:report.project.task.user,closing_days:0
+msgid "Days to Close"
+msgstr ""
+
+#. module: project
+#: model:res.groups,name:project.group_project_user
+msgid "User"
+msgstr ""
+
+#. module: project
+#: help:project.project,alias_model:0
+msgid ""
+"The kind of document created when an email is received on this project's "
+"email alias"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_config_settings
+#: view:project.config.settings:0
+msgid "Configure Project"
+msgstr ""
+
+#. module: project
+#: view:project.task.history.cumulative:0
+msgid "Tasks's Cumulative Flow"
+msgstr ""
+
+#. module: project
+#: selection:report.project.task.user,month:0
+msgid "January"
+msgstr ""
+
+#. module: project
+#: field:project.task.delegate,prefix:0
+msgid "Your Task Title"
+msgstr ""
+
+#. module: project
+#: view:project.task.reevaluate:0
+msgid "Reevaluation Task"
+msgstr ""
+
+#. module: project
+#: code:addons/project/project.py:1318
+#, python-format
+msgid "Please delete the project linked with this account first."
+msgstr ""
+
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_new
+#: model:mail.message.subtype,name:project.mt_task_new
+msgid "Task Created"
+msgstr ""
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "Non Assigned Tasks to users"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+msgid "Projects in which I am a manager"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+#: selection:project.task,kanban_state:0
+#: selection:project.task.history,kanban_state:0
+#: selection:project.task.history.cumulative,kanban_state:0
+msgid "Ready for next stage"
+msgstr ""
+
+#. module: project
+#: field:project.task.type,case_default:0
+msgid "Default for New Projects"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+#: field:project.task,description:0
+#: field:project.task.type,description:0
+msgid "Description"
+msgstr ""
+
+#. module: project
+#: selection:report.project.task.user,month:0
+msgid "May"
+msgstr ""
+
+#. module: project
+#: help:project.task.type,case_default:0
+msgid ""
+"If you check this field, this stage will be proposed by default on each new "
+"project. It will not assign this stage to existing projects."
+msgstr ""
+
+#. module: project
+#: field:project.task,partner_id:0
+msgid "Customer"
+msgstr ""
+
+#. module: project
+#: selection:report.project.task.user,month:0
+msgid "February"
+msgstr ""
+
+#. module: project
+#: help:project.config.settings,module_project_long_term:0
+msgid ""
+"A long term project management module that tracks planning, scheduling, and "
+"resource allocation.\n"
+"                This installs the module project_long_term."
+msgstr ""
+
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_closed
+msgid "Task closed"
+msgstr ""
+
+#. module: project
+#: selection:report.project.task.user,month:0
+msgid "April"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "Spent Hours"
+msgstr ""
+
+#. module: project
+#: help:project.project,sequence:0
+msgid "Gives the sequence order when displaying a list of Projects."
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.act_res_users_2_project_task_opened
+msgid "Assigned Tasks"
+msgstr ""
+
+#. module: project
+#: help:project.config.settings,module_project_issue_sheet:0
+msgid ""
+"Provides timesheet support for the issues/bugs management in project.\n"
+"                This installs the module project_issue_sheet."
+msgstr ""
+
+#. module: project
+#: selection:project.project,privacy_visibility:0
+msgid "Followers Only"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+#: field:project.project,task_count:0
+msgid "Open Tasks"
+msgstr ""
+
+#. module: project
+#: field:project.project,priority:0
+#: field:project.project,sequence:0
+#: field:project.task,sequence:0
+#: field:project.task.type,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+#: view:project.task.work:0
+msgid "Task Work"
+msgstr ""
+
+#. module: project
+#: help:project.task.delegate,planned_hours_me:0
+msgid ""
+"Estimated time for you to validate the work done by the user to whom you "
+"delegate this task"
+msgstr ""
+
+#. module: project
+#: view:report.project.task.user:0
+#: field:report.project.task.user,year:0
+msgid "Year"
+msgstr ""
+
+#. module: project
+#: field:project.project,type_ids:0
+#: view:project.task.type:0
+msgid "Tasks Stages"
+msgstr ""
diff --git a/addons/project/process/task_process.xml b/addons/project/process/task_process.xml
index 4a73bfd00d1..9955fe1ffe1 100644
--- a/addons/project/process/task_process.xml
+++ b/addons/project/process/task_process.xml
@@ -68,24 +68,24 @@
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Delegate&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Delegates tasks to the other user&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_drafttask0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_taskbydelegate0"/>
+            <field name="target_node_id" ref="process_node_drafttask0"/>
+            <field name="source_node_id" ref="process_node_taskbydelegate0"/>
         </record>
 
         <record id="process_transition_draftopentask0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Draft Open task&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;From draft state, it will come into the open state.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_opentask0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_drafttask0"/>
+            <field name="target_node_id" ref="process_node_opentask0"/>
+            <field name="source_node_id" ref="process_node_drafttask0"/>
         </record>
 
         <record id="process_transition_opendonetask0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Open Done Task&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;When task is completed, it will come into the done state.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_donetask0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_opentask0"/>
+            <field name="target_node_id" ref="process_node_donetask0"/>
+            <field name="source_node_id" ref="process_node_opentask0"/>
         </record>
 
 
diff --git a/addons/project/project.py b/addons/project/project.py
index 0b99356a9de..5d5abce3066 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -198,8 +198,12 @@ class project(osv.osv):
         return res
         
     def _task_count(self, cr, uid, ids, field_name, arg, context=None):
+        if context is None:
+            context = {}
         res = dict.fromkeys(ids, 0)
-        task_ids = self.pool.get('project.task').search(cr, uid, [('project_id', 'in', ids)])
+        ctx = context.copy()
+        ctx['active_test'] = False
+        task_ids = self.pool.get('project.task').search(cr, uid, [('project_id', 'in', ids)], context=ctx)
         for task in self.pool.get('project.task').browse(cr, uid, task_ids, context):
             res[task.project_id.id] += 1
         return res
@@ -210,7 +214,7 @@ class project(osv.osv):
 
     def _get_visibility_selection(self, cr, uid, context=None):
         """ Overriden in portal_project to offer more options """
-        return [('public', 'All Users'),
+        return [('public', 'Public'),
                 ('employees', 'Employees Only'),
                 ('followers', 'Followers Only')]
 
@@ -275,7 +279,17 @@ class project(osv.osv):
                                          "with Tasks (or optionally Issues if the Issue Tracker module is installed)."),
         'alias_model': fields.selection(_alias_models, "Alias Model", select=True, required=True,
                                         help="The kind of document created when an email is received on this project's email alias"),
-        'privacy_visibility': fields.selection(_visibility_selection, 'Privacy / Visibility', required=True),
+        'privacy_visibility': fields.selection(_visibility_selection, 'Privacy / Visibility', required=True,
+            help="Holds visibility of the tasks or issues that belong to the current project:\n"
+                    "- Public: everybody sees everything; if portal is activated, portal users\n"
+                    "   see all tasks or issues; if anonymous portal is activated, visitors\n"
+                    "   see all tasks or issues\n"
+                    "- Portal (only available if Portal is installed): employees see everything;\n"
+                    "   if portal is activated, portal users see the tasks or issues followed by\n"
+                    "   them or by someone of their company\n"
+                    "- Employees Only: employees see all tasks or issues\n"
+                    "- Followers Only: employees see only the followed tasks or issues; if portal\n"
+                    "   is activated, portal users see the followed tasks or issues."),
         'state': fields.selection([('template', 'Template'),('draft','New'),('open','In Progress'), ('cancelled', 'Cancelled'),('pending','Pending'),('close','Closed')], 'Status', required=True,),
         'doc_count':fields.function(_get_attached_docs, string="Number of documents attached", type='int')
      }
@@ -293,7 +307,7 @@ class project(osv.osv):
         'sequence': 10,
         'type_ids': _get_type_common,
         'alias_model': 'project.task',
-        'privacy_visibility': 'public',
+        'privacy_visibility': 'employees',
     }
 
     # TODO: Why not using a SQL contraints ?
@@ -612,7 +626,8 @@ class task(base_stage, osv.osv):
         search_domain = []
         project_id = self._resolve_project_id_from_context(cr, uid, context=context)
         if project_id:
-            search_domain += [('project_ids', '=', project_id)]
+            search_domain += ['|', ('project_ids', '=', project_id)]
+        search_domain += [('id', 'in', ids)]
         stage_ids = stage_obj._search(cr, uid, search_domain, order=order, access_rights_uid=access_rights_uid, context=context)
         result = stage_obj.name_get(cr, access_rights_uid, stage_ids, context=context)
         # restore order of the search
@@ -738,7 +753,7 @@ class task(base_stage, osv.osv):
         'priority': fields.selection([('4','Very Low'), ('3','Low'), ('2','Medium'), ('1','Important'), ('0','Very important')], 'Priority', select=True),
         'sequence': fields.integer('Sequence', select=True, help="Gives the sequence order when displaying a list of tasks."),
         'stage_id': fields.many2one('project.task.type', 'Stage', track_visibility='onchange',
-                        domain="['&', ('fold', '=', False), ('project_ids', '=', project_id)]"),
+                        domain="[('project_ids', '=', project_id)]"),
         'state': fields.related('stage_id', 'state', type="selection", store=True,
                 selection=_TASK_STATE, string="Status", readonly=True,
                 help='The status is set to \'Draft\', when a case is created.\
diff --git a/addons/project/project_demo.xml b/addons/project/project_demo.xml
index f5fbf878fd0..b7dcc2bdb83 100644
--- a/addons/project/project_demo.xml
+++ b/addons/project/project_demo.xml
@@ -62,7 +62,7 @@
             <field name="name">E-Learning Integration</field>
             <field name="user_id" ref="base.user_demo"/>
             <field name="alias_model">project.task</field>
-            <field name="privacy_visibility">public</field>
+            <field name="privacy_visibility">employees</field>
             <field name="members" eval="[(4, ref('base.user_root')), (4, ref('base.user_demo'))]"/>
         </record>
 
@@ -76,6 +76,7 @@
             <field name="name">Website Design Templates</field>
             <field name="user_id" ref="base.user_root"/>
             <field name="alias_model">project.task</field>
+            <field name="privacy_visibility">employees</field>
             <field name="members" eval="[(4, ref('base.user_root')), (4,ref('base.user_demo'))]"/>
         </record>
 
@@ -89,6 +90,7 @@
             <field name="partner_id" ref="base.res_partner_7"/>
             <field name="name">Data Import/Export Plugin</field>
             <field name="alias_model">project.task</field>
+            <field name="privacy_visibility">followers</field>
             <field name="members" eval="[(6, 0, [
                     ref('base.user_root'),
                     ref('base.user_demo')])]"/>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 298355d4c82..eb042e5f0c7 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -52,7 +52,8 @@
             <field name="view_mode">kanban,tree,form,calendar,gantt,graph</field>
             <field name="context">{
                 'search_default_project_id': [active_id], 
-                'default_project_id': active_id, 
+                'default_project_id': active_id,
+                'active_test': False,
             }</field>
             <field name="search_view_id" ref="view_task_search_form"/>
             <field name="help" type="html">
@@ -509,6 +510,7 @@
                                         <li><a name="do_open" states="draft" string="Validate planned time" type="object" class="oe_kanban_button oe_kanban_button_active">!</a></li>
                                       </ul>
                                     </li>
+                                    <br/>
                                     <li><ul class="oe_kanban_colorpicker" data-field="color"/></li>
                                 </ul>
                             </div>
diff --git a/addons/project/security/project_security.xml b/addons/project/security/project_security.xml
index bac7e3365e6..71db402641f 100644
--- a/addons/project/security/project_security.xml
+++ b/addons/project/security/project_security.xml
@@ -76,15 +76,13 @@
     </record>
 
     <record model="ir.rule" id="task_visibility_rule">
-        <field name="name">Project/Task: employees: public or employee or following or assigned</field>
+        <field name="name">Project/Task: employees: public or employee or (followers and following)</field>
         <field name="model_id" ref="model_project_task"/>
         <field name="domain_force">['|',
-                                        ('user_id', '=', user.id),
-                                        '|',
-                                            ('project_id.privacy_visibility', 'in', ['public', 'employees']),
-                                            '&amp;',
-                                                ('project_id.privacy_visibility', '=', 'followers'),
-                                                ('message_follower_ids', 'in', [user.partner_id.id]),
+                                        ('project_id.privacy_visibility', 'in', ['public', 'employees']),
+                                        '&amp;',
+                                            ('project_id.privacy_visibility', '=', 'followers'),
+                                            ('message_follower_ids', 'in', [user.partner_id.id]),
                                     ]</field>
         <field name="groups" eval="[(4,ref('base.group_user'))]"/>
     </record>
diff --git a/addons/project_gtd/project_gtd_view.xml b/addons/project_gtd/project_gtd_view.xml
index 1467ce55fab..4bfd5b783c7 100644
--- a/addons/project_gtd/project_gtd_view.xml
+++ b/addons/project_gtd/project_gtd_view.xml
@@ -106,6 +106,8 @@
                 <filter name="open" string="In Progress" domain="[('state','in',('draft','open'))]" help="In Progress and draft tasks" icon="terp-camera_test"/>
                 <filter string="Pending" domain="[('state','=','pending')]" context="{'show_delegated':False}" help="Pending Tasks" icon="terp-gtk-media-pause"/>
                 <separator/>
+                <filter name="message_unread" string="Unread Messages" domain="[('message_unread','=',True)]"/>
+                <separator/>
                 <filter string="Inbox" domain="[('timebox_id','=', False)]" help="Tasks having no timebox assigned yet"/>
                 <group expand="0" string="Display">
                     <filter string="Show Context" name="context_show" context="{'context_show': True}" domain="[]" icon="terp-camera_test" help="Show the context field"/>
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index 69792322ab3..a008c670138 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -270,7 +270,7 @@ class project_issue(base_stage, osv.osv):
         'version_id': fields.many2one('project.issue.version', 'Version'),
         'stage_id': fields.many2one ('project.task.type', 'Stage',
                         track_visibility='onchange',
-                        domain="['&', ('fold', '=', False), ('project_ids', '=', project_id)]"),
+                        domain="[('project_ids', '=', project_id)]"),
         'project_id':fields.many2one('project.project', 'Project', track_visibility='onchange'),
         'duration': fields.float('Duration'),
         'task_id': fields.many2one('project.task', 'Task', domain="[('project_id','=',project_id)]"),
@@ -495,10 +495,10 @@ class project_issue(base_stage, osv.osv):
     def message_get_suggested_recipients(self, cr, uid, ids, context=None):
         recipients = super(project_issue, self).message_get_suggested_recipients(cr, uid, ids, context=context)
         for issue in self.browse(cr, uid, ids, context=context):
-            if issue.partner_id:
-                self._message_add_suggested_recipient(cr, uid, recipients, issue, partner=issue.partner_id, reason=_('Customer'))
-            elif issue.email_from:
+            if issue.email_from:
                 self._message_add_suggested_recipient(cr, uid, recipients, issue, email=issue.email_from, reason=_('Customer Email'))
+            elif issue.partner_id:
+                self._message_add_suggested_recipient(cr, uid, recipients, issue, partner=issue.partner_id, reason=_('Customer'))
         return recipients
 
     def message_new(self, cr, uid, msg, custom_values=None, context=None):
diff --git a/addons/project_issue/security/project_issue_security.xml b/addons/project_issue/security/project_issue_security.xml
index 5215a94a8b7..c8ed12086e4 100644
--- a/addons/project_issue/security/project_issue_security.xml
+++ b/addons/project_issue/security/project_issue_security.xml
@@ -10,15 +10,13 @@
         </record>
 
         <record model="ir.rule" id="issue_user_rule">
-            <field name="name">Project/Issue: employees: public or employee or following or assigned</field>
+            <field name="name">Project/Issue: employees: public or employee or (followers and following)</field>
             <field name="model_id" ref="model_project_issue"/>
             <field name="domain_force">['|',
-                                            '|',
-                                                ('project_id.privacy_visibility', 'in', ['public', 'employees']),
-                                                '&amp;',
-                                                    ('project_id.privacy_visibility', '=', 'followers'),
-                                                    ('message_follower_ids', 'in', [user.id]),
-                                            ('user_id', '=', user.id),
+                                            ('project_id.privacy_visibility', 'in', ['public', 'employees']),
+                                            '&amp;',
+                                                ('project_id.privacy_visibility', '=', 'followers'),
+                                                ('message_follower_ids', 'in', [user.id]),
                                         ]</field>
             <field name="groups" eval="[(4,ref('base.group_user'))]"/>
         </record>
diff --git a/addons/project_mrp/process/project_mrp_process.xml b/addons/project_mrp/process/project_mrp_process.xml
index e2195c6f61b..c25cd264538 100644
--- a/addons/project_mrp/process/project_mrp_process.xml
+++ b/addons/project_mrp/process/project_mrp_process.xml
@@ -50,24 +50,24 @@
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Procurement Task&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;if product type is 'service' then it creates the task.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_procuretasktask0"/>
-            <field model="process.node" name="source_node_id" ref="sale_stock.process_node_saleprocurement0"/>
+            <field name="target_node_id" ref="process_node_procuretasktask0"/>
+            <field name="source_node_id" ref="sale_stock.process_node_saleprocurement0"/>
         </record>
 
         <record id="process_transition_createtask0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Create Task&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Product type is service, then its creates the task.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="project.process_node_drafttask0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_saleordertask0"/>
+            <field name="target_node_id" ref="project.process_node_drafttask0"/>
+            <field name="source_node_id" ref="process_node_saleordertask0"/>
         </record>
 
         <record id="process_transition_ordertask0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Order Task&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;If procurement method is Make to order and supply method is produce&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_mrptask0"/>
-            <field model="process.node" name="source_node_id" ref="procurement.process_node_serviceonorder0"/>
+            <field name="target_node_id" ref="process_node_mrptask0"/>
+            <field name="source_node_id" ref="procurement.process_node_serviceonorder0"/>
         </record>
 
     </data>
diff --git a/addons/project_timesheet/__openerp__.py b/addons/project_timesheet/__openerp__.py
index 0651d7b9ce4..4dff3695c5c 100644
--- a/addons/project_timesheet/__openerp__.py
+++ b/addons/project_timesheet/__openerp__.py
@@ -34,7 +34,7 @@ with the effect of creating, editing and deleting either ways.
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'images': ['images/invoice_task_work.jpeg', 'images/my_timesheet.jpeg', 'images/working_hour.jpeg'],
-    'depends': ['project', 'hr_timesheet_sheet', 'hr_timesheet_invoice', 'account_analytic_analysis'],
+    'depends': ['resource', 'project', 'hr_timesheet_sheet', 'hr_timesheet_invoice', 'account_analytic_analysis'],
     'data': [
         'security/ir.model.access.csv',
         'security/project_timesheet_security.xml',
diff --git a/addons/project_timesheet/process/project_timesheet_process.xml b/addons/project_timesheet/process/project_timesheet_process.xml
index 1bff69b603e..17dd35dcad2 100644
--- a/addons/project_timesheet/process/project_timesheet_process.xml
+++ b/addons/project_timesheet/process/project_timesheet_process.xml
@@ -46,24 +46,24 @@
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Fill Timesheet&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Task summary is comes into the timesheet line&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_timesheettask0"/>
-            <field model="process.node" name="source_node_id" ref="project.process_node_opentask0"/>
+            <field name="target_node_id" ref="process_node_timesheettask0"/>
+            <field name="source_node_id" ref="project.process_node_opentask0"/>
         </record>
 
         <record id="process_transition_taskencoding0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Task encoding&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Encode how much time u spent on your task&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="hr_timesheet_sheet.process_node_timesheet0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_taskwork0"/>
+            <field name="target_node_id" ref="hr_timesheet_sheet.process_node_timesheet0"/>
+            <field name="source_node_id" ref="process_node_taskwork0"/>
         </record>
 
         <record id="process_transition_taskinvoice0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Task invoice&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;After task is completed, Create its invoice.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_triggerinvoice0"/>
-            <field model="process.node" name="source_node_id" ref="project.process_node_donetask0"/>
+            <field name="target_node_id" ref="process_node_triggerinvoice0"/>
+            <field name="source_node_id" ref="project.process_node_donetask0"/>
         </record>
 
     </data>
diff --git a/addons/purchase/html/index.html b/addons/purchase/html/index.html
new file mode 100644
index 00000000000..67b122ac557
--- /dev/null
+++ b/addons/purchase/html/index.html
@@ -0,0 +1,141 @@
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <div class="oe_span12">
+            <h2 class="oe_slogan">Purchase Management</h2>
+            <h3 class="oe_slogan">Automate requisition-to-pay, control invoicing</h3>
+        </div>
+        <div class="oe_span6">
+            <div class="oe_demo oe_picture oe_screenshot">
+                <a href="https://www.openerp.com/saas_master/demo?lang=en_US&module=purchase">
+                    <img src="purchase_po.png">
+                </a>
+                <div class="oe_demo_footer oe_centeralign">Online Demo</div>
+            </div>
+        </div>
+        <div class="oe_span6">
+           <p class="oe_mt32">
+Automate procurement propositions, launch request for quotations, track purchase orders, manage suppliers' information, control products reception and check suppliers' invoices. 
+           </p>
+            <div class="oe_centeralign oe_websiteonly">
+                <a href="http://www.openerp.com/start" class="oe_button oe_big oe_tacky">Start your <span class="oe_emph">free</span> trial</a>
+            </div>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container oe_dark">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan">Automated Procurement Propositions</h2>
+        <h3 class="oe_slogan">Reduce inventory level with procurement rules</h3>
+        <div class="oe_span6">
+            <p class="oe_mt32">
+Get the right purchase proposition at the right time to reduce your inventory level. Improve your purchase and inventory performance with procurement rules depending on stock levels, logistic rules, sales orders, forecasted manufacturing orders, etc.
+            </p><p>
+Send requests for quotations or purchase orders to your supplier in one click. Get access to product receptions and invoices from your purchase order.
+            </p>
+        </div>
+        <div class="oe_span6">
+            <img class="oe_picture oe_screenshot" src="purchase_product_form.png">
+        </div>
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan">Purchase Tenders</h2>
+        <h3 class="oe_slogan">Get the best price by negotiating with several suppliers</h3>
+        <div class="oe_span6">
+            <img class="oe_picture oe_screenshot" src="purchase_procurement.png">
+        </div>
+        <div class="oe_span6">
+            <p class="oe_mt32">
+Launch purchase tenders, integrate supplier's answers in the process and compare propositions. Choose the best offer and send purchase orders easily. Use reporting to analyse the quality of your suppliers afterwards.
+            </p>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container oe_centeralign oe_padded oe_mb32">
+    <div class='oe_cover'>
+        <img src="http://www.openerp.com/ebooks/logistic.png">
+    </div>
+    <a href="http://www.openerp.com/ebooks/logistic" target="_blank" class="oe_button oe_big">Download our free E-book</a>
+</section>
+
+<section class="oe_container oe_dark">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan">Email integrations</h2>
+        <div class="oe_span6">
+            <p class="oe_mt32">
+Integrate all supplier's communications on the purchase orders (or RfQs) to get a strong traceability on the negotiation or after sales service issues. Use the claim management module to track issues related to suppliers.
+            </p>
+        </div>
+        <div class="oe_span6">
+            <img class="oe_picture" src="purchase_compose.png">
+        </div>
+    </div>
+</section>
+
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+	    <h2 class="oe_slogan">Standard Price, Average Price, FIFO</h2>
+        <div class="oe_span6">
+            <img class="oe_picture oe_screenshot" src="purchase_product.png">
+        </div>
+        <div class="oe_span6">
+            <p class="oe_mt32">
+Use the costing method that reflects your business: standard price, average price, fifo or lifo. Get your accounting entries and the right inventory valuation in real-time; OpenERP manages everything for you, transparently.
+            </p>
+        </div>
+    </div>
+</section>
+
+
+<section class="oe_container oe_dark">
+    <div class="oe_row oe_spaced">
+	    <h2 class="oe_slogan">Import Supplier Pricelists</h2>
+	    <h3 class="oe_slogan">Take smart purchase decisions using the best prices</h3>
+        <div class="oe_span6">
+            <p class="oe_mt32">
+Easily import supplier's pricelists to make smarter purchase decisions based on promotions, prices depending on quantities and special contract conditions. You can even base your sales price depending on your supplier's prices.
+            </p>
+        </div>
+        <div class="oe_span6">
+            <img class="oe_picture oe_screenshot" src="purchase_import.png">
+        </div>
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan">Control Products and Invoices</h2>
+        <div class="oe_span6">
+            <div class="oe_row_img oe_centered">
+                <img class="oe_picture oe_screenshot" src="purchase_incoming.png">
+            </div>
+        </div>
+        <div class="oe_span6">
+            <p class="oe_mt32">
+No product or order is left behind, the inventory control allows you to manage back orders, refunds, product reception and quality control. Choose the right control method according to your need.
+            </p>
+            <p>
+Control supplier invoices with no effort. Choose the right method according to your need: pre-generate draft invoices based on purchase orders, on products receptions, create invoices manually and import lines from purchase orders, etc.
+            </p>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container oe_dark">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan">Get Statistics On Your Purchases</h2>
+        <div class="oe_span6">
+            <p class="oe_mt32">
+Get accurate statistics on the performance of your suppliers through flexible reporting: delivery delays, negotiated discount on prices, quantities purchased, etc. Integrate purchases with the analytic accounting to analyse your contracts profitability.
+            </p>
+        </div>
+        <div class="oe_span6">
+            <img class="oe_picture oe_screenshot" src="purchase_dashboard.png">
+        </div>
+    </div>
+</section>
diff --git a/addons/purchase/html/purchase_compose.png b/addons/purchase/html/purchase_compose.png
new file mode 100644
index 00000000000..22cbe1cb21c
Binary files /dev/null and b/addons/purchase/html/purchase_compose.png differ
diff --git a/addons/purchase/html/purchase_dashboard.png b/addons/purchase/html/purchase_dashboard.png
new file mode 100644
index 00000000000..0939edea591
Binary files /dev/null and b/addons/purchase/html/purchase_dashboard.png differ
diff --git a/addons/purchase/html/purchase_import.png b/addons/purchase/html/purchase_import.png
new file mode 100644
index 00000000000..bd2a4d0c15e
Binary files /dev/null and b/addons/purchase/html/purchase_import.png differ
diff --git a/addons/purchase/html/purchase_incoming.png b/addons/purchase/html/purchase_incoming.png
new file mode 100644
index 00000000000..02b82cead02
Binary files /dev/null and b/addons/purchase/html/purchase_incoming.png differ
diff --git a/addons/purchase/html/purchase_po.png b/addons/purchase/html/purchase_po.png
new file mode 100644
index 00000000000..d9cec9f5140
Binary files /dev/null and b/addons/purchase/html/purchase_po.png differ
diff --git a/addons/purchase/html/purchase_procurement.png b/addons/purchase/html/purchase_procurement.png
new file mode 100644
index 00000000000..cb315e08224
Binary files /dev/null and b/addons/purchase/html/purchase_procurement.png differ
diff --git a/addons/purchase/html/purchase_product.png b/addons/purchase/html/purchase_product.png
new file mode 100644
index 00000000000..cbfd054d72e
Binary files /dev/null and b/addons/purchase/html/purchase_product.png differ
diff --git a/addons/purchase/html/purchase_product_form.png b/addons/purchase/html/purchase_product_form.png
new file mode 100644
index 00000000000..a25c85b6496
Binary files /dev/null and b/addons/purchase/html/purchase_product_form.png differ
diff --git a/addons/purchase/html/purchase_tender.png b/addons/purchase/html/purchase_tender.png
new file mode 100644
index 00000000000..33ef600b869
Binary files /dev/null and b/addons/purchase/html/purchase_tender.png differ
diff --git a/addons/purchase/process/purchase_process.xml b/addons/purchase/process/purchase_process.xml
index c6b6805351a..7feb47690e0 100644
--- a/addons/purchase/process/purchase_process.xml
+++ b/addons/purchase/process/purchase_process.xml
@@ -154,16 +154,16 @@
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;From a Pick list&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;A Pick list generates a supplier invoice. Depending on the Invoicing control of the purchase order, the invoice is based on received or on ordered quantities.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="account.process_node_supplierdraftinvoices0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_productrecept0"/>
+            <field name="target_node_id" ref="account.process_node_supplierdraftinvoices0"/>
+            <field name="source_node_id" ref="process_node_productrecept0"/>
         </record>
 
         <record id="process_transition_confirmingpurchaseorder0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Confirmation&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;The buyer has to approve the RFQ before being sent to the supplier. The RFQ becomes a confirmed Purchase Order.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_confirmpurchaseorder0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_draftpurchaseorder0"/>
+            <field name="target_node_id" ref="process_node_confirmpurchaseorder0"/>
+            <field name="source_node_id" ref="process_node_draftpurchaseorder0"/>
             <field eval="[(6,0,[ref('purchase.trans_draft_confirmed')])]" name="transition_ids"/>
         </record>
 
@@ -171,24 +171,24 @@
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Confirmation&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;In case there is no supplier for this product, the buyer can fill the form manually and confirm it. The RFQ becomes a confirmed Purchase Order.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_confirmpurchaseorder0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_draftpurchaseorder1"/>
+            <field name="target_node_id" ref="process_node_confirmpurchaseorder0"/>
+            <field name="source_node_id" ref="process_node_draftpurchaseorder1"/>
         </record>
 
         <record id="process_transition_approvingpurchaseorder0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Approbation&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;The supplier approves the Purchase Order.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_approvepurchaseorder0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_confirmpurchaseorder0" />
+            <field name="target_node_id" ref="process_node_approvepurchaseorder0"/>
+            <field name="source_node_id" ref="process_node_confirmpurchaseorder0" />
         </record>
 
         <record id="process_transition_invoicefrompurchase0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Invoice&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;The invoice is created automatically if the Invoice control of the purchase order is 'On order'. The invoice can also be generated manually by the accountant (Invoice control = Manual).&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_invoicecontrol0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_approvepurchaseorder0"/>
+            <field name="target_node_id" ref="process_node_invoicecontrol0"/>
+            <field name="source_node_id" ref="process_node_approvepurchaseorder0"/>
             <field eval="[(6,0,[ref('purchase.trans_router_invoice')])]" name="transition_ids"/>
         </record>
 
@@ -196,32 +196,32 @@
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Pick list generated&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;A pick list is generated to track the incoming products.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_packinglist0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_approvepurchaseorder0"/>
+            <field name="target_node_id" ref="process_node_packinglist0"/>
+            <field name="source_node_id" ref="process_node_approvepurchaseorder0"/>
         </record>
 
         <record id="process_transition_invoicefrompackinglist0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Invoice&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;The invoice is created automatically if the Invoice control of the purchase order is 'On picking'. The invoice can also be generated manually by the accountant (Invoice control = Manual).&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_invoiceafterpacking0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_packinglist0"/>
+            <field name="target_node_id" ref="process_node_invoiceafterpacking0"/>
+            <field name="source_node_id" ref="process_node_packinglist0"/>
         </record>
 
         <record id="process_transition_purchaseinvoice0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;From a purchase order&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;A purchase order generates a supplier invoice, as soon as it is confirmed by the buyer. Depending on the Invoicing control of the purchase order, the invoice is based on received or on ordered quantities.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="account.process_node_supplierdraftinvoices0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_purchaseorder0"/>
+            <field name="target_node_id" ref="account.process_node_supplierdraftinvoices0"/>
+            <field name="source_node_id" ref="process_node_purchaseorder0"/>
         </record>
 
         <record id="process_transition_packinginvoice0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;From a Pick list&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;A Pick list generates an invoice. Depending on the Invoicing control of the sales order, the invoice is based on delivered or on ordered quantities.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="account.process_node_draftinvoices0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_packinginvoice0"/>
+            <field name="target_node_id" ref="account.process_node_draftinvoices0"/>
+            <field name="source_node_id" ref="process_node_packinginvoice0"/>
         </record>
 
         <!--
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 26e34048b40..849e558563a 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -640,7 +640,7 @@ class purchase_order(osv.osv):
             'product_uom': order_line.product_uom.id,
             'product_uos': order_line.product_uom.id,
             'date': self.date_to_datetime(cr, uid, order.date_order, context),
-            'date_expected': self.date_to_datetime(cr, uid, order.date_order, context),
+            'date_expected': self.date_to_datetime(cr, uid, order_line.date_planned, context),
             'location_id': order.partner_id.property_stock_supplier.id,
             'location_dest_id': order.location_id.id,
             'picking_id': picking_id,
@@ -952,7 +952,8 @@ class purchase_order_line(osv.osv):
             lang = res_partner.browse(cr, uid, partner_id).lang
             context_partner.update( {'lang': lang, 'partner_id': partner_id} )
         product = product_product.browse(cr, uid, product_id, context=context_partner)
-        name = product.name
+        #call name_get() with partner in the context to eventually match name and description in the seller_ids field
+        dummy, name = product_product.name_get(cr, uid, product_id, context=context_partner)[0]
         if product.description_purchase:
             name += '\n' + product.description_purchase
         res['value'].update({'name': name})
diff --git a/addons/purchase/purchase_workflow.xml b/addons/purchase/purchase_workflow.xml
index 11936db0bed..68a6cd12733 100644
--- a/addons/purchase/purchase_workflow.xml
+++ b/addons/purchase/purchase_workflow.xml
@@ -57,7 +57,7 @@
             <field name="wkf_id" ref="purchase_order"/>
             <field name="name">invoice</field>
             <field name="kind">subflow</field>
-            <field name="subflow_id" search="[('osv','=','account.invoice')]" type="int"/>
+            <field name="subflow_id" search="[('osv','=','account.invoice')]"/>
             <field name="action">action_invoice_create()</field>
         </record>
         <record id="act_invoice_done" model="workflow.activity">
diff --git a/addons/purchase_double_validation/test/purchase_double_validation_test.yml b/addons/purchase_double_validation/test/purchase_double_validation_test.yml
old mode 100755
new mode 100644
diff --git a/addons/purchase_requisition/test/purchase_requisition_demo.yml b/addons/purchase_requisition/test/purchase_requisition_demo.yml
old mode 100755
new mode 100644
diff --git a/addons/report_webkit/__init__.py b/addons/report_webkit/__init__.py
index 2c23fd8ed90..e00289407d8 100644
--- a/addons/report_webkit/__init__.py
+++ b/addons/report_webkit/__init__.py
@@ -25,7 +25,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
 ##############################################################################
 
diff --git a/addons/report_webkit/__openerp__.py b/addons/report_webkit/__openerp__.py
index b962669eee9..f4035a951de 100644
--- a/addons/report_webkit/__openerp__.py
+++ b/addons/report_webkit/__openerp__.py
@@ -25,7 +25,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
 ##############################################################################
 
diff --git a/addons/report_webkit/company.py b/addons/report_webkit/company.py
index f9ae4191528..b29354938de 100644
--- a/addons/report_webkit/company.py
+++ b/addons/report_webkit/company.py
@@ -25,7 +25,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
 ##############################################################################
 
diff --git a/addons/report_webkit/convert.py b/addons/report_webkit/convert.py
index b4d42325bb6..e30209a77dc 100644
--- a/addons/report_webkit/convert.py
+++ b/addons/report_webkit/convert.py
@@ -25,7 +25,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
 ##############################################################################
 
diff --git a/addons/report_webkit/header.py b/addons/report_webkit/header.py
index 9713efc5382..7a290662498 100644
--- a/addons/report_webkit/header.py
+++ b/addons/report_webkit/header.py
@@ -25,7 +25,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
 ##############################################################################
 
diff --git a/addons/report_webkit/ir_report.py b/addons/report_webkit/ir_report.py
index 4b64a54c420..cea2b4e8329 100644
--- a/addons/report_webkit/ir_report.py
+++ b/addons/report_webkit/ir_report.py
@@ -25,7 +25,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
 ##############################################################################
 
diff --git a/addons/report_webkit/report_helper.py b/addons/report_webkit/report_helper.py
index af9408b834e..83286dc59bd 100644
--- a/addons/report_webkit/report_helper.py
+++ b/addons/report_webkit/report_helper.py
@@ -25,7 +25,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
 ##############################################################################
 
diff --git a/addons/report_webkit/webkit_report.py b/addons/report_webkit/webkit_report.py
index 3d8e41c42ff..82061daa758 100644
--- a/addons/report_webkit/webkit_report.py
+++ b/addons/report_webkit/webkit_report.py
@@ -26,7 +26,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
 ##############################################################################
 
diff --git a/addons/report_webkit/wizard/__init__.py b/addons/report_webkit/wizard/__init__.py
index e8ae8b79fc0..e95244cc7aa 100644
--- a/addons/report_webkit/wizard/__init__.py
+++ b/addons/report_webkit/wizard/__init__.py
@@ -25,7 +25,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
 ##############################################################################
 
diff --git a/addons/report_webkit/wizard/report_webkit_actions.py b/addons/report_webkit/wizard/report_webkit_actions.py
index 5f91d05d671..e22e7948d59 100644
--- a/addons/report_webkit/wizard/report_webkit_actions.py
+++ b/addons/report_webkit/wizard/report_webkit_actions.py
@@ -25,7 +25,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
 ##############################################################################
 
diff --git a/addons/resource/faces/observer.py b/addons/resource/faces/observer.py
index 894345230ea..28ae58eb2b6 100644
--- a/addons/resource/faces/observer.py
+++ b/addons/resource/faces/observer.py
@@ -22,7 +22,7 @@
 #   You should have received a copy of the GNU General Public License
 #   along with this program; if not, write to the
 #   Free Software Foundation, Inc.,
-#   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 ############################################################################
 
 #@-node:<< Copyright >>
diff --git a/addons/resource/faces/pcalendar.py b/addons/resource/faces/pcalendar.py
index c82c49d4816..24c974233d8 100644
--- a/addons/resource/faces/pcalendar.py
+++ b/addons/resource/faces/pcalendar.py
@@ -22,7 +22,7 @@
 #   You should have received a copy of the GNU General Public License
 #   along with this program; if not, write to the
 #   Free Software Foundation, Inc.,
-#   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 ############################################################################
 
 #@-node:<< Copyright >>
diff --git a/addons/resource/faces/plocale.py b/addons/resource/faces/plocale.py
index 61bfa91917b..908fd1252e9 100644
--- a/addons/resource/faces/plocale.py
+++ b/addons/resource/faces/plocale.py
@@ -17,7 +17,7 @@
 #   You should have received a copy of the GNU General Public License
 #   along with this program; if not, write to the
 #   Free Software Foundation, Inc.,
-#   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 ############################################################################
 
 import gettext
diff --git a/addons/resource/faces/resource.py b/addons/resource/faces/resource.py
index 3451806444e..faee8174994 100644
--- a/addons/resource/faces/resource.py
+++ b/addons/resource/faces/resource.py
@@ -22,7 +22,7 @@
 #   You should have received a copy of the GNU General Public License
 #   along with this program; if not, write to the
 #   Free Software Foundation, Inc.,
-#   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 ############################################################################
 
 #@-node:<< Copyright >>
diff --git a/addons/resource/faces/task.py b/addons/resource/faces/task.py
index 7516f41db2a..961f6213d1d 100644
--- a/addons/resource/faces/task.py
+++ b/addons/resource/faces/task.py
@@ -22,7 +22,7 @@
 #   You should have received a copy of the GNU General Public License
 #   along with this program; if not, write to the
 #   Free Software Foundation, Inc.,
-#   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 ############################################################################
 
 #@-node:<< Copyright >>
diff --git a/addons/resource/faces/timescale.py b/addons/resource/faces/timescale.py
index 3e7c3c1dc89..818c031b7d5 100644
--- a/addons/resource/faces/timescale.py
+++ b/addons/resource/faces/timescale.py
@@ -17,7 +17,7 @@
 #   You should have received a copy of the GNU General Public License
 #   along with this program; if not, write to the
 #   Free Software Foundation, Inc.,
-#   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 ############################################################################
 
 import faces.pcalendar as pcal
diff --git a/addons/resource/faces/utils.py b/addons/resource/faces/utils.py
index 54985767613..6568c314fb5 100644
--- a/addons/resource/faces/utils.py
+++ b/addons/resource/faces/utils.py
@@ -17,7 +17,7 @@
 #   You should have received a copy of the GNU General Public License
 #   along with this program; if not, write to the
 #   Free Software Foundation, Inc.,
-#   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 ############################################################################
 
 import observer
diff --git a/addons/resource/resource.py b/addons/resource/resource.py
index 944c90a3749..449fa422ab4 100644
--- a/addons/resource/resource.py
+++ b/addons/resource/resource.py
@@ -25,6 +25,7 @@ from dateutil import rrule
 import math
 from faces import *
 from openerp.osv import fields, osv
+from openerp.tools.float_utils import float_compare
 from openerp.tools.translate import _
 
 from itertools import groupby
@@ -108,11 +109,11 @@ class resource_calendar(osv.osv):
         result = []
         maxrecur = 100
         current_hour = dt_from.hour
-        while (todo>0) and maxrecur:
+        while float_compare(todo, 0, 4) and maxrecur:
             cr.execute("select hour_from,hour_to from resource_calendar_attendance where dayofweek='%s' and calendar_id=%s order by hour_from desc", (dt_from.weekday(),id))
             for (hour_from,hour_to) in cr.fetchall():
                 leave_flag  = False
-                if (hour_from<current_hour) and (todo>0):
+                if (hour_from<current_hour) and float_compare(todo, 0, 4):
                     m = min(hour_to, current_hour)
                     if (m-hour_from)>todo:
                         hour_from = m-todo
@@ -161,10 +162,10 @@ class resource_calendar(osv.osv):
             result = []
             maxrecur = 100
             current_hour = dt_from.hour
-            while (todo>0) and maxrecur:
+            while float_compare(todo, 0, 4) and maxrecur:
                 for (hour_from,hour_to) in [(item['hour_from'], item['hour_to']) for item in hours_by_cal[id] if item['dayofweek'] == str(dt_from.weekday())]:
                     leave_flag  = False
-                    if (hour_to>current_hour) and (todo>0):
+                    if (hour_to>current_hour) and float_compare(todo, 0, 4):
                         m = max(hour_from, current_hour)
                         if (hour_to-m)>todo:
                             hour_to = m+todo
diff --git a/addons/sale/html/Gunther-Rombouts.png b/addons/sale/html/Gunther-Rombouts.png
new file mode 100644
index 00000000000..094eb7c764d
Binary files /dev/null and b/addons/sale/html/Gunther-Rombouts.png differ
diff --git a/addons/sale/html/Philippe-Leruth.png b/addons/sale/html/Philippe-Leruth.png
new file mode 100644
index 00000000000..ee024149207
Binary files /dev/null and b/addons/sale/html/Philippe-Leruth.png differ
diff --git a/addons/sale/html/index.html b/addons/sale/html/index.html
new file mode 100644
index 00000000000..1eb6215db2f
--- /dev/null
+++ b/addons/sale/html/index.html
@@ -0,0 +1,296 @@
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan">Sales Management Made Easy</h2>
+        <h3 class="oe_slogan">From quotes to invoices, in just a few clicks</h3>
+        <div class="oe_span6">
+            <div class="oe_demo oe_picture oe_screenshot">
+                <a href="https://www.openerp.com/saas_master/demo?lang=en_US&module=sale">
+                    <img src="sale_invoice.png">
+                </a>
+                <div class="oe_demo_footer oe_centeralign">Online Demo</div>
+            </div>
+        </div>
+        <div class="oe_span6">
+            <p class='oe_mt32'>
+Drive your sales operations from quotes to invoices with all the information
+you need, easily accessible. Keep track of long term contracts, automate invoicing
+and notify sales when they have things to do.
+            </p>
+            <div class="oe_centeralign oe_websiteonly">
+                <a href="http://www.openerp.com/start" class="oe_button oe_big oe_tacky">Start your <span class="oe_emph">free</span> trial</a>
+            </div>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container oe_dark">
+    <div class="oe_row">
+        <h2 class="oe_slogan">Create Professional Quotations</h2>
+        <div class="oe_span6">
+            <p class='oe_mt32'>
+Create quotations in a matter of seconds. Send quotes by email or get a
+professional PDF. Track quotations, and convert them to sales order in one click.
+            </p>
+            <p class='oe_mt32'>
+Spend the extra time focusing on selling, not recording data.
+            </p>
+        </div>
+        <div class="oe_span6">
+            <div class="oe_bg_img">
+                <img class="oe_picture oe_screenshot" src="sale_sc_01.png">
+            </div>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row">
+        <h2 class="oe_slogan">Fully Integrated</h2>
+        <h3 class="oe_slogan">The information your need, where you need it</h3>
+        <div class="oe_span6">
+            <div class="oe_bg_img">
+                <img class="oe_picture oe_screenshot" src="sale_sc_02.png">
+            </div>
+        </div>
+        <div class="oe_span6">
+            <p class='oe_mt32'>
+                Don't lose time looking for customers, products or contracts
+                related information; they are all conveniently accessible when
+                creating quotations.
+            </p><p class='oe_mt32'>
+                Get access to stock availabilities in the different warehouses,
+                to customer's specific prices, to the history of preceeding
+                offers for this prospect, etc.
+            </p>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container oe_centeralign oe_padded oe_mb32">
+    <div class='oe_cover'>
+        <img src="http://www.openerp.com/ebooks/marketing.png">
+    </div>
+    <a href="http://www.openerp.com/ebooks/marketing" target="_blank" class="oe_button oe_big">Download our free E-book</a>
+</section>
+
+<section class="oe_container oe_dark">
+    <div class="oe_row">
+        <h2 class="oe_slogan">Your Address Book</h2>
+        <h3 class="oe_slogan">So many features, so easy to use</h3>
+        <div class="oe_span6">
+            <p class='oe_mt32'>
+Load customer data from LinkedIn, assign tags to your prospects, manage
+relationships between contacts and store all customer's preferences including
+pricing, billing conditions, addresses, payment terms, etc.
+            </p>
+            <p class='oe_mt32'>
+Navigate through all the documents related to a customer with the powerfull
+breadcrumb: quotations, invoices, emails, meetings.
+            </p>
+        </div>
+        <div class="oe_span6">
+            <div class="oe_bg_img">
+                <img class="oe_picture oe_screenshot" src="sale_sc_03.png">
+            </div>
+        </div>
+   </div>
+</section>
+
+<section class="oe_container">
+    <h2 class="oe_slogan">Fully Integrated Invoicing</h2>
+    <h3 class="oe_slogan">All the invoicing methods you need</h3>
+    <div class="oe_row">
+        <div class="oe_span6">
+            <div class="oe_bg_img">
+                <img class="oe_picture oe_screenshot" src="sale_sc_04.png">
+            </div>
+        </div>
+        <div class="oe_span6">
+            <p class='oe_mt32'>
+                Whether you invoice based on time and materials, on delivery
+                orders or fixed price; OpenERP supports all possible methods.
+            </p>
+            <p class='oe_mt32'>
+                Get recurring invoices produced automatically, create advances
+                in just a few clicks, re-invoices expenses easily, etc.
+            </p>
+        </div>
+   </div>
+</section>
+
+<section class="oe_container oe_dark">
+    <div class="oe_row">
+      <h2 class="oe_slogan">Keep track of your contracts</h2>
+      <div class="oe_span6">
+            <p class='oe_mt32'>
+Get rid of wasted paper and record all your contracts in the application. Invoices
+are generated automatically based on your contract conditions. Your account
+managers get alerts before contracts have to be renewed.
+            </p>
+        </div>
+        <div class="oe_span6">
+            <div class="oe_bg_img">
+                <img class="oe_picture oe_screenshot" src="sale_sc_05.png">
+            </div>
+        </div>
+
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row">
+        <h2 class="oe_slogan">Communicate Efficiently With Customers</h2>
+      <div class="oe_span6">
+            <div class="oe_bg_img">
+                <img class="oe_picture oe_screenshot" src="sale_sc_06.png">
+            </div>
+       </div>
+        <div class="oe_span6">
+            <p class='oe_mt32'>
+The chatter feature enables you to communicate faster and more efficiently with
+your customer. This takes place directly on a quotation or sale order from
+within OpenERP or via email.
+            </p>
+            <p class='oe_mt32'>
+Get all the negotiations and discussions attached to the right document
+and relevent managers notified on specific events.
+            </p>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container oe_dark">
+    <div class="oe_row">
+        <h2 class="oe_slogan">Fully Extensible</h2>
+        <h3 class="oe_slogan">Activate features on demand</h3>
+        <div class="oe_span6">
+            <p class='oe_mt32'>
+By default, sales order are very simple, limited to a small number of features.
+Don't be confused by features you don't need.
+            </p>
+            <p class='oe_mt32'>
+But you can activate options to fit your specific need: multi-warehouses, multi
+unit of measures, manage customer specific prices with pricelists, control
+margins on quotations, use different addresses for shipping and billing, etc.
+            </p>
+        </div>
+        <div class="oe_span6">
+            <div class="oe_bg_img">
+                <img class="oe_picture oe_screenshot" src="sale_sc_07.png">
+            </div>
+        </div>
+   </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row">
+        <h2 class="oe_slogan">Built-in Customer Relationship Management</h2>
+        <div class="oe_span6">
+            <div class="oe_bg_img">
+                <img class="oe_picture oe_screenshot" src="sale_sc_08.png">
+            </div>
+        </div>
+        <div class="oe_span6">
+            <p class='oe_mt32'>
+Activate the CRM application to manage your funnel of opportunities, attract
+leads, log calls, schedule meetings and launch marketing campaigns.
+            </p>
+            <p class='oe_mt32'>
+            Opportunities can be converted into quotations in just one click.
+            </p>
+        </div>
+   </div>
+</section>
+
+<section class="oe_container oe_dark">
+    <div class="oe_row">
+       <h2 class="oe_slogan">Drive Engagement with Gamification</h2>
+       <h3 class="oe_slogan">Align Sales On Clear Targets</h3>
+       <div class="oe_span6">
+            <p class='oe_mt32'>
+Define clear targets and commission plans. Get real time statistics on the
+performance of individual sales or teams. Motivate your teams with challenges,
+rewards and leaderboards.
+            </p>
+        </div>
+        <div class="oe_span6">
+            <div class="oe_bg_img">
+                <img class="oe_picture oe_screenshot" src="sale_sc_00.png">
+            </div>
+        </div>
+     </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row">
+        <h2 class="oe_slogan">Have Clear Pricing Strategies</h2>
+        <div class="oe_span6">
+            <div class="oe_bg_img">
+                <img class="oe_picture" src="sales_target.png">
+            </div>
+        </div>
+        <div class="oe_span6">
+            <p class='oe_mt32'>
+Use pricelists to record special conditions for a specific customer or to
+define prices for a segment of customers. Define promotions and have them
+applied automatically for all your sales teams.
+            </p>
+        </div>
+   </div>
+</section>
+
+<section class="oe_container oe_dark">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan">Reporting and Dashboards</h2>
+        <h3 class="oe_slogan">Get access to the right information to make smart decisions</h3>
+        <div class="oe_span6">
+            <p class="oe_mt32">
+Get the insights you need to make smarter decisions. Design custom dashboards
+to get a picture of your business at a glance. Dig deeper with real-time
+reports that anyone can create and share.
+            </p>
+        </div>
+        <div class="oe_span6">
+            <div class="oe_bg_img">
+                <img class="oe_picture oe_screenshot" src="sale_sc_10.png">
+            </div>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row">
+        <div class="oe_span12">
+            <h2 class="oe_slogan">Many companies already enjoy it</h2>
+            <h3 class="oe_slogan">Hear what they have to say !</h3>
+        </div>
+        <div class="oe_span6">
+            <div class="oe_quote">
+                <q>
+                    OpenERP proved to be an effective tool to sustain our operations
+                    for the bright future. It's stable, robust and easy.
+                </q>
+                <cite class="oe_cite oe_clearfix">
+                    <img class="oe_photo" src="Philippe-Leruth.png">
+                    <div class="oe_author">Philippe Leruth</div>
+                    <div class="oe_job">Director of Singer France</div>
+                </cite>
+            </div>
+        </div>
+        <div class="oe_span6">
+            <div class="oe_quote">
+                <q>
+                    OpenERP is a great tool to drive sales. We manage our prospects in different stages
+                    to get a proper overview of our success rate.
+                </q>
+                <cite class="oe_cite oe_clearfix">
+                    <img class="oe_photo" src="Gunther-Rombouts.png">
+                    <div class="oe_author">Ir Ing Gunther Rombouts</div>
+                    <div class="oe_job">Indutrial Automation Specialist at <a href="http://www.hew-automation.be" target="_blank">HeW automation</a>.</div>
+                </cite>
+            </div>
+        </div>
+    </div>
+</section>
+<section class="oe_container oe_separator">
+</section>
diff --git a/addons/sale/html/sale_invoice.png b/addons/sale/html/sale_invoice.png
new file mode 100644
index 00000000000..396276e5f7a
Binary files /dev/null and b/addons/sale/html/sale_invoice.png differ
diff --git a/addons/sale/html/sale_sc_00.png b/addons/sale/html/sale_sc_00.png
new file mode 100644
index 00000000000..8f1ff1e95fe
Binary files /dev/null and b/addons/sale/html/sale_sc_00.png differ
diff --git a/addons/sale/html/sale_sc_01.png b/addons/sale/html/sale_sc_01.png
new file mode 100644
index 00000000000..ba068ab11c1
Binary files /dev/null and b/addons/sale/html/sale_sc_01.png differ
diff --git a/addons/sale/html/sale_sc_02.png b/addons/sale/html/sale_sc_02.png
new file mode 100644
index 00000000000..4e89d43c4c3
Binary files /dev/null and b/addons/sale/html/sale_sc_02.png differ
diff --git a/addons/sale/html/sale_sc_03.png b/addons/sale/html/sale_sc_03.png
new file mode 100644
index 00000000000..42abf28506c
Binary files /dev/null and b/addons/sale/html/sale_sc_03.png differ
diff --git a/addons/sale/html/sale_sc_04.png b/addons/sale/html/sale_sc_04.png
new file mode 100644
index 00000000000..458c8280c26
Binary files /dev/null and b/addons/sale/html/sale_sc_04.png differ
diff --git a/addons/sale/html/sale_sc_05.png b/addons/sale/html/sale_sc_05.png
new file mode 100644
index 00000000000..ef41138976e
Binary files /dev/null and b/addons/sale/html/sale_sc_05.png differ
diff --git a/addons/sale/html/sale_sc_06.png b/addons/sale/html/sale_sc_06.png
new file mode 100644
index 00000000000..483e5eec09b
Binary files /dev/null and b/addons/sale/html/sale_sc_06.png differ
diff --git a/addons/sale/html/sale_sc_07.png b/addons/sale/html/sale_sc_07.png
new file mode 100644
index 00000000000..73fcfb3b083
Binary files /dev/null and b/addons/sale/html/sale_sc_07.png differ
diff --git a/addons/sale/html/sale_sc_08.png b/addons/sale/html/sale_sc_08.png
new file mode 100644
index 00000000000..e20c44836ba
Binary files /dev/null and b/addons/sale/html/sale_sc_08.png differ
diff --git a/addons/sale/html/sale_sc_10.png b/addons/sale/html/sale_sc_10.png
new file mode 100644
index 00000000000..b71ce805250
Binary files /dev/null and b/addons/sale/html/sale_sc_10.png differ
diff --git a/addons/sale/html/sales_illu_01.png b/addons/sale/html/sales_illu_01.png
new file mode 100644
index 00000000000..66e680bc42e
Binary files /dev/null and b/addons/sale/html/sales_illu_01.png differ
diff --git a/addons/sale/html/sales_target.png b/addons/sale/html/sales_target.png
new file mode 100644
index 00000000000..41042ce49ea
Binary files /dev/null and b/addons/sale/html/sales_target.png differ
diff --git a/addons/sale/i18n/ru.po b/addons/sale/i18n/ru.po
index 405ac210af5..8449bd83224 100644
--- a/addons/sale/i18n/ru.po
+++ b/addons/sale/i18n/ru.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
-"PO-Revision-Date: 2012-12-28 14:12+0000\n"
+"PO-Revision-Date: 2013-06-03 07:54+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@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: 2013-03-16 05:22+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-06-04 05:20+0000\n"
+"X-Generator: Launchpad (build 16660)\n"
 
 #. module: sale
 #: model:res.groups,name:sale.group_analytic_accounting
@@ -89,6 +89,8 @@ msgid ""
 "${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
 "'draft' or ''}"
 msgstr ""
+"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
+"'draft' or ''}"
 
 #. module: sale
 #: view:sale.order.line:0
@@ -558,6 +560,7 @@ msgstr "Подготовить счета основанные на распис
 #, python-format
 msgid "You cannot cancel a sales order line that has already been invoiced."
 msgstr ""
+"Нельзя отменить позиции заказа продажи на которые был выставлен счет."
 
 #. module: sale
 #: view:account.invoice.report:0
@@ -1550,7 +1553,7 @@ msgstr "Искать позиции без счетов"
 #. module: sale
 #: model:ir.model,name:sale.model_account_config_settings
 msgid "account.config.settings"
-msgstr ""
+msgstr "account.config.settings"
 
 #. module: sale
 #: sql_constraint:sale.order:0
@@ -1876,7 +1879,7 @@ msgstr ""
 #. module: sale
 #: view:res.partner:0
 msgid "sale.group_delivery_invoice_address"
-msgstr ""
+msgstr "sale.group_delivery_invoice_address"
 
 #. module: sale
 #: code:addons/sale/sale.py:781
diff --git a/addons/sale/process/sale_process.xml b/addons/sale/process/sale_process.xml
index 706d42913de..b3034cafa28 100644
--- a/addons/sale/process/sale_process.xml
+++ b/addons/sale/process/sale_process.xml
@@ -70,8 +70,8 @@
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Confirm Quotation&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;The salesman confirms the quotation. The state of the sales order becomes 'In progress' or 'Manual in progress'.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_saleorder0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_quotation0"/>
+            <field name="target_node_id" ref="process_node_saleorder0"/>
+            <field name="source_node_id" ref="process_node_quotation0"/>
             <field eval="[(6,0,[ref('sale.trans_draft_router')])]" name="transition_ids"/>
         </record>
 
@@ -80,8 +80,8 @@
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Create Invoice&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;The Salesman creates an invoice manually, if the sales order shipping policy is 'Shipping and Manual in Progress'. The invoice is created automatically if the shipping policy is 'Payment before Delivery'.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_invoice0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_saleorder0"/>
+            <field name="target_node_id" ref="process_node_invoice0"/>
+            <field name="source_node_id" ref="process_node_saleorder0"/>
             <field eval="[(6,0,[ref('sale.trans_wait_invoice_invoice_manual')])]" name="transition_ids"/>
         </record>
 
@@ -90,8 +90,8 @@
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;From a sales order&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Depending on the Invoicing control of the sales order, the invoice can be based on delivered or on ordered quantities. Thus, a sales order can generates an invoice or a delivery order as soon as it is confirmed by the salesman.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="account.process_node_draftinvoices0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_order0"/>
+            <field name="target_node_id" ref="account.process_node_draftinvoices0"/>
+            <field name="source_node_id" ref="process_node_order0"/>
         </record>
 
         <!--
diff --git a/addons/sale/res_partner_view.xml b/addons/sale/res_partner_view.xml
index 40ac119fdee..5107f0c17af 100644
--- a/addons/sale/res_partner_view.xml
+++ b/addons/sale/res_partner_view.xml
@@ -69,27 +69,15 @@
                     <attribute name="invisible">False</attribute>
                     <attribute name="groups">sale.group_delivery_invoice_address</attribute>
                 </xpath>
-                <xpath expr="//field[@name='use_parent_address']" position="attributes">
+                <!--  Version-specific hacks to avoid breaking view inheritance when the sale module
+                      is installed on top of an older 7.0 version of the base module
+                      (as the second embedded div_type was added later in the 7.0 release)
+                      TODO: remove the hacks in trunk -->
+                <xpath expr="//div[@name='div_type'][field[@name='use_parent_address']] | //field[@name='child_ids']//div[@name='div_type']" position="attributes">
                     <attribute name="invisible">False</attribute>
                     <attribute name="groups">sale.group_delivery_invoice_address</attribute>
                 </xpath>
-                <xpath expr="//label[@for='use_parent_address']" position="attributes">
-                    <attribute name="invisible">False</attribute>
-                    <attribute name="groups">sale.group_delivery_invoice_address</attribute>
-                </xpath>
-                <xpath expr="//field[@name='child_ids']//field[@name='use_parent_address']" position="attributes">
-                    <attribute name="invisible">False</attribute>
-                    <attribute name="groups">sale.group_delivery_invoice_address</attribute>
-                </xpath>
-                <xpath expr="//field[@name='child_ids']//label[@for='use_parent_address']" position="attributes">
-                    <attribute name="invisible">False</attribute>
-                    <attribute name="groups">sale.group_delivery_invoice_address</attribute>
-                </xpath>
-                <xpath expr="//field[@name='child_ids']//div[@name='div_type']" position="attributes">
-                    <attribute name="invisible">False</attribute>
-                    <attribute name="groups">sale.group_delivery_invoice_address</attribute>
-                </xpath>
-                <xpath expr="//field[@name='child_ids']//label[@for='type']" position="attributes">
+                <xpath expr="//label[@for='type'][following-sibling::div[@name='div_type']/field[@name='use_parent_address']] | //field[@name='child_ids']//label[@for='type']" position="attributes">
                     <attribute name="invisible">False</attribute>
                     <attribute name="groups">sale.group_delivery_invoice_address</attribute>
                 </xpath>
diff --git a/addons/sale/sale_demo.xml b/addons/sale/sale_demo.xml
index 428b586ffa8..eb937199aba 100644
--- a/addons/sale/sale_demo.xml
+++ b/addons/sale/sale_demo.xml
@@ -288,6 +288,8 @@
         </record>
 
         <!-- Confirm some Sale Orders-->
+        <workflow action="order_confirm" model="sale.order" ref="sale_order_4"/>
+
         <workflow action="order_confirm" model="sale.order" ref="sale_order_7"/>
 
         <record id="message_sale_1" model="mail.message">
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index e24a6e45fe0..d8d038eb002 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -307,7 +307,7 @@
                     <filter icon="terp-dolar_ok!" string="To Invoice" domain="[('state','=','manual')]" help="Sales Order ready to be invoiced"/>
                     <filter icon="terp-dolar_ok!" string="Done" domain="[('state','=','done')]" help="Sales Order done"/>
                     <separator/>
-                    <filter string="My Sales Orders" domain="[('user_id','=',uid)]" help="My Sales Orders" icon="terp-personal" name="my_sale_orders_filter"/>
+                    <filter string="My" domain="[('user_id','=',uid)]" help="My Sales Orders" icon="terp-personal" name="my_sale_orders_filter"/>
                     <field name="partner_id" filter_domain="[('partner_id', 'child_of', self)]"/>
                     <field name="user_id"/>
                     <field name="project_id"/>
diff --git a/addons/sale/wizard/sale_line_invoice.py b/addons/sale/wizard/sale_line_invoice.py
index 83b953cc4d5..3b04319f5c7 100644
--- a/addons/sale/wizard/sale_line_invoice.py
+++ b/addons/sale/wizard/sale_line_invoice.py
@@ -21,6 +21,7 @@
 
 from openerp.osv import osv, fields
 from openerp.tools.translate import _
+from openerp import netsvc
 
 class sale_order_line_make_invoice(osv.osv_memory):
     _name = "sale.order.line.make.invoice"
@@ -80,6 +81,7 @@ class sale_order_line_make_invoice(osv.osv_memory):
 
         sales_order_line_obj = self.pool.get('sale.order.line')
         sales_order_obj = self.pool.get('sale.order')
+        wf_service = netsvc.LocalService('workflow')
         for line in sales_order_line_obj.browse(cr, uid, context.get('active_ids', []), context=context):
             if (not line.invoiced) and (line.state not in ('draft', 'cancel')):
                 if not line.order_id in invoices:
diff --git a/addons/sale_analytic_plans/i18n/ru.po b/addons/sale_analytic_plans/i18n/ru.po
index 90d9eb5c3b9..8995b7b45c0 100644
--- a/addons/sale_analytic_plans/i18n/ru.po
+++ b/addons/sale_analytic_plans/i18n/ru.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-21 17:06+0000\n"
-"PO-Revision-Date: 2010-12-25 22:14+0000\n"
+"PO-Revision-Date: 2013-06-03 08:05+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@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: 2013-03-16 05:32+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-06-04 05:20+0000\n"
+"X-Generator: Launchpad (build 16660)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
@@ -24,7 +24,7 @@ msgstr "Разнесение аналитики"
 #. module: sale_analytic_plans
 #: model:ir.model,name:sale_analytic_plans.model_sale_order
 msgid "Sales Order"
-msgstr ""
+msgstr "Заказ продаж"
 
 #. module: sale_analytic_plans
 #: model:ir.model,name:sale_analytic_plans.model_sale_order_line
diff --git a/addons/sale_analytic_plans/sale_analytic_plans_view.xml b/addons/sale_analytic_plans/sale_analytic_plans_view.xml
index 3600d71b7d4..121efbdf12e 100644
--- a/addons/sale_analytic_plans/sale_analytic_plans_view.xml
+++ b/addons/sale_analytic_plans/sale_analytic_plans_view.xml
@@ -52,5 +52,17 @@
         </field>
     </record>
 
+    <record model="ir.ui.view" id="view_invoice_form_analytic_inherit">
+        <field name="name">account.invoice.form.analytic.inherit</field>
+        <field name="model">account.invoice</field>
+        <field name="inherit_id" ref="account.invoice_form"/>
+        <field name="arch" type="xml">
+            <field name="account_analytic_id" position="replace">
+                <field name="analytics_id" context="{'journal_id':parent.journal_id}" domain="[('plan_id','&lt;&gt;',False)]" groups="analytic.group_analytic_accounting"/>
+            </field>
+        </field>
+    </record>
+
+
   </data>
 </openerp>
diff --git a/addons/sale_crm/__openerp__.py b/addons/sale_crm/__openerp__.py
index 6591589342e..7db1aa1eff0 100644
--- a/addons/sale_crm/__openerp__.py
+++ b/addons/sale_crm/__openerp__.py
@@ -47,7 +47,11 @@ modules.
         'security/ir.model.access.csv',
         'report/sale_crm_account_invoice_report_view.xml',
     ],
-    'demo': [],
+    'js': [
+        'static/lib/justgage.js',
+        'static/src/js/sale_crm.js',
+    ],
+    'demo': ['sale_crm_demo.xml'],
     'test': ['test/sale_crm.yml'],
     'installable': True,
     'auto_install': True,
diff --git a/addons/sale_crm/i18n/ru.po b/addons/sale_crm/i18n/ru.po
index 8ae90e42303..f6266edf8ca 100644
--- a/addons/sale_crm/i18n/ru.po
+++ b/addons/sale_crm/i18n/ru.po
@@ -7,20 +7,20 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-21 17:06+0000\n"
-"PO-Revision-Date: 2011-03-23 13:50+0000\n"
+"PO-Revision-Date: 2013-06-03 08:05+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@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: 2013-03-16 05:10+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-06-04 05:20+0000\n"
+"X-Generator: Launchpad (build 16660)\n"
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:90
 #, python-format
 msgid "Insufficient Data!"
-msgstr ""
+msgstr "Недостаточно данных!"
 
 #. module: sale_crm
 #: view:crm.lead:0
@@ -31,12 +31,12 @@ msgstr "Преобразовать в предложение"
 #. module: sale_crm
 #: model:ir.model,name:sale_crm.model_account_invoice_report
 msgid "Invoices Statistics"
-msgstr ""
+msgstr "Статистика по счетам"
 
 #. module: sale_crm
 #: field:crm.make.sale,close:0
 msgid "Mark Won"
-msgstr ""
+msgstr "Отметить \"Выиграна\""
 
 #. module: sale_crm
 #: field:res.users,default_section_id:0
@@ -51,23 +51,23 @@ msgstr "Мои отделы продаж"
 #. module: sale_crm
 #: model:ir.model,name:sale_crm.model_res_users
 msgid "Users"
-msgstr ""
+msgstr "Пользователи"
 
 #. module: sale_crm
 #: help:crm.make.sale,close:0
 msgid ""
 "Check this to close the opportunity after having created the sales order."
-msgstr ""
+msgstr "Отметьте, для закрытия предложения после создания заказа продажи."
 
 #. module: sale_crm
 #: model:mail.message.subtype,name:sale_crm.mt_salesteam_order_sent
 msgid "Quotation Send"
-msgstr ""
+msgstr "Отправить предложение"
 
 #. module: sale_crm
 #: field:sale.order,categ_ids:0
 msgid "Categories"
-msgstr ""
+msgstr "Категории"
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:124
@@ -94,7 +94,7 @@ msgstr "Продать"
 #. module: sale_crm
 #: model:ir.model,name:sale_crm.model_account_invoice
 msgid "Invoice"
-msgstr ""
+msgstr "Счет"
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:93
@@ -106,7 +106,7 @@ msgstr "Предложение: %s"
 #: code:addons/sale_crm/wizard/crm_make_sale.py:110
 #, python-format
 msgid "Opportunity has been <b>converted</b> to the quotation <em>%s</em>."
-msgstr ""
+msgstr "Предложение <b>преобразовано</b> в заявку <em>%s</em>."
 
 #. module: sale_crm
 #: field:crm.make.sale,shop_id:0
@@ -117,12 +117,12 @@ msgstr "Магазин"
 #: code:addons/sale_crm/wizard/crm_make_sale.py:90
 #, python-format
 msgid "No addresse(s) defined for this customer."
-msgstr ""
+msgstr "Не задан адрес для этого заказчика"
 
 #. module: sale_crm
 #: model:mail.message.subtype,name:sale_crm.mt_salesteam_order_confirmed
 msgid "Sales Order Confirmed"
-msgstr ""
+msgstr "Заказ продаж подтвержден"
 
 #. module: sale_crm
 #: view:account.invoice:0
@@ -136,7 +136,7 @@ msgstr "Отдел продаж"
 #. module: sale_crm
 #: view:crm.lead:0
 msgid "Create Quotation"
-msgstr ""
+msgstr "Создать заявку"
 
 #. module: sale_crm
 #: model:ir.actions.act_window,name:sale_crm.action_crm_make_sale
@@ -156,7 +156,7 @@ msgstr "Заказ продаж"
 #. module: sale_crm
 #: view:crm.make.sale:0
 msgid "or"
-msgstr ""
+msgstr "или"
 
 #~ msgid "Create"
 #~ msgstr "Создать"
diff --git a/addons/sale_crm/process/sale_crm_process.xml b/addons/sale_crm/process/sale_crm_process.xml
index 721508a2ba5..21297e12dbd 100644
--- a/addons/sale_crm/process/sale_crm_process.xml
+++ b/addons/sale_crm/process/sale_crm_process.xml
@@ -42,8 +42,8 @@
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Crm opportunity quotation&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Opportunity goes into the quotation&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="sale.process_node_quotation0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_crmopportunity0"/>
+            <field name="target_node_id" ref="sale.process_node_quotation0"/>
+            <field name="source_node_id" ref="process_node_crmopportunity0"/>
         </record>
 
 
@@ -51,24 +51,24 @@
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Opportunity Quotation&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Opportunity convert into quotation&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_crmquotation0"/>
-            <field model="process.node" name="source_node_id" ref="crm.process_node_opportunities0"/>
+            <field name="target_node_id" ref="process_node_crmquotation0"/>
+            <field name="source_node_id" ref="crm.process_node_opportunities0"/>
         </record>
 
         <record id="process_transition_opportunitypricelist0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Opportunity Pricelist&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Opporunity convert to the Pricelist&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_contractpricelist0"/>
-            <field model="process.node" name="source_node_id" ref="crm.process_node_opportunities0"/>
+            <field name="target_node_id" ref="process_node_contractpricelist0"/>
+            <field name="source_node_id" ref="crm.process_node_opportunities0"/>
         </record>
 
         <record id="process_transition_opportunityanalytic0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Opportunity Analytic&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Analytic Account&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_contractanalytic0"/>
-            <field model="process.node" name="source_node_id" ref="crm.process_node_opportunities0"/>
+            <field name="target_node_id" ref="process_node_contractanalytic0"/>
+            <field name="source_node_id" ref="crm.process_node_opportunities0"/>
         </record>
 
         -->
diff --git a/addons/sale_crm/sale_crm.py b/addons/sale_crm/sale_crm.py
index d0899729050..97c5f4579e0 100644
--- a/addons/sale_crm/sale_crm.py
+++ b/addons/sale_crm/sale_crm.py
@@ -19,7 +19,10 @@
 #
 ##############################################################################
 
-from datetime import datetime
+from datetime import date
+from dateutil import relativedelta
+
+from openerp import tools
 from openerp.osv import osv, fields
 
 
@@ -31,35 +34,61 @@ class sale_order(osv.osv):
             domain="['|',('section_id','=',section_id),('section_id','=',False), ('object_id.model', '=', 'crm.lead')]")
     }
 
+    def _prepare_invoice(self, cr, uid, order, lines, context=None):
+        invoice_vals = super(sale_order, self)._prepare_invoice(cr, uid, order, lines, context=context)
+        if order.section_id and order.section_id.id:
+            invoice_vals['section_id'] = order.section_id.id
+        return invoice_vals
+
 
 class crm_case_section(osv.osv):
     _inherit = 'crm.case.section'
 
-    def _get_sum_month_invoice(self, cr, uid, ids, field_name, arg, context=None):
-        res = dict.fromkeys(ids, 0)
+    def _get_sale_orders_data(self, cr, uid, ids, field_name, arg, context=None):
+        obj = self.pool.get('sale.order')
+        res = dict.fromkeys(ids, False)
+        month_begin = date.today().replace(day=1)
+        groupby_begin = (month_begin + relativedelta.relativedelta(months=-4)).strftime(tools.DEFAULT_SERVER_DATE_FORMAT)
+        for id in ids:
+            res[id] = dict()
+            created_domain = [('section_id', '=', id), ('state', 'in', ['draft', 'sent']), ('date_order', '>=', groupby_begin)]
+            res[id]['monthly_quoted'] = self.__get_bar_values(cr, uid, obj, created_domain, ['amount_total', 'date_order'], 'amount_total', 'date_order', context=context)
+            validated_domain = [('section_id', '=', id), ('state', 'not in', ['draft', 'sent']), ('date_confirm', '>=', groupby_begin)]
+            res[id]['monthly_confirmed'] = self.__get_bar_values(cr, uid, obj, validated_domain, ['amount_total', 'date_confirm'], 'amount_total', 'date_confirm', context=context)
+        return res
+
+    def _get_invoices_data(self, cr, uid, ids, field_name, arg, context=None):
         obj = self.pool.get('account.invoice.report')
-        when = datetime.today()
-        for section_id in ids:
-            invoice_ids = obj.search(cr, uid, [("section_id", "=", section_id), ('state', 'not in', ['draft', 'cancel']), ('year', '=', when.year), ('month', '=', when.month > 9 and when.month or "0%s" % when.month)], context=context)
-            for invoice in obj.browse(cr, uid, invoice_ids, context=context):
-                res[section_id] += invoice.price_total
+        res = dict.fromkeys(ids, False)
+        month_begin = date.today().replace(day=1)
+        groupby_begin = (month_begin + relativedelta.relativedelta(months=-4)).strftime(tools.DEFAULT_SERVER_DATE_FORMAT)
+        for id in ids:
+            created_domain = [('section_id', '=', id), ('state', 'not in', ['draft', 'cancel']), ('date', '>=', groupby_begin)]
+            res[id] = self.__get_bar_values(cr, uid, obj, created_domain, ['price_total', 'date'], 'price_total', 'date', context=context)
         return res
 
     _columns = {
-        'quotation_ids': fields.one2many('sale.order', 'section_id',
-            string='Quotations', readonly=True,
-            domain=[('state', 'in', ['draft', 'sent', 'cancel'])]),
-        'sale_order_ids': fields.one2many('sale.order', 'section_id',
-            string='Sale Orders', readonly=True,
-            domain=[('state', 'not in', ['draft', 'sent', 'cancel'])]),
-        'invoice_ids': fields.one2many('account.invoice', 'section_id',
-            string='Invoices', readonly=True,
-            domain=[('state', 'not in', ['draft', 'cancel'])]),
-        'sum_month_invoice': fields.function(_get_sum_month_invoice,
-            string='Total invoiced this month',
-            type='integer', readonly=True),
+        'invoiced_forecast': fields.integer(string='Invoice Forecast',
+            help="Forecast of the invoice revenue for the current month. This is the amount the sales \n"
+                    "team should invoice this month. It is used to compute the progression ratio \n"
+                    " of the current and forecast revenue on the kanban view."),
+        'invoiced_target': fields.integer(string='Invoice Target',
+            help="Target of invoice revenue for the current month. This is the amount the sales \n"
+                    "team estimates to be able to invoice this month."),
+        'monthly_quoted': fields.function(_get_sale_orders_data,
+            type='string', readonly=True, multi='_get_sale_orders_data',
+            string='Rate of created quotation per duration'),
+        'monthly_confirmed': fields.function(_get_sale_orders_data,
+            type='string', readonly=True, multi='_get_sale_orders_data',
+            string='Rate of validate sales orders per duration'),
+        'monthly_invoiced': fields.function(_get_invoices_data,
+            type='string', readonly=True,
+            string='Rate of sent invoices per duration'),
     }
 
+    def action_forecast(self, cr, uid, id, value, context=None):
+        return self.write(cr, uid, [id], {'invoiced_forecast': value}, context=context)
+
 
 class res_users(osv.Model):
     _inherit = 'res.users'
diff --git a/addons/sale_crm/sale_crm_demo.xml b/addons/sale_crm/sale_crm_demo.xml
new file mode 100644
index 00000000000..0c2822719dd
--- /dev/null
+++ b/addons/sale_crm/sale_crm_demo.xml
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <record model="crm.case.section" id="crm.section_sales_department">
+            <field name="invoiced_forecast">52700</field>
+            <field name="invoiced_target">60000</field>
+        </record>
+        
+        <record model="crm.case.section" id="crm.crm_case_section_1">
+            <field name="name">Indirect Sales</field>
+            <field name="code">IM</field>
+            <field name="invoiced_forecast">36000</field>
+            <field name="invoiced_target">40000</field>
+        </record>
+
+        <!-- Invoice for Direct Marketing -->
+
+        <record id="test_crm_sale_invoice_1" model="account.invoice">
+            <field name="currency_id" ref="base.EUR"/>
+            <field name="company_id" ref="base.main_company"/>
+            <field name="partner_id" ref="base.res_partner_1"/>
+            <field name="journal_id" ref="account.sales_journal"/>
+            <field name="section_id" ref="crm.section_sales_department"/>
+            <field name="state">draft</field>
+            <field name="type">out_invoice</field>
+            <field name="account_id" ref="account.a_recv"/>
+            <field name="name">Test invoice 1</field>
+        </record>
+        <record id="test_crm_sale_invoice_1_line_1" model="account.invoice.line">
+            <field name="name">Basic computer with Dvorak keyboard and left-handed mouse</field>
+            <field name="invoice_id" ref="test_crm_sale_invoice_1"/>
+            <field name="price_unit">250</field>
+            <field name="quantity">1</field>
+            <field name="account_id" ref="account.a_sale"/>
+        </record>
+        <record id="test_crm_sale_invoice_1_line_2" model="account.invoice.line">
+            <field name="name">Little server with raid 1 and 512ECC ram</field>
+            <field name="invoice_id" ref="test_crm_sale_invoice_1"/>
+            <field name="price_unit">800</field>
+            <field name="quantity">2</field>
+            <field name="account_id" ref="account.a_sale"/>
+        </record>
+        <record id="test_crm_sale_invoice_1_line_2" model="account.invoice.line">
+            <field name="name">Server with raid 10 and 2048ECC ram</field>
+            <field name="invoice_id" ref="test_crm_sale_invoice_1"/>
+            <field name="price_unit">4800</field>
+            <field name="quantity">4</field>
+            <field name="account_id" ref="account.a_sale"/>
+        </record>
+        <workflow action="invoice_open" model="account.invoice" ref="test_crm_sale_invoice_1"/>
+        <function model="account.invoice" name="pay_and_reconcile">
+            <!-- ids = -->                    <value eval="[ref('test_crm_sale_invoice_1')]"/>
+            <!-- pay_amount = -->            <value eval="1850"/>
+            <!-- pay_account_id = -->        <value eval="ref('account.cash')"/>
+            <!-- period_id = -->            <value eval="ref('account.period_' + str(int(time.strftime('%m'))))"/>
+            <!-- pay_journal_id = -->        <value eval="ref('account.bank_journal')"/>
+            <!-- writeoff_acc_id = -->        <value eval="ref('account.cash')"/>
+            <!-- writeoff_period_id = -->    <value eval="ref('account.period_' + str(int(time.strftime('%m'))))"/>
+            <!-- writeoff_journal_id = -->    <value eval="ref('account.bank_journal')"/>
+            <!-- context = -->              <value eval="{}"/>
+            <!-- name = -->                 <value eval="str('Payment from ASUStek')"/>
+        </function>
+
+        <!-- Invoice for Indirect Marketing -->
+
+        <record id="test_crm_sale_invoice_2" model="account.invoice">
+            <field name="currency_id" ref="base.EUR"/>
+            <field name="company_id" ref="base.main_company"/>
+            <field name="partner_id" ref="base.res_partner_1"/>
+            <field name="journal_id" ref="account.sales_journal"/>
+            <field name="section_id" ref="crm.crm_case_section_1"/>
+            <field name="state">draft</field>
+            <field name="type">out_invoice</field>
+            <field name="account_id" ref="account.a_recv"/>
+            <field name="name">Test invoice 1</field>
+        </record>
+        <record id="test_crm_sale_invoice_2_line_1" model="account.invoice.line">
+            <field name="name">Basic formation with Dvorak</field>
+            <field name="invoice_id" ref="test_crm_sale_invoice_2"/>
+            <field name="price_unit">500</field>
+            <field name="quantity">1</field>
+            <field name="account_id" ref="account.a_sale"/>
+        </record>
+        <workflow action="invoice_open" model="account.invoice" ref="test_crm_sale_invoice_2"/>
+        <function model="account.invoice" name="pay_and_reconcile">
+            <!-- ids = -->                    <value eval="[ref('test_crm_sale_invoice_2')]"/>
+            <!-- pay_amount = -->            <value eval="500"/>
+            <!-- pay_account_id = -->        <value eval="ref('account.cash')"/>
+            <!-- period_id = -->            <value eval="ref('account.period_' + str(int(time.strftime('%m'))))"/>
+            <!-- pay_journal_id = -->        <value eval="ref('account.bank_journal')"/>
+            <!-- writeoff_acc_id = -->        <value eval="ref('account.cash')"/>
+            <!-- writeoff_period_id = -->    <value eval="ref('account.period_' + str(int(time.strftime('%m'))))"/>
+            <!-- writeoff_journal_id = -->    <value eval="ref('account.bank_journal')"/>
+            <!-- context = -->              <value eval="{}"/>
+            <!-- name = -->                 <value eval="str('Payment from ASUStek')"/>
+        </function>
+
+
+        <record id="sale.sale_order_1" model="sale.order">
+            <field name="section_id" ref="crm.section_sales_department"/>
+            <field name="date_order" eval="(DateTime.today() - relativedelta(months=1)).strftime('%Y-%m-%d %H:%M')"/>
+        </record>
+        <record id="sale.sale_order_2" model="sale.order">
+            <field name="section_id" ref="crm.section_sales_department"/>
+            <field name="date_order" eval="(DateTime.today() - relativedelta(months=1)).strftime('%Y-%m-%d %H:%M')"/>
+        </record>
+        <record id="sale.sale_order_3" model="sale.order">
+            <field name="section_id" ref="crm.section_sales_department"/>
+        </record>
+        <record id="sale.sale_order_4" model="sale.order">
+            <field name="section_id" ref="crm.section_sales_department"/>
+        </record>
+        <record id="sale.sale_order_5" model="sale.order">
+            <field name="section_id" ref="crm.crm_case_section_1"/>
+            <field name="date_order" eval="(DateTime.today() - relativedelta(months=1)).strftime('%Y-%m-%d %H:%M')"/>
+        </record>
+        <record id="sale.sale_order_6" model="sale.order">
+            <field name="section_id" ref="crm.crm_case_section_1"/>
+        </record>
+        <record id="sale.sale_order_7" model="sale.order">
+            <field name="section_id" ref="crm.section_sales_department"/>
+            <field name="date_confirm" eval="(DateTime.today() - relativedelta(months=1)).strftime('%Y-%m-%d %H:%M')"/>
+        </record>
+        <record id="sale.sale_order_8" model="sale.order">
+            <field name="section_id" ref="crm.crm_case_section_1"/>
+        </record>
+
+    </data>
+</openerp>
diff --git a/addons/sale_crm/sale_crm_view.xml b/addons/sale_crm/sale_crm_view.xml
index f8b4228334e..ae21934ce61 100644
--- a/addons/sale_crm/sale_crm_view.xml
+++ b/addons/sale_crm/sale_crm_view.xml
@@ -16,6 +16,11 @@
             </field>
         </record>
 
+        <!-- add needaction_menu_ref to reload quotation needaction when opportunity needaction is reloaded -->
+        <record model="ir.actions.act_window" id="crm.crm_case_category_act_oppor11">
+            <field name="context">{'stage_type': 'opportunity', 'default_type': 'opportunity', 'default_user_id': uid, 'needaction_menu_ref': 'sale.menu_sale_quotations'}</field>
+        </record>
+
         <record model="ir.ui.view" id="sale_view_inherit123">
             <field name="name">sale.order.inherit</field>
             <field name="model">sale.order</field>
@@ -38,7 +43,7 @@
                     <filter string="My Sales Team(s)"
                         icon="terp-personal+"
                         domain="[('section_id.user_id','=',uid)]"
-                        help="My Sales Team(s)"/>
+                        help="My Sales Team(s)"  groups="base.group_multi_salesteams"/>
                 </xpath>
                 <xpath expr="//field[@name='user_id']" position="after">
                     <field name="section_id" string="Sales Team" groups="base.group_multi_salesteams"/>
@@ -70,7 +75,7 @@
                     <field name="section_id"/>
                 </xpath>
                 <xpath expr="//group/filter[@string='Due Date']" position="after">
-                    <filter string="Sales Team" domain="[]" context="{'group_by':'section_id'}"/>
+                    <filter string="Sales Team" domain="[]" context="{'group_by':'section_id'}" groups="base.group_multi_salesteams"/>
                 </xpath>
             </field>
         </record>
@@ -96,7 +101,7 @@
             <field name="inherit_id" ref="base.view_users_form"/>
             <field name="arch" type="xml">
                 <data>
-                    <xpath expr="//field[@name='email']" position="after">
+                    <xpath expr="//field[@name='tz']" position="after">
                         <field name="default_section_id"/>
                     </xpath>
                 </data>
@@ -110,7 +115,7 @@
             <field name="inherit_id" ref="base.view_users_form_simple_modif"/>
             <field name="arch" type="xml">
             <data>
-                    <xpath expr="//field[@name='company_id']" position="after">
+                    <xpath expr="//field[@name='company_id']" position="before">
                         <field name="default_section_id"/>
                     </xpath>
                 </data>
@@ -130,7 +135,6 @@
             <field name="context">{
                     'search_default_section_id': [active_id],
                     'default_section_id': active_id,
-                    'search_default_my_sale_orders_filter': 1,
                 }
             </field>
             <field name="help" type="html">
@@ -153,8 +157,8 @@
             <field name="view_mode">tree,form,calendar,graph</field>
             <field name="context">{
                     'search_default_section_id': [active_id],
-                    'default_section_id': active_id, 'show_address': 1,
-                    'search_default_my_sale_orders_filter': 1
+                    'default_section_id': active_id,
+                    'show_address': 1,
                 }
             </field>
             <field name="domain">[('state','in',('draft','sent','cancel'))]</field>
@@ -185,7 +189,7 @@
                 ('type', '=', 'out_invoice')]</field>
             <field name="context">{
                     'search_default_section_id': [active_id],
-                    'default_section_id': active_id},
+                    'default_section_id': active_id,
                     'default_type':'out_invoice',
                     'type':'out_invoice',
                     'journal_type': 'sale',
@@ -207,38 +211,68 @@
             <field name="act_window_id" ref="sale_crm.action_invoice_salesteams"/>
         </record>
 
+        <record id="crm_case_section_salesteams_view_form" model="ir.ui.view">
+            <field name="name">crm.case.section.form</field>
+            <field name="model">crm.case.section</field>
+            <field name="inherit_id" ref="crm.crm_case_section_view_form"/>
+            <field name="arch" type="xml">
+            <data>
+                <xpath expr="//field[@name='code']" position="after">
+                    <field name="invoiced_target"/>
+                    <field name="invoiced_forecast"/>
+                </xpath>
+            </data>
+            </field>
+        </record>
+
         <record id="crm_case_section_salesteams_view_kanban" model="ir.ui.view">
             <field name="name">crm.case.section.kanban</field>
             <field name="model">crm.case.section</field>
             <field name="inherit_id" ref="crm.crm_case_section_salesteams_view_kanban"/>
             <field name="arch" type="xml">
             <data>
-                <xpath expr="//field[@name='open_opportunity_ids']" position="after">
-                    <field name="quotation_ids"/>
-                    <field name="sale_order_ids"/>
-                    <field name="invoice_ids"/>
+                <xpath expr="//field[@name='name']" position="after">
+                    <field name="monthly_quoted"/>
+                    <field name="monthly_confirmed"/>
+                    <field name="monthly_invoiced"/>
+                    <field name="invoiced_forecast"/>
+                    <field name="invoiced_target"/>
                 </xpath>
-                <xpath expr="//div[@class='oe_items_list']" position="inside">
-                    <a name="%(action_quotations_salesteams)d" type="action">
-                        <t t-raw="record.quotation_ids.raw_value.length"/>
-                        <t t-if="record.quotation_ids.raw_value.length &gt;= 2">Quotations</t>
-                        <t t-if="record.quotation_ids.raw_value.length &lt; 2">Quotation</t>
-                    </a>
-                    <a name="%(action_orders_salesteams)d" type="action">
-                        <t t-raw="record.sale_order_ids.raw_value.length"/>
-                        <t t-if="record.sale_order_ids.raw_value.length &gt;= 2">Sales Orders</t>
-                        <t t-if="record.sale_order_ids.raw_value.length &lt; 2">Sales Order</t>
-                    </a>
-                    <a name="%(action_invoice_salesteams)d" type="action" groups="account.group_account_invoice">
-                        <t t-raw="record.invoice_ids.raw_value.length"/>
-                        <t t-if="record.invoice_ids.raw_value.length &gt;= 2">Invoices</t>
-                        <t t-if="record.invoice_ids.raw_value.length &lt; 2">Invoice</t>
-                    </a>
+                <xpath expr="//div[@class='oe_salesteams_leads']" position="after">
+                    <div class="oe_salesteams_orders">
+                        <a name="%(action_orders_salesteams)d" type="action">Sales Orders</a>
+                        <a name="%(sale.action_order_report_all)d" type="action" class="oe_sparkline_bar_link">
+                            <field name="monthly_confirmed" widget="sparkline_bar">
+                                Revenue of confirmed sales orders per month.<br/>Click the acces to Sales Analysis
+                            </field>
+                        </a>
+                    </div>
+                </xpath>
+                <xpath expr="//div[@class='oe_salesteams_opportunities']" position="after">
+                    <div class="oe_salesteams_invoices">
+                        <a name="%(action_invoice_salesteams)d" type="action" groups="account.group_account_invoice">Invoices</a>
+                        <a name="%(account.action_account_invoice_report_all)d" type="action" class="oe_sparkline_bar_link">
+                            <field name="monthly_invoiced" widget="sparkline_bar">
+                                Revenue of sent invoices per month.<br/>Click to see a detailed analysis of invoices.
+                            </field>
+                        </a>
+                    </div>
+                    <div class="oe_salesteams_quotations">
+                        <a name="%(action_quotations_salesteams)d" type="action" class="oe_sparkline_bar_link">Quotations</a>
+                        <a name="%(sale.action_order_report_all)d" type="action" class="oe_sparkline_bar_link">
+                            <field name="monthly_quoted" widget="sparkline_bar">
+                                Revenue of created quotation per month.<br/>Click to see a detailed analysis of sales.
+                            </field>
+                        </a>
+                    </div>
                 </xpath>
                 <xpath expr="//div[@class='oe_items_list']" position="after">
-                    <div class="oe_center">
-                        <div class="oe_sum"><field name="sum_month_invoice"/></div>
-                        <div class="oe_subsum">Invoiced this month</div>
+                    <div class="oe_center" t-if="record.invoiced_target.raw_value">
+                        <field name="monthly_invoiced" widget="gage" style="width:160px; height: 120px;" options="{'max_field': 'invoiced_target'}">Invoiced</field>
+                        <field name="invoiced_forecast" widget="gage" style="width:160px; height: 120px;" options="{'max_field': 'invoiced_target', 'action_change': 'action_forecast'}">Forecast</field>
+                    </div>
+                    <div class="oe_center" style="color:#bbbbbb;" t-if="!record.invoiced_target.raw_value">
+                        <br/>Define an invoicing target in the sales team settings to see the period's achievement and forecast at a glance.
                     </div>
                 </xpath>
             </data>
diff --git a/addons/sale_crm/static/lib/justgage.js b/addons/sale_crm/static/lib/justgage.js
new file mode 100644
index 00000000000..52b5c6ea0c3
--- /dev/null
+++ b/addons/sale_crm/static/lib/justgage.js
@@ -0,0 +1,883 @@
+/**
+ * JustGage - this is work-in-progress, unreleased, unofficial code, so it might not work top-notch :)
+ * Check http://www.justgage.com for official releases
+ * Licensed under MIT.
+ * @author Bojan Djuricic  (@Toorshia)
+ *
+ * LATEST UPDATES
+
+ * -----------------------------
+ * April 01, 2013.
+ * -----------------------------
+     * fix - https://github.com/toorshia/justgage/issues/46
+
+ * -----------------------------
+ * March 26, 2013.
+ * -----------------------------
+     * customSectors - define specific color for value range (0-10 : red, 10-30 : blue etc.)
+
+ * -----------------------------
+ * March 23, 2013.
+ * -----------------------------
+     * counter - option to animate value  in counting fashion
+     * fix - https://github.com/toorshia/justgage/issues/45
+
+ * -----------------------------
+ * March 13, 2013.
+ * -----------------------------
+     * refresh method - added optional 'max' parameter to use when you need to update max value
+
+ * -----------------------------
+ * February 26, 2013.
+ * -----------------------------
+     * decimals - option to define/limit number of decimals when not using humanFriendly or customRenderer to display value
+     * fixed a missing parameters bug when calling generateShadow()  for IE < 9
+
+ * -----------------------------
+ * December 31, 2012.
+ * -----------------------------
+     * fixed text y-position for hidden divs - workaround for Raphael <tspan> 'dy' bug - https://github.com/DmitryBaranovskiy/raphael/issues/491
+     * 'show' parameters, like showMinMax are now 'hide' because I am lame developer - please update these in your setups
+     * Min and Max labels are now auto-off when in donut mode
+     * Start angle in donut mode is now 90
+     * donutStartAngle - option to define start angle for donut
+
+ * -----------------------------
+ * November 25, 2012.
+ * -----------------------------
+     * Option to define custom rendering function for displayed value
+
+ * -----------------------------
+ * November 19, 2012.
+ * -----------------------------
+     * Config.value is now updated after gauge refresh
+
+ * -----------------------------
+ * November 13, 2012.
+ * -----------------------------
+     * Donut display mode added
+     * Option to hide value label
+     * Option to enable responsive gauge size
+     * Removed default title attribute
+     * Option to accept min and max defined as string values
+     * Option to configure value symbol
+     * Fixed bad aspect ratio calculations
+     * Option to configure minimum font size for all texts
+     * Option to show shorthand big numbers (human friendly)
+     */
+
+ JustGage = function(config) {
+
+  if (!config.id) {alert("Missing id parameter for gauge!"); return false;}
+  if (!config.node) {
+    if (!document.getElementById(config.id)) {alert("No element with id: \""+config.id+"\" found!"); return false;}
+    config.node = document.getElementById(config.id);
+  }
+
+  var obj = this;
+
+  // configurable parameters
+  obj.config =
+  {
+    // id : string
+    // this is container element id
+    id : config.id,
+
+    // node : string
+    // the node to use instead of DOM
+    node : config.node,
+
+    // title : string
+    // gauge title
+    title : (config.title) ? config.title : "",
+
+    // titleFontColor : string
+    // color of gauge title
+    titleFontColor : (config.titleFontColor) ? config.titleFontColor : "#999999",
+
+    // value : int
+    // value gauge is showing
+    value : (config.value) ? config.value : 0,
+
+
+    // valueFontColor : string
+    // color of label showing current value
+    valueFontColor : (config.valueFontColor) ? config.valueFontColor : "#010101",
+
+    // symbol : string
+    // special symbol to show next to value
+    symbol : (config.symbol) ? config.symbol : "",
+
+    // min : int
+    // min value
+    min : (config.min) ? parseFloat(config.min) : 0,
+
+    // max : int
+    // max value
+    max : (config.max) ? parseFloat(config.max) : 100,
+
+    // humanFriendlyDecimal : int
+    // number of decimal places for our human friendly number to contain
+    humanFriendlyDecimal : (config.humanFriendlyDecimal) ? config.humanFriendlyDecimal : 0,
+
+    // textRenderer: func
+    // function applied before rendering text
+    textRenderer  : (config.textRenderer) ? config.textRenderer : null,
+
+    // gaugeWidthScale : float
+    // width of the gauge element
+    gaugeWidthScale : (config.gaugeWidthScale) ? config.gaugeWidthScale : 1.0,
+
+    // gaugeColor : string
+    // background color of gauge element
+    gaugeColor : (config.gaugeColor) ? config.gaugeColor : "#edebeb",
+
+    // label : string
+    // text to show below value
+    label : (config.label) ? config.label : "",
+
+    // labelFontColor : string
+    // color of label showing label under value
+    labelFontColor : (config.labelFontColor) ? config.labelFontColor : "#b3b3b3",
+
+    // shadowOpacity : int
+    // 0 ~ 1
+    shadowOpacity : (config.shadowOpacity) ? config.shadowOpacity : 0.2,
+
+    // shadowSize: int
+    // inner shadow size
+    shadowSize : (config.shadowSize) ? config.shadowSize : 5,
+
+    // shadowVerticalOffset : int
+    // how much shadow is offset from top
+    shadowVerticalOffset : (config.shadowVerticalOffset) ? config.shadowVerticalOffset : 3,
+
+    // levelColors : string[]
+    // colors of indicator, from lower to upper, in RGB format
+    levelColors : (config.levelColors) ? config.levelColors : [
+    "#a9d70b",
+    "#f9c802",
+    "#ff0000"
+    ],
+
+    // startAnimationTime : int
+    // length of initial animation
+    startAnimationTime : (config.startAnimationTime) ? config.startAnimationTime : 700,
+
+    // startAnimationType : string
+    // type of initial animation (linear, >, <,  <>, bounce)
+    startAnimationType : (config.startAnimationType) ? config.startAnimationType : ">",
+
+    // refreshAnimationTime : int
+    // length of refresh animation
+    refreshAnimationTime : (config.refreshAnimationTime) ? config.refreshAnimationTime : 700,
+
+    // refreshAnimationType : string
+    // type of refresh animation (linear, >, <,  <>, bounce)
+    refreshAnimationType : (config.refreshAnimationType) ? config.refreshAnimationType : ">",
+
+    // donutStartAngle : int
+    // angle to start from when in donut mode
+    donutStartAngle : (config.donutStartAngle) ? config.donutStartAngle : 90,
+
+    // valueMinFontSize : int
+    // absolute minimum font size for the value
+    valueMinFontSize : config.valueMinFontSize || 16,
+
+    // titleMinFontSize
+    // absolute minimum font size for the title
+    titleMinFontSize : config.titleMinFontSize || 10,
+
+    // labelMinFontSize
+    // absolute minimum font size for the label
+    labelMinFontSize : config.labelMinFontSize || 10,
+
+    // minLabelMinFontSize
+    // absolute minimum font size for the minimum label
+    minLabelMinFontSize : config.minLabelMinFontSize || 10,
+
+    // maxLabelMinFontSize
+    // absolute minimum font size for the maximum label
+    maxLabelMinFontSize : config.maxLabelMinFontSize || 10,
+
+    // hideValue : bool
+    // hide value text
+    hideValue : (config.hideValue) ? config.hideValue : false,
+
+    // hideMinMax : bool
+    // hide min and max values
+    hideMinMax : (config.hideMinMax) ? config.hideMinMax : false,
+
+    // hideInnerShadow : bool
+    // hide inner shadow
+    hideInnerShadow : (config.hideInnerShadow) ? config.hideInnerShadow : false,
+
+    // humanFriendly : bool
+    // convert large numbers for min, max, value to human friendly (e.g. 1234567 -> 1.23M)
+    humanFriendly : (config.humanFriendly) ? config.humanFriendly : false,
+
+    // noGradient : bool
+    // whether to use gradual color change for value, or sector-based
+    noGradient : (config.noGradient) ? config.noGradient : false,
+
+    // donut : bool
+    // show full donut gauge
+    donut : (config.donut) ? config.donut : false,
+
+    // relativeGaugeSize : bool
+    // whether gauge size should follow changes in container element size
+    relativeGaugeSize : (config.relativeGaugeSize) ? config.relativeGaugeSize : false,
+
+    // counter : bool
+    // animate level number change
+    counter : (config.counter) ? config.counter : false,
+
+    // decimals : int
+    // number of digits after floating point
+    decimals : (config.decimals) ? config.decimals : 0,
+
+    // customSectors : [] of objects
+    // number of digits after floating point
+    customSectors : (config.customSectors) ? config.customSectors : []
+  };
+
+  // variables
+  var
+  canvasW,
+  canvasH,
+  widgetW,
+  widgetH,
+  aspect,
+  dx,
+  dy,
+  titleFontSize,
+  titleX,
+  titleY,
+  valueFontSize,
+  valueX,
+  valueY,
+  labelFontSize,
+  labelX,
+  labelY,
+  minFontSize,
+  minX,
+  minY,
+  maxFontSize,
+  maxX,
+  maxY;
+
+  // overflow values
+  if (this.config.value > this.config.max) this.config.value = this.config.max;
+  if (this.config.value < this.config.min) this.config.value = this.config.min;
+  this.originalValue = config.value;
+
+  // canvas
+  this.canvas = Raphael(this.config.node, "100%", "100%");
+  if (this.config.relativeGaugeSize === true) {
+    this.canvas.setViewBox(0, 0, 200, 150, true);
+  }
+
+  // canvas dimensions
+  if (this.config.relativeGaugeSize === true) {
+    canvasW = 200;
+    canvasH = 150;
+  } else {
+    canvasW = getStyle(this.config.node, "width").slice(0, -2) * 1;
+    canvasH = getStyle(this.config.node, "height").slice(0, -2) * 1;
+  }
+
+  // widget dimensions
+  if (this.config.donut === true) {
+
+    // DONUT *******************************
+
+    // width more than height
+    if(canvasW > canvasH) {
+      widgetH = canvasH;
+      widgetW = widgetH;
+    // width less than height
+  } else if (canvasW < canvasH) {
+    widgetW = canvasW;
+    widgetH = widgetW;
+      // if height don't fit, rescale both
+      if(widgetH > canvasH) {
+        aspect = widgetH / canvasH;
+        widgetH = widgetH / aspect;
+        widgetW = widgetH / aspect;
+      }
+    // equal
+  } else {
+    widgetW = canvasW;
+    widgetH = widgetW;
+  }
+
+    // delta
+    dx = (canvasW - widgetW)/2;
+    dy = (canvasH - widgetH)/2;
+
+    // title
+    titleFontSize = ((widgetH / 8) > 10) ? (widgetH / 10) : 10;
+    titleX = dx + widgetW / 2;
+    titleY = dy + widgetH / 11;
+
+    // value
+    valueFontSize = ((widgetH / 6.4) > 16) ? (widgetH / 5.4) : 18;
+    valueX = dx + widgetW / 2;
+    if(this.config.label !== '') {
+      valueY = dy + widgetH / 1.85;
+    } else {
+      valueY = dy + widgetH / 1.7;
+    }
+
+    // label
+    labelFontSize = ((widgetH / 16) > 10) ? (widgetH / 16) : 10;
+    labelX = dx + widgetW / 2;
+    labelY = valueY + labelFontSize;
+
+    // min
+    minFontSize = ((widgetH / 16) > 10) ? (widgetH / 16) : 10;
+    minX = dx + (widgetW / 10) + (widgetW / 6.666666666666667 * this.config.gaugeWidthScale) / 2 ;
+    minY = labelY;
+
+    // max
+    maxFontSize = ((widgetH / 16) > 10) ? (widgetH / 16) : 10;
+    maxX = dx + widgetW - (widgetW / 10) - (widgetW / 6.666666666666667 * this.config.gaugeWidthScale) / 2 ;
+    maxY = labelY;
+
+  } else {
+    // HALF *******************************
+
+    // width more than height
+    if(canvasW > canvasH) {
+      widgetH = canvasH;
+      widgetW = widgetH * 1.25;
+      //if width doesn't fit, rescale both
+      if(widgetW > canvasW) {
+        aspect = widgetW / canvasW;
+        widgetW = widgetW / aspect;
+        widgetH = widgetH / aspect;
+      }
+    // width less than height
+  } else if (canvasW < canvasH) {
+    widgetW = canvasW;
+    widgetH = widgetW / 1.25;
+      // if height don't fit, rescale both
+      if(widgetH > canvasH) {
+        aspect = widgetH / canvasH;
+        widgetH = widgetH / aspect;
+        widgetW = widgetH / aspect;
+      }
+    // equal
+  } else {
+    widgetW = canvasW;
+    widgetH = widgetW * 0.75;
+  }
+
+    // delta
+    dx = (canvasW - widgetW)/2;
+    dy = (canvasH - widgetH)/2;
+
+    // title
+    titleFontSize = ((widgetH / 8) > this.config.titleMinFontSize) ? (widgetH / 10) : this.config.titleMinFontSize;
+    titleX = dx + widgetW / 2;
+    titleY = dy + widgetH / 6.4;
+
+    // value
+    valueFontSize = ((widgetH / 6.5) > this.config.valueMinFontSize) ? (widgetH / 6.5) : this.config.valueMinFontSize;
+    valueX = dx + widgetW / 2;
+    valueY = dy + widgetH / 1.275;
+
+    // label
+    labelFontSize = ((widgetH / 16) > this.config.labelMinFontSize) ? (widgetH / 16) : this.config.labelMinFontSize;
+    labelX = dx + widgetW / 2;
+    labelY = valueY + valueFontSize / 2 + 5;
+
+    // min
+    minFontSize = ((widgetH / 16) > this.config.minLabelMinFontSize) ? (widgetH / 16) : this.config.minLabelMinFontSize;
+    minX = dx + (widgetW / 10) + (widgetW / 6.666666666666667 * this.config.gaugeWidthScale) / 2 ;
+    minY = labelY;
+
+    // max
+    maxFontSize = ((widgetH / 16) > this.config.maxLabelMinFontSize) ? (widgetH / 16) : this.config.maxLabelMinFontSize;
+    maxX = dx + widgetW - (widgetW / 10) - (widgetW / 6.666666666666667 * this.config.gaugeWidthScale) / 2 ;
+    maxY = labelY;
+  }
+
+  // parameters
+  this.params  = {
+    canvasW : canvasW,
+    canvasH : canvasH,
+    widgetW : widgetW,
+    widgetH : widgetH,
+    dx : dx,
+    dy : dy,
+    titleFontSize : titleFontSize,
+    titleX : titleX,
+    titleY : titleY,
+    valueFontSize : valueFontSize,
+    valueX : valueX,
+    valueY : valueY,
+    labelFontSize : labelFontSize,
+    labelX : labelX,
+    labelY : labelY,
+    minFontSize : minFontSize,
+    minX : minX,
+    minY : minY,
+    maxFontSize : maxFontSize,
+    maxX : maxX,
+    maxY : maxY
+  };
+
+  // var clear
+  canvasW, canvasH, widgetW, widgetH, aspect, dx, dy, titleFontSize, titleX, titleY, valueFontSize, valueX, valueY, labelFontSize, labelX, labelY, minFontSize, minX, minY, maxFontSize, maxX, maxY = null
+
+  // pki - custom attribute for generating gauge paths
+  this.canvas.customAttributes.pki = function (value, min, max, w, h, dx, dy, gws, donut) {
+
+    var alpha, Ro, Ri, Cx, Cy, Xo, Yo, Xi, Yi, path;
+
+    if (donut) {
+      alpha = (1 - 2 * (value - min) / (max - min)) * Math.PI;
+      Ro = w / 2 - w / 7;
+      Ri = Ro - w / 6.666666666666667 * gws;
+
+      Cx = w / 2 + dx;
+      Cy = h / 1.95 + dy;
+
+      Xo = w / 2 + dx + Ro * Math.cos(alpha);
+      Yo = h - (h - Cy) + 0 - Ro * Math.sin(alpha);
+      Xi = w / 2 + dx + Ri * Math.cos(alpha);
+      Yi = h - (h - Cy) + 0 - Ri * Math.sin(alpha);
+
+      path += "M" + (Cx - Ri) + "," + Cy + " ";
+      path += "L" + (Cx - Ro) + "," + Cy + " ";
+      if (value > ((max - min) / 2)) {
+        path += "A" + Ro + "," + Ro + " 0 0 1 " + (Cx + Ro) + "," + Cy + " ";
+      }
+      path += "A" + Ro + "," + Ro + " 0 0 1 " + Xo + "," + Yo + " ";
+      path += "L" + Xi + "," + Yi + " ";
+      if (value > ((max - min) / 2)) {
+        path += "A" + Ri + "," + Ri + " 0 0 0 " + (Cx + Ri) + "," + Cy + " ";
+      }
+      path += "A" + Ri + "," + Ri + " 0 0 0 " + (Cx - Ri) + "," + Cy + " ";
+      path += "Z ";
+
+      return { path: path };
+
+    } else {
+      alpha = (1 - (value - min) / (max - min)) * Math.PI;
+      Ro = w / 2 - w / 10;
+      Ri = Ro - w / 6.666666666666667 * gws;
+
+      Cx = w / 2 + dx;
+      Cy = h / 1.25 + dy;
+
+      Xo = w / 2 + dx + Ro * Math.cos(alpha);
+      Yo = h - (h - Cy) + 0 - Ro * Math.sin(alpha);
+      Xi = w / 2 + dx + Ri * Math.cos(alpha);
+      Yi = h - (h - Cy) + 0 - Ri * Math.sin(alpha);
+
+      path += "M" + (Cx - Ri) + "," + Cy + " ";
+      path += "L" + (Cx - Ro) + "," + Cy + " ";
+      path += "A" + Ro + "," + Ro + " 0 0 1 " + Xo + "," + Yo + " ";
+      path += "L" + Xi + "," + Yi + " ";
+      path += "A" + Ri + "," + Ri + " 0 0 0 " + (Cx - Ri) + "," + Cy + " ";
+      path += "Z ";
+
+      return { path: path };
+    }
+
+    // var clear
+    alpha, Ro, Ri, Cx, Cy, Xo, Yo, Xi, Yi, path = null;
+  };
+
+  // gauge
+  this.gauge = this.canvas.path().attr({
+    "stroke": "none",
+    "fill": this.config.gaugeColor,
+    pki: [this.config.max, this.config.min, this.config.max, this.params.widgetW, this.params.widgetH,  this.params.dx, this.params.dy, this.config.gaugeWidthScale, this.config.donut]
+  });
+  this.gauge.id = this.config.id+"-gauge";
+
+  // level
+  this.level = this.canvas.path().attr({
+    "stroke": "none",
+    "fill": getColor(this.config.value, (this.config.value - this.config.min) / (this.config.max - this.config.min), this.config.levelColors, this.config.noGradient, this.config.customSectors),
+    pki: [this.config.min, this.config.min, this.config.max, this.params.widgetW, this.params.widgetH,  this.params.dx, this.params.dy, this.config.gaugeWidthScale, this.config.donut]
+  });
+  if(this.config.donut) {
+    this.level.transform("r" + this.config.donutStartAngle + ", " + (this.params.widgetW/2 + this.params.dx) + ", " + (this.params.widgetH/1.95 + this.params.dy));
+  }
+  this.level.id = this.config.id+"-level";
+
+  // title
+  this.txtTitle = this.canvas.text(this.params.titleX, this.params.titleY, this.config.title);
+  this.txtTitle.attr({
+    "font-size":this.params.titleFontSize,
+    "font-weight":"bold",
+    "font-family":"Arial",
+    "fill":this.config.titleFontColor,
+    "fill-opacity":"1"
+  });
+  setDy(this.txtTitle, this.params.titleFontSize, this.params.titleY);
+  this.txtTitle.id = this.config.id+"-txttitle";
+
+  // value
+  this.txtValue = this.canvas.text(this.params.valueX, this.params.valueY, 0);
+  this.txtValue.attr({
+    "font-size":this.params.valueFontSize,
+    "font-weight":"bold",
+    "font-family":"Arial",
+    "fill":this.config.valueFontColor,
+    "fill-opacity":"0"
+  });
+  setDy(this.txtValue, this.params.valueFontSize, this.params.valueY);
+  this.txtValue.id = this.config.id+"-txtvalue";
+
+  // label
+  this.txtLabel = this.canvas.text(this.params.labelX, this.params.labelY, this.config.label);
+  this.txtLabel.attr({
+    "font-size":this.params.labelFontSize,
+    "font-weight":"normal",
+    "font-family":"Arial",
+    "fill":this.config.labelFontColor,
+    "fill-opacity":"0"
+  });
+  setDy(this.txtLabel, this.params.labelFontSize, this.params.labelY);
+  this.txtLabel.id = this.config.id+"-txtlabel";
+
+  // min
+  this.txtMinimum = this.config.min;
+  if( this.config.humanFriendly ) this.txtMinimum = humanFriendlyNumber( this.config.min, this.config.humanFriendlyDecimal );
+  this.txtMin = this.canvas.text(this.params.minX, this.params.minY, this.txtMinimum);
+  this.txtMin.attr({
+    "font-size":this.params.minFontSize,
+    "font-weight":"normal",
+    "font-family":"Arial",
+    "fill":this.config.labelFontColor,
+    "fill-opacity": (this.config.hideMinMax || this.config.donut)? "0" : "1"
+  });
+  setDy(this.txtMin, this.params.minFontSize, this.params.minY);
+  this.txtMin.id = this.config.id+"-txtmin";
+
+  // max
+  this.txtMaximum = this.config.max;
+  if( this.config.humanFriendly ) this.txtMaximum = humanFriendlyNumber( this.config.max, this.config.humanFriendlyDecimal );
+  this.txtMax = this.canvas.text(this.params.maxX, this.params.maxY, this.txtMaximum);
+  this.txtMax.attr({
+    "font-size":this.params.maxFontSize,
+    "font-weight":"normal",
+    "font-family":"Arial",
+    "fill":this.config.labelFontColor,
+    "fill-opacity": (this.config.hideMinMax || this.config.donut)? "0" : "1"
+  });
+  setDy(this.txtMax, this.params.maxFontSize, this.params.maxY);
+  this.txtMax.id = this.config.id+"-txtmax";
+
+  var defs = this.canvas.canvas.childNodes[1];
+  var svg = "http://www.w3.org/2000/svg";
+
+  if (ie < 9) {
+    onCreateElementNsReady(function() {
+      this.generateShadow(svg, defs);
+    });
+  } else {
+    this.generateShadow(svg, defs);
+  }
+
+  // var clear
+  defs, svg = null;
+
+  // execute on each animation frame
+  function onAnimate() {
+    if (obj.config.counter) {
+      var currentValue = obj.level.attr("pki");
+
+      if(obj.config.textRenderer) {
+        // this.originalValue = this.config.textRenderer(this.originalValue);
+        obj.txtValue.attr("text", obj.config.textRenderer(Math.floor(currentValue[0])));
+      } else if(obj.config.humanFriendly) {
+        // this.originalValue = humanFriendlyNumber( this.originalValue, this.config.humanFriendlyDecimal ) + this.config.symbol;
+        obj.txtValue.attr("text", humanFriendlyNumber( Math.floor(currentValue[0]), obj.config.humanFriendlyDecimal ) + obj.config.symbol);
+      } else {
+        // this.originalValue += this.config.symbol;
+        obj.txtValue.attr("text", (currentValue[0] * 1).toFixed(obj.config.decimals) + obj.config.symbol);
+      }
+
+      setDy(obj.txtValue, obj.params.valueFontSize, obj.params.valueY);
+      currentValue = null;
+    }
+  }
+
+  if(!obj.config.counter) {
+    if(obj.config.textRenderer) {
+      obj.originalValue = obj.config.textRenderer(obj.originalValue);
+    } else if(obj.config.humanFriendly) {
+      obj.originalValue = humanFriendlyNumber( obj.originalValue, obj.config.humanFriendlyDecimal ) + obj.config.symbol;
+    } else {
+      obj.originalValue = (obj.originalValue * 1).toFixed(obj.config.decimals) + obj.config.symbol;
+    }
+
+    obj.txtValue.attr("text", obj.originalValue);
+    setDy(obj.txtValue, obj.params.valueFontSize, obj.params.valueY);
+  }
+
+  //event fired on each animation frame
+  eve.on("raphael.anim.frame.*", onAnimate);
+
+  // animate gauge level
+  this.level.animate({pki: [this.config.value, this.config.min, this.config.max, this.params.widgetW, this.params.widgetH,  this.params.dx, this.params.dy, this.config.gaugeWidthScale, this.config.donut]},  this.config.startAnimationTime, this.config.startAnimationType);
+
+  // animate value
+  this.txtValue.animate({"fill-opacity":"1"}, this.config.startAnimationTime, this.config.startAnimationType);
+
+  // animate label
+  this.txtLabel.animate({"fill-opacity":"1"}, this.config.startAnimationTime, this.config.startAnimationType);
+};
+
+/** Refresh gauge level */
+JustGage.prototype.refresh = function(val, max) {
+
+  var originalVal, displayVal, color, max = max || null;
+
+  // set new max
+  if(max !== null) {
+    this.config.max = max;
+
+    this.txtMaximum = this.config.max;
+    if( this.config.humanFriendly ) this.txtMaximum = humanFriendlyNumber( this.config.max, this.config.humanFriendlyDecimal );
+    this.txtMax.attr({"text" : this.config.max});
+    setDy(this.txtMax, this.params.maxFontSize, this.params.maxY);
+  }
+
+  // overflow values
+  originalVal = val;
+  displayVal = val;
+  if ((val * 1) > (this.config.max * 1)) {val = (this.config.max * 1);}
+  if ((val * 1) < (this.config.min * 1)) {val = (this.config.min * 1);}
+
+  color = getColor(val, (val - this.config.min) / (this.config.max - this.config.min), this.config.levelColors, this.config.noGradient, this.config.customSectors);
+
+  if(this.config.textRenderer) {
+    displayVal = this.config.textRenderer(displayVal);
+  } else if( this.config.humanFriendly ) {
+    displayVal = humanFriendlyNumber( displayVal, this.config.humanFriendlyDecimal ) + this.config.symbol;
+  } else {
+    displayVal = (displayVal * 1).toFixed(this.config.decimals) + this.config.symbol;
+  }
+
+  if(!this.config.counter) {
+    this.canvas.getById(this.config.id+"-txtvalue").attr({"text":displayVal});
+    setDy(this.canvas.getById(this.config.id+"-txtvalue"), this.params.valueFontSize, this.params.valueY);
+  }
+
+  this.canvas.getById(this.config.id+"-level").animate({pki: [val, this.config.min, this.config.max, this.params.widgetW, this.params.widgetH,  this.params.dx, this.params.dy, this.config.gaugeWidthScale, this.config.donut], "fill":color},  this.config.refreshAnimationTime, this.config.refreshAnimationType);
+  this.config.value = val * 1;
+
+  // var clear
+  originalVal, displayVal, color, max = null;
+};
+
+/** Generate shadow */
+JustGage.prototype.generateShadow = function(svg, defs) {
+
+  var gaussFilter, feOffset, feGaussianBlur, feComposite1, feFlood, feComposite2, feComposite3;
+
+  // FILTER
+  gaussFilter=document.createElementNS(svg,"filter");
+  gaussFilter.setAttribute("id", this.config.id + "-inner-shadow");
+  defs.appendChild(gaussFilter);
+
+  // offset
+  feOffset = document.createElementNS(svg,"feOffset");
+  feOffset.setAttribute("dx", 0);
+  feOffset.setAttribute("dy", this.config.shadowVerticalOffset);
+  gaussFilter.appendChild(feOffset);
+
+  // blur
+  feGaussianBlur = document.createElementNS(svg,"feGaussianBlur");
+  feGaussianBlur.setAttribute("result","offset-blur");
+  feGaussianBlur.setAttribute("stdDeviation", this.config.shadowSize);
+  gaussFilter.appendChild(feGaussianBlur);
+
+  // composite 1
+  feComposite1 = document.createElementNS(svg,"feComposite");
+  feComposite1.setAttribute("operator","out");
+  feComposite1.setAttribute("in", "SourceGraphic");
+  feComposite1.setAttribute("in2","offset-blur");
+  feComposite1.setAttribute("result","inverse");
+  gaussFilter.appendChild(feComposite1);
+
+  // flood
+  feFlood = document.createElementNS(svg,"feFlood");
+  feFlood.setAttribute("flood-color","black");
+  feFlood.setAttribute("flood-opacity", this.config.shadowOpacity);
+  feFlood.setAttribute("result","color");
+  gaussFilter.appendChild(feFlood);
+
+  // composite 2
+  feComposite2 = document.createElementNS(svg,"feComposite");
+  feComposite2.setAttribute("operator","in");
+  feComposite2.setAttribute("in", "color");
+  feComposite2.setAttribute("in2","inverse");
+  feComposite2.setAttribute("result","shadow");
+  gaussFilter.appendChild(feComposite2);
+
+  // composite 3
+  feComposite3 = document.createElementNS(svg,"feComposite");
+  feComposite3.setAttribute("operator","over");
+  feComposite3.setAttribute("in", "shadow");
+  feComposite3.setAttribute("in2","SourceGraphic");
+  gaussFilter.appendChild(feComposite3);
+
+  // set shadow
+  if (!this.config.hideInnerShadow) {
+    this.canvas.canvas.childNodes[2].setAttribute("filter", "url(#" + this.config.id + "-inner-shadow)");
+    this.canvas.canvas.childNodes[3].setAttribute("filter", "url(#" + this.config.id + "-inner-shadow)");
+  }
+
+  // var clear
+  gaussFilter, feOffset, feGaussianBlur, feComposite1, feFlood, feComposite2, feComposite3 = null;
+
+};
+
+/** Get color for value */
+function getColor(val, pct, col, noGradient, custSec) {
+
+  var no, inc, colors, percentage, rval, gval, bval, lower, upper, range, rangePct, pctLower, pctUpper, color;
+  var noGradient = noGradient || custSec.length > 0;
+
+  if(custSec.length > 0) {
+    for(var i = 0; i < custSec.length; i++) {
+      if(val > custSec[i].lo && val <= custSec[i].hi) {
+        return custSec[i].color;
+      }
+    }
+  }
+
+  no = col.length;
+  if (no === 1) return col[0];
+  inc = (noGradient) ? (1 / no) : (1 / (no - 1));
+  colors = [];
+  for (var i = 0; i < col.length; i++) {
+    percentage = (noGradient) ? (inc * (i + 1)) : (inc * i);
+    rval = parseInt((cutHex(col[i])).substring(0,2),16);
+    gval = parseInt((cutHex(col[i])).substring(2,4),16);
+    bval = parseInt((cutHex(col[i])).substring(4,6),16);
+    colors[i] = { pct: percentage, color: { r: rval, g: gval, b: bval  } };
+  }
+
+  if(pct === 0) {
+    return 'rgb(' + [colors[0].color.r, colors[0].color.g, colors[0].color.b].join(',') + ')';
+  }
+
+  for (var j = 0; j < colors.length; j++) {
+    if (pct <= colors[j].pct) {
+      if (noGradient) {
+        return 'rgb(' + [colors[j].color.r, colors[j].color.g, colors[j].color.b].join(',') + ')';
+      } else {
+        lower = colors[j - 1];
+        upper = colors[j];
+        range = upper.pct - lower.pct;
+        rangePct = (pct - lower.pct) / range;
+        pctLower = 1 - rangePct;
+        pctUpper = rangePct;
+        color = {
+          r: Math.floor(lower.color.r * pctLower + upper.color.r * pctUpper),
+          g: Math.floor(lower.color.g * pctLower + upper.color.g * pctUpper),
+          b: Math.floor(lower.color.b * pctLower + upper.color.b * pctUpper)
+        };
+        return 'rgb(' + [color.r, color.g, color.b].join(',') + ')';
+      }
+    }
+  }
+
+}
+
+/** Fix Raphael display:none tspan dy attribute bug */
+function setDy(elem, fontSize, txtYpos) {
+  if ((!ie || ie > 9) && (elem.node.firstChild.attributes.dy)) {
+    elem.node.firstChild.attributes.dy.value = 0;
+  }
+}
+
+/** Random integer  */
+function getRandomInt (min, max) {
+  return Math.floor(Math.random() * (max - min + 1)) + min;
+}
+
+/**  Cut hex  */
+function cutHex(str) {
+  return (str.charAt(0)=="#") ? str.substring(1,7):str;
+}
+
+/**  Human friendly number suffix - From: http://stackoverflow.com/questions/2692323/code-golf-friendly-number-abbreviator */
+function humanFriendlyNumber( n, d ) {
+  var p, d2, i, s;
+
+  p = Math.pow;
+  d2 = p(10, d);
+  i = 7;
+  while( i ) {
+    s = p(10,i--*3);
+    if( s <= n ) {
+     n = Math.round(n*d2/s)/d2+"KMGTPE"[i];
+   }
+ }
+ return n;
+}
+
+/**  Get style  */
+function getStyle(oElm, strCssRule){
+  var strValue = "";
+  if(document.defaultView && document.defaultView.getComputedStyle){
+    strValue = document.defaultView.getComputedStyle(oElm).getPropertyValue(strCssRule);
+  }
+  else if(oElm.currentStyle){
+    strCssRule = strCssRule.replace(/\-(\w)/g, function (strMatch, p1){
+      return p1.toUpperCase();
+    });
+    strValue = oElm.currentStyle[strCssRule];
+  }
+  return strValue;
+}
+
+/**  Create Element NS Ready  */
+function onCreateElementNsReady(func) {
+  if (document.createElementNS !== undefined) {
+    func();
+  } else {
+    setTimeout(function() { onCreateElementNsReady(func); }, 100);
+  }
+}
+
+/**  Get IE version  */
+// ----------------------------------------------------------
+// A short snippet for detecting versions of IE in JavaScript
+// without resorting to user-agent sniffing
+// ----------------------------------------------------------
+// If you're not in IE (or IE version is less than 5) then:
+// ie === undefined
+// If you're in IE (>=5) then you can determine which version:
+// ie === 7; // IE7
+// Thus, to detect IE:
+// if (ie) {}
+// And to detect the version:
+// ie === 6 // IE6
+// ie > 7 // IE8, IE9 ...
+// ie < 9 // Anything less than IE9
+// ----------------------------------------------------------
+// UPDATE: Now using Live NodeList idea from @jdalton
+var ie = (function(){
+
+  var undef,
+  v = 3,
+  div = document.createElement('div'),
+  all = div.getElementsByTagName('i');
+
+  while (
+    div.innerHTML = '<!--[if gt IE ' + (++v) + ']><i></i><![endif]-->',
+    all[0]
+    );
+    return v > 4 ? v : undef;
+}());
\ No newline at end of file
diff --git a/addons/sale_crm/static/src/js/sale_crm.js b/addons/sale_crm/static/src/js/sale_crm.js
new file mode 100644
index 00000000000..207ac959af3
--- /dev/null
+++ b/addons/sale_crm/static/src/js/sale_crm.js
@@ -0,0 +1,108 @@
+openerp.sale_crm = function(openerp) {
+var _t = openerp.web._t;
+
+openerp.sale_crm.GaugeWidget = openerp.web_kanban.AbstractField.extend({
+    className: "oe_gage",
+    start: function() {
+        var self = this;
+
+        var parent = this.getParent();
+        var max = this.options.max_field ? parent.record[this.options.max_field].raw_value : 100;
+        var label = this.options.label_field ? parent.record[this.options.label_field].raw_value : "";
+        var title = this.$node.html();
+        var val = this.field.value;
+        var value = _.isArray(val) && val.length ? val[val.length-1]['value'] : val;
+        var unique_id = _.uniqueId("JustGage");
+        
+        this.$el.empty()
+            .attr('style', this.$node.attr('style') + ';position:relative; display:inline-block;')
+            .attr('id', unique_id);
+        this.gage = new JustGage({
+            id: unique_id,
+            node: this.$el[0],
+            title: title,
+            value: value,
+            min: 0,
+            max: max,
+            relativeGaugeSize: true,
+            humanFriendly: true,
+            titleFontColor: '#333333',
+            valueFontColor: '#333333',
+            labelFontColor: '#000',
+            label: label,
+            levelColors: [
+                "#ff0000",
+                "#f9c802",
+                "#a9d70b"
+            ],
+        });
+
+        var flag_open = false;
+        if (self.options.action_change) {
+            var $svg = self.$el.find('svg');
+            var css = {
+                'text-align': 'center',
+                'position': 'absolute',
+                'width': self.$el.outerWidth() + 'px',
+                'top': (self.$el.outerHeight()/2-5) + 'px'
+            };
+
+            self.$el.click(function (event) {
+                event.stopPropagation();
+                flag_open = false;
+                if (!parent.view.is_action_enabled('edit')) {
+                    return;
+                }
+                if (!self.$el.find(".oe_justgage_edit").size()) {
+                    $div = $('<div class="oe_justgage_edit" style="z-index:1"/>');
+                    $div.css(css);
+                    $input = $('<input/>').val(value);
+                    $input.css({
+                        'text-align': 'center',
+                        'margin': 'auto',
+                        'width': ($svg.outerWidth()-40) + 'px'
+                    });
+                    $div.append($input);
+                    self.$el.prepend($div)
+                    $input.focus()
+                        .keydown(function (event) {
+                            event.stopPropagation();
+                            if (event.keyCode == 13 || event.keyCode == 9) {
+                                if ($input.val() != value) {
+                                    parent.view.dataset.call(self.options.action_change, [parent.id, $input.val()]).then(function () {
+                                        parent.do_reload();
+                                    });
+                                } else {
+                                    $div.remove();
+                                }
+                            }
+                        })
+                        .click(function (event) {
+                            event.stopPropagation();
+                            flag_open = false;
+                        })
+                        .blur(function (event) {
+                            if(!flag_open) {
+                                self.$el.find(".oe_justgage_edit").remove();
+                            } else {
+                                flag_open = false;
+                                setTimeout(function () {$input.focus();}, 0);
+                            }
+                        });
+                }
+            }).mousedown(function () {
+                flag_open = true;
+            });
+
+            if (!+value) {
+                $svg.fadeTo(0, 0.3);
+                $div = $('<div/>').text(_t("Click to change value"));
+                $div.css(css);
+                self.$el.append($div);
+            }
+        }
+    },
+});
+openerp.web_kanban.fields_registry.add("gage", "openerp.sale_crm.GaugeWidget");
+
+};
diff --git a/addons/sale_margin/i18n/ru.po b/addons/sale_margin/i18n/ru.po
index 7c764c89223..cac4fe13548 100644
--- a/addons/sale_margin/i18n/ru.po
+++ b/addons/sale_margin/i18n/ru.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-21 17:06+0000\n"
-"PO-Revision-Date: 2011-01-20 08:51+0000\n"
+"PO-Revision-Date: 2013-06-04 13:50+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: Russian <ru@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: 2013-03-16 05:40+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-06-05 05:32+0000\n"
+"X-Generator: Launchpad (build 16660)\n"
 
 #. module: sale_margin
 #: field:sale.order.line,purchase_price:0
@@ -44,6 +44,7 @@ msgid ""
 "It gives profitability by calculating the difference between the Unit Price "
 "and the cost price."
 msgstr ""
+"Дает прибыльность как разницу между стоимостью единицы и себестоимостью."
 
 #~ msgid "Customer Invoice"
 #~ msgstr "Счета клиентам"
diff --git a/addons/sale_stock/process/sale_stock_process.xml b/addons/sale_stock/process/sale_stock_process.xml
index c10b34c8866..1ebebec7809 100644
--- a/addons/sale_stock/process/sale_stock_process.xml
+++ b/addons/sale_stock/process/sale_stock_process.xml
@@ -72,40 +72,40 @@
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Create Procurement Order&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;A procurement order is automatically created as soon as a sales order is confirmed or as the invoice is paid. It drives the purchasing and the production of products regarding to the rules and to the sales order's parameters. &quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_saleprocurement0"/>
-            <field model="process.node" name="source_node_id" ref="sale.process_node_saleorder0"/>
+            <field name="target_node_id" ref="process_node_saleprocurement0"/>
+            <field name="source_node_id" ref="sale.process_node_saleorder0"/>
         </record>
 
         <record id="process_transition_packing0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Create Pick List&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;The Pick List form is created as soon as the sales order is confirmed, in the same time as the procurement order. It represents the assignment of parts to the sales order. There is 1 pick list by sales order line which evolves with the availability of parts.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_packinglist0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_saleprocurement0"/>
+            <field name="target_node_id" ref="process_node_packinglist0"/>
+            <field name="source_node_id" ref="process_node_saleprocurement0"/>
         </record>
 
         <record id="process_transition_deliver0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Create Delivery Order&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Depending on the configuration of the location Output, the move between the output area and the customer is done through the Delivery Order manually or automatically.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_deliveryorder0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_packinglist0"/>
+            <field name="target_node_id" ref="process_node_deliveryorder0"/>
+            <field name="source_node_id" ref="process_node_packinglist0"/>
         </record>
 
         <record id="process_transition_invoiceafterdelivery0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Create Invoice&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;If the sale order was set to create the invoice 'On Delivery Order', then an invoice is automatically created based on what you delivered. If you rather want to create your invoice based on your sale order, you can set the sale order to create invoice 'On Demand', then track and process the sales order that have been fully delivered and invoice them from there.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_invoiceafterdelivery0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_packinglist0"/>
+            <field name="target_node_id" ref="process_node_invoiceafterdelivery0"/>
+            <field name="source_node_id" ref="process_node_packinglist0"/>
         </record>
 
         <record id="process_transition_saleorderprocurement0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Procurement of sold material&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;For every sales order line, a procurement order is created to supply the sold product.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="procurement.process_node_procureproducts0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_saleorderprocurement0"/>
+            <field name="target_node_id" ref="procurement.process_node_procureproducts0"/>
+            <field name="source_node_id" ref="process_node_saleorderprocurement0"/>
         </record>
 
         <!--
diff --git a/addons/sale_stock/stock_view.xml b/addons/sale_stock/stock_view.xml
index d06526902fd..0f5b9c4f1e6 100644
--- a/addons/sale_stock/stock_view.xml
+++ b/addons/sale_stock/stock_view.xml
@@ -1,16 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <record id="stock_picking_inherit_sale" model="ir.ui.view">
-            <field name="name">stock.picking.form</field>
-            <field name="model">stock.picking</field>
-            <field name="inherit_id" ref="stock.view_picking_form"/>
-            <field name="arch" type="xml">
-                <field name="move_type" position="before">
-                    <field name="sale_id"/>
-                </field>
-            </field>
-        </record>
 
         <record id="stock_move_sale" model="ir.ui.view">
             <field name="name">stock.move.form</field>
@@ -51,7 +41,7 @@
 
         <record id="stock_picking_out_inherit_sale" model="ir.ui.view">
             <field name="name">Outgoing picking Inherited</field>
-            <field name="model">stock.picking</field>
+            <field name="model">stock.picking.out</field>
             <field name="inherit_id" ref="stock.view_picking_out_form"/>
             <field name="arch" type="xml">
                 <field name="move_type" position="after">
diff --git a/addons/share/wizard/share_wizard.py b/addons/share/wizard/share_wizard.py
index 3a26dcb9e6b..b45e3b17ea2 100644
--- a/addons/share/wizard/share_wizard.py
+++ b/addons/share/wizard/share_wizard.py
@@ -230,6 +230,7 @@ class share_wizard(osv.TransientModel):
         current_user = user_obj.browse(cr, UID_ROOT, uid, context=context)
         # modify context to disable shortcuts when creating share users
         context['noshortcut'] = True
+        context['no_reset_password'] = True
         created_ids = []
         existing_ids = []
         if wizard_data.user_type == 'emails':
diff --git a/addons/share/wizard/share_wizard_view.xml b/addons/share/wizard/share_wizard_view.xml
index 859245b46a9..e0e800ab150 100644
--- a/addons/share/wizard/share_wizard_view.xml
+++ b/addons/share/wizard/share_wizard_view.xml
@@ -96,6 +96,7 @@
                     <footer>
                         <field name="user_type" invisible="1"/>
                         <field name="access_mode" invisible="1"/>
+                        <button string="Close" class="oe_highlight" special="cancel" />
                     </footer>
 
                 </form>
diff --git a/addons/stock/html/Didier-Georgieff.jpg b/addons/stock/html/Didier-Georgieff.jpg
new file mode 100644
index 00000000000..ccf3007b86e
Binary files /dev/null and b/addons/stock/html/Didier-Georgieff.jpg differ
diff --git a/addons/stock/html/Mario-Riva.png b/addons/stock/html/Mario-Riva.png
new file mode 100644
index 00000000000..35b030a4265
Binary files /dev/null and b/addons/stock/html/Mario-Riva.png differ
diff --git a/addons/stock/html/index.html b/addons/stock/html/index.html
new file mode 100644
index 00000000000..aac71e529ae
--- /dev/null
+++ b/addons/stock/html/index.html
@@ -0,0 +1,240 @@
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <div class="oe_span12">
+            <h2 class="oe_slogan">Warehouse Management System</h2>
+            <h3 class="oe_slogan">A revolutionary double entry inventory system</h3>
+        </div>
+        <div class="oe_span6">
+            <div class="oe_demo oe_picture oe_screenshot">
+                <a href="https://www.openerp.com/saas_master/demo?lang=en_US&module=stock">
+                    <img src="stock_main.png">
+                </a>
+                <div class="oe_demo_footer oe_centeralign">Online Demo</div>
+            </div>
+        </div>
+        <div class="oe_span6">
+            <p class='oe_mt32'>
+Decrease your process times, automate transactions, reduce your stock levels and get complete traceability on all operations with the OpenERP double entry inventory system.
+            </p>
+            <div class="oe_centeralign oe_websiteonly">
+                <a href="http://www.openerp.com/start" class="oe_button oe_big oe_tacky">Start your <span class="oe_emph">free</span> trial</a>
+            </div>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container oe_dark">
+    <div class="oe_row">
+        <h2 class="oe_slogan">Double Entry Inventory Management</h2>
+        <h3 class="oe_slogan">Nothing is lost, everything is moved</h3>
+        <div class="oe_span6">
+            <p class='oe_mt32'>
+Based on the concept of double entry that revolutionized accounting, OpenERP's
+inventory management isn't about consumption, loss or missing products;
+products are just moved from one location to another.
+            </p><p>
+This allows full traceability (from customer to supplier, not limited to your
+warehouse), advanced reporting (e.g. inventory valuation on manufacturing
+counter-parts locations) and a very simple user interface.
+            </p>
+        </div>
+        <div class="oe_span6">
+            <div class="oe_bg_img oe_centered">
+                <img class="oe_picture" src="warehouse_illu_02.png">
+            </div>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row">
+        <h2 class="oe_slogan">Decrease your process time</h2>
+        <div class="oe_span6">
+            <img class="oe_picture oe_screenshot" src="stock_calendar.png">
+        </div>
+        <div class="oe_span6">
+           <p class='oe_mt32'>
+OpenERP prepares all operations for you, according to your own logistic rules:
+push rules, pull rules, make-to-order, minimum stock rules, etc. Optimizes the
+planning and jobs with the scheduler to reduce your process time.
+           </p>
+        </div>
+   </div>
+</section>
+
+<section class="oe_container oe_dark">
+    <div class="oe_row">
+        <h2 class="oe_slogan">Automate transactions</h2>
+        <div class="oe_span6">
+          <p class='oe_mt32'>
+Get your pickings, packings, receptions and internal moves scheduled
+automatically by OpenERP using your own routing rules.  Define push and pull
+rules to organize a warehouse or to manage produts's moves between several
+warehouses.
+          </p>
+        </div>
+        <div class="oe_span6">
+            <img class="oe_picture oe_screenshot" src="stock_procurement.png">
+        </div>
+   </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row">
+        <h2 class="oe_slogan">Get Full Traceability</h2>
+        <div class="oe_span6">
+            <div class="oe_bg_img">
+                <img class="oe_picture" src="stock_product_form.png">
+            </div>
+        </div>
+        <div class="oe_span6">
+          <p class='oe_mt32'>
+Keep an eye on all your stock by tracing all your past and future inventory
+transactions. Track in detail all stock moves, not only in your warehouse but
+also in counter-parts of the double entry moves (customers, suppliers or
+manufacturing locations).
+          </p><p>
+          Browse through the upstream or downstream traceability flows to
+          have a clear vision to what happened to a specific product or lot.
+          </p>
+        </div>
+   </div>
+</section>
+
+<section class="oe_container oe_centeralign oe_padded oe_mb32">
+    <div class='oe_cover'>
+        <img src="http://www.openerp.com/ebooks/logistic.png">
+    </div>
+    <a href="http://www.openerp.com/ebooks/logistic" target="_blank" class="oe_button oe_big">Download our free E-book</a>
+</section>
+
+<section class="oe_container oe_dark">
+    <div class="oe_row">
+        <h2 class="oe_slogan">Reduce your stock level</h2>
+        <h3 class="oe_slogan">Fine-tune procurement methods according to your need</h3>
+        <div class="oe_span6">
+          <p class='oe_mt32'>
+Reduce your stock while always staying replenished! You can setup minimum stock
+rules to have automatic procurements with the right quantities computed to get
+to the optimum level specified. Get rid of the stress of your stock and let the
+system help you with fullfilment propositions. 
+          </p>
+        </div>
+        <div class="oe_span6">
+            <div class="oe_row_img oe_centered">
+                <img class="oe_picture" src="warehouse_illu_01.png">
+            </div>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row">
+        <h2 class="oe_slogan">Fully Integrated with Operations</h2>
+        <h3 class="oe_slogan">Sales, Purchases and Accounting integration</h3>
+        <div class="oe_span6">
+            <div class="oe_bg_img oe_centered">
+                <img class="oe_picture" src="stock_integrate.png">
+            </div>
+        </div>
+        <div class="oe_span6">
+          <p class='oe_mt32'>
+Get your procurements accurate as the OpenERP WMS is fully integrated with
+sales and purchases for accurate forecasts. The accounting integration allows
+real time accounting valuation and deeper reporting on costs and revenues on
+your inventory operations.
+          </p>
+        </div>
+   </div>
+</section>
+
+<section class="oe_container oe_dark">
+    <div class="oe_row">
+        <h2 class="oe_slogan">Track Serial Numbers</h2>
+        <div class="oe_span6">
+          <p class='oe_mt32'>
+Assign serial numbers at every step of your reception or delivery flow.
+OpenERP handles production lots (batches of identical products) or logistic
+lots (pallets, boxes, etc) to help you get full upstream or downstream
+traceability.
+          </p>
+        </div>
+        <div class="oe_span6">
+            <div class="oe_bg_img">
+                <img class="oe_picture oe_screenshot" src="stock_product.png">
+            </div>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row">
+        <h2 class="oe_slogan">Scale Your WMS easily</h2>
+        <div class="oe_span6">
+            <div class="oe_bg_img oe_centered">
+                <img class="oe_picture" src="warehouse_illu_02.png">
+            </div>
+        </div>
+        <div class="oe_span6">
+          <p class='oe_mt32'>
+Manage your own internal and external locations, customers, suppliers or
+manufacturing inventories with the OpenERP multi-warehouse management system
+based on a hierarchical location structure.
+          </p>
+        </div>
+   </div>
+</section>
+
+<section class="oe_container oe_dark">
+    <div class="oe_spaced oe_row">
+        <h2 class="oe_slogan">Reporting and Dashboards</h2>
+        <h3 class="oe_slogan">Analyse your warehouse efficiency to improve performance</h3>
+        <div class="oe_span6">
+            <p class="oe_mt32">
+Get the insights you need to make smarter decisions. Design custom dashboards
+to get a picture of your warehouse efficiency at a glance. Dig deeper with
+real-time reports that anyone can create and share.
+            </p>
+        </div>
+        <div class="oe_span6">
+            <img class="oe_picture oe_screenshot" src="stock_reporting.png">
+        </div>
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row">
+        <div class="oe_span12">
+            <h2 class="oe_slogan">Many companies already enjoy it</h2>
+            <h3 class="oe_slogan">Hear what they have to say !</h3>
+        </div>
+        <div class="oe_span6">
+            <div class="oe_quote">
+                <q>
+                    We found the WMS apps to be a powerful tool for mid­size companies to better
+                    organize the warehouse. It's simple and easily customizable.
+                </q>
+                <cite class="oe_cite oe_clearfix">
+                    <img class="oe_photo" src="Mario-Riva.png">
+                    <div class="oe_author">Mario Riva</div>
+                    <div class="oe_job">COO, <a href="http://www.agilebg.com" target="_blank">Agile Business Group</a>.</div>
+                </cite>
+            </div>
+        </div>
+        <div class="oe_span6">
+            <div class="oe_quote">
+                <q>
+                    We saved hundreds of thousands of dollars with OpenERP.
+                </q>
+                <cite class="oe_cite oe_clearfix">
+                    <img class="oe_photo" src="Didier-Georgieff.jpg">
+                    <div class="oe_author">Didier Georgieff</div>
+                    <div class="oe_job">Chief Technical Officer, ENA</div>
+                </cite>
+            </div>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container oe_separator">
+</section>
diff --git a/addons/stock/html/stock_calendar.png b/addons/stock/html/stock_calendar.png
new file mode 100644
index 00000000000..58fb2bb077a
Binary files /dev/null and b/addons/stock/html/stock_calendar.png differ
diff --git a/addons/stock/html/stock_integrate.png b/addons/stock/html/stock_integrate.png
new file mode 100644
index 00000000000..92a0b0950d6
Binary files /dev/null and b/addons/stock/html/stock_integrate.png differ
diff --git a/addons/stock/html/stock_main.png b/addons/stock/html/stock_main.png
new file mode 100644
index 00000000000..b9b44c702aa
Binary files /dev/null and b/addons/stock/html/stock_main.png differ
diff --git a/addons/stock/html/stock_procurement.png b/addons/stock/html/stock_procurement.png
new file mode 100644
index 00000000000..cb315e08224
Binary files /dev/null and b/addons/stock/html/stock_procurement.png differ
diff --git a/addons/stock/html/stock_product.png b/addons/stock/html/stock_product.png
new file mode 100644
index 00000000000..cbfd054d72e
Binary files /dev/null and b/addons/stock/html/stock_product.png differ
diff --git a/addons/stock/html/stock_product_form.png b/addons/stock/html/stock_product_form.png
new file mode 100644
index 00000000000..a25c85b6496
Binary files /dev/null and b/addons/stock/html/stock_product_form.png differ
diff --git a/addons/stock/html/stock_reporting.png b/addons/stock/html/stock_reporting.png
new file mode 100644
index 00000000000..1ec54d18813
Binary files /dev/null and b/addons/stock/html/stock_reporting.png differ
diff --git a/addons/stock/html/warehouse_illu_01.png b/addons/stock/html/warehouse_illu_01.png
new file mode 100644
index 00000000000..60ccb3bf1ba
Binary files /dev/null and b/addons/stock/html/warehouse_illu_01.png differ
diff --git a/addons/stock/html/warehouse_illu_02.png b/addons/stock/html/warehouse_illu_02.png
new file mode 100644
index 00000000000..1543e2e3ae1
Binary files /dev/null and b/addons/stock/html/warehouse_illu_02.png differ
diff --git a/addons/stock/i18n/ru.po b/addons/stock/i18n/ru.po
index 4a79cec4b89..817b8aceaa5 100644
--- a/addons/stock/i18n/ru.po
+++ b/addons/stock/i18n/ru.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
-"PO-Revision-Date: 2013-01-22 08:16+0000\n"
+"PO-Revision-Date: 2013-06-04 12:52+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@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: 2013-03-16 04:58+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-06-05 05:32+0000\n"
+"X-Generator: Launchpad (build 16660)\n"
 
 #. module: stock
 #: field:stock.inventory.line.split,line_exist_ids:0
@@ -660,6 +660,8 @@ msgid ""
 "Forces to specify a Serial Number for all moves containing this product and "
 "going to a Customer Location"
 msgstr ""
+"Принудительно установить порядковый номер для всех перемещений этой "
+"продукции в место хранения заказчика"
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_stock_products_moves
@@ -845,6 +847,8 @@ msgid ""
 "Forces to specify a Serial Number for all moves containing this product and "
 "coming from a Supplier Location"
 msgstr ""
+"Принудительно установить порядковый номер для всех перемещений этой "
+"продукции из мест хранения поставщика"
 
 #. module: stock
 #: help:stock.config.settings,group_uos:0
@@ -1973,7 +1977,7 @@ msgstr "Полка 2"
 #: code:addons/stock/stock.py:529
 #, python-format
 msgid "You cannot remove a lot line."
-msgstr ""
+msgstr "Нельзя удалить позицию партии"
 
 #. module: stock
 #: help:stock.location,posx:0
@@ -2402,7 +2406,7 @@ msgstr "Место хранения поставщика"
 #. module: stock
 #: view:stock.location.product:0
 msgid "View Products Inventory"
-msgstr ""
+msgstr "Новая инвентаризация продукции"
 
 #. module: stock
 #: view:stock.move:0
@@ -2535,6 +2539,7 @@ msgid ""
 "Current quantity of products with this Serial Number available in company "
 "warehouses"
 msgstr ""
+"Текущее количество продукции с этим серийный номером на складах компании"
 
 #. module: stock
 #: view:stock.inventory:0
diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index dc80c0f950a..e52a0181206 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -110,12 +110,11 @@
                     </group>
                 </group>
                 <group name="status" position="after" version="7.0">
-                     <group name="store" string="Storage Location">
-                         <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                         <field name="loc_rack" attrs="{'invisible':[('type','=','service')]}"/>
-                         <field name="loc_row" attrs="{'invisible':[('type','=','service')]}"/>
-                         <field name="loc_case" attrs="{'invisible':[('type','=','service')]}"/>
-                     </group>
+                    <group name="store" string="Storage Location" attrs="{'invisible':[('type','=','service')]}">
+                        <field name="loc_rack"/>
+                        <field name="loc_row"/>
+                        <field name="loc_case"/>
+                    </group>
                 </group>
                 <group name="Weights" position="after">
                      <group name="store" groups="stock.group_locations" string="Counter-Part Locations Properties">
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 764d9de453e..db73bae3b6c 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -29,7 +29,7 @@ from openerp.osv import fields, osv
 from openerp.tools.translate import _
 from openerp import netsvc
 from openerp import tools
-from openerp.tools import float_compare
+from openerp.tools import float_compare, DEFAULT_SERVER_DATETIME_FORMAT
 import openerp.addons.decimal_precision as dp
 import logging
 _logger = logging.getLogger(__name__)
@@ -647,7 +647,7 @@ class stock_picking(osv.osv):
         ),
         'min_date': fields.function(get_min_max_date, fnct_inv=_set_minimum_date, multi="min_max_date",
                  store=True, type='datetime', string='Scheduled Time', select=1, help="Scheduled time for the shipment to be processed"),
-        'date': fields.datetime('Time', help="Creation time, usually the time of the order.", select=True, states={'done':[('readonly', True)], 'cancel':[('readonly',True)]}),
+        'date': fields.datetime('Creation Date', help="Creation date, usually the time of the order.", select=True, states={'done':[('readonly', True)], 'cancel':[('readonly',True)]}),
         'date_done': fields.datetime('Date of Transfer', help="Date of Completion", states={'done':[('readonly', True)], 'cancel':[('readonly',True)]}),
         'max_date': fields.function(get_min_max_date, fnct_inv=_set_maximum_date, multi="min_max_date",
                  store=True, type='datetime', string='Max. Expected Date', select=2),
@@ -2323,7 +2323,6 @@ class stock_move(osv.osv):
                          'line_id': move_lines,
                          'ref': move.picking_id and move.picking_id.name})
 
-
     def action_done(self, cr, uid, ids, context=None):
         """ Makes the move done and if all moves are done, it will finish the picking.
         @return:
@@ -2369,7 +2368,7 @@ class stock_move(osv.osv):
         if todo:
             self.action_confirm(cr, uid, todo, context=context)
 
-        self.write(cr, uid, move_ids, {'state': 'done', 'date': time.strftime('%Y-%m-%d %H:%M:%S')}, context=context)
+        self.write(cr, uid, move_ids, {'state': 'done', 'date': time.strftime(DEFAULT_SERVER_DATETIME_FORMAT)}, context=context)
         for id in move_ids:
              wf_service.trg_trigger(uid, 'stock.move', id, cr)
 
@@ -2412,14 +2411,14 @@ class stock_move(osv.osv):
         # or if it's the same as that of the secondary amount being posted.
         account_obj = self.pool.get('account.account')
         src_acct, dest_acct = account_obj.browse(cr, uid, [src_account_id, dest_account_id], context=context)
-        src_main_currency_id = src_acct.company_id.currency_id.id
-        dest_main_currency_id = dest_acct.company_id.currency_id.id
+        src_main_currency_id = src_acct.currency_id and src_acct.currency_id.id or src_acct.company_id.currency_id.id
+        dest_main_currency_id = dest_acct.currency_id and dest_acct.currency_id.id or dest_acct.company_id.currency_id.id
         cur_obj = self.pool.get('res.currency')
         if reference_currency_id != src_main_currency_id:
             # fix credit line:
             credit_line_vals['credit'] = cur_obj.compute(cr, uid, reference_currency_id, src_main_currency_id, reference_amount, context=context)
             if (not src_acct.currency_id) or src_acct.currency_id.id == reference_currency_id:
-                credit_line_vals.update(currency_id=reference_currency_id, amount_currency=reference_amount)
+                credit_line_vals.update(currency_id=reference_currency_id, amount_currency=-reference_amount)
         if reference_currency_id != dest_main_currency_id:
             # fix debit line:
             debit_line_vals['debit'] = cur_obj.compute(cr, uid, reference_currency_id, dest_main_currency_id, reference_amount, context=context)
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 6097885175b..b1a1fa048be 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1262,8 +1262,8 @@
                             <field name="location_dest_id" groups="stock.group_locations"/>
                             <field name="partner_id" context="{'contact_display':'partner'}"
                                 groups="stock.group_locations"/>
-                            <field name="date_expected" on_change="onchange_date(date,date_expected)"/>
-                            <field name="date" groups="base.group_no_one"/>
+                            <field name="date_expected" on_change="onchange_date(date,date_expected)" attrs="{'invisible': [('state', '=', 'done')]}"/>
+                            <field name="date" attrs="{'invisible': [('state', '!=', 'done')]}"/>
                         </group>
                         <group string="Traceability"
                             groups="stock.group_tracking_lot">
diff --git a/addons/stock_location/stock_location_demo_cpu1.xml b/addons/stock_location/stock_location_demo_cpu1.xml
index 6578a961ff3..d9a220daef6 100644
--- a/addons/stock_location/stock_location_demo_cpu1.xml
+++ b/addons/stock_location/stock_location_demo_cpu1.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" ?>
 <openerp>
     <data noupdate="1">
          <record id="product.product_product_9" model="product.product">
@@ -73,7 +72,7 @@
             <field name="company_id" ref="stock.res_company_1"/>
             <field name="warehouse_id" ref="stock.stock_warehouse_shop0"/>
             <field name="location_id" ref="stock.stock_location_shop0"/>
-            <field model="product.product" name="product_id" ref="product.product_product_9"/>
+            <field name="product_id" ref="product.product_product_9"/>
         </record>
 
         <record id="sale_shop2" model="sale.shop">
@@ -89,4 +88,4 @@
             <field model="account.payment.term" name="payment_default_id" search="[]"/>
         </record>
     </data>
-</openerp>
+</openerp>
\ No newline at end of file
diff --git a/addons/survey/wizard/survey_send_invitation.py b/addons/survey/wizard/survey_send_invitation.py
index ca6a8e4b15d..44d3bec7f6e 100644
--- a/addons/survey/wizard/survey_send_invitation.py
+++ b/addons/survey/wizard/survey_send_invitation.py
@@ -191,7 +191,8 @@ Thanks,''') % (name, self.pool.get('ir.config_parameter').get_param(cr, uid, 'we
                                 'action_id': act_id[0],
                                 'survey_id': [[6, 0, survey_ids]]
                                }
-                    user = user_ref.create(cr, uid, res_data)
+                    create_ctx = dict(context, no_reset_password=True)
+                    user = user_ref.create(cr, uid, res_data, context=create_ctx)
                     if user not in new_user:
                         new_user.append(user)
                     created+= "- %s (Login: %s,  Password: %s)\n" % (partner.name or _('Unknown'),\
diff --git a/addons/warning/i18n/th.po b/addons/warning/i18n/th.po
new file mode 100644
index 00000000000..24ae791caae
--- /dev/null
+++ b/addons/warning/i18n/th.po
@@ -0,0 +1,215 @@
+# Thai 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: 2012-12-21 17:06+0000\n"
+"PO-Revision-Date: 2013-05-15 07:12+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Thai <th@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: 2013-05-16 05:12+0000\n"
+"X-Generator: Launchpad (build 16626)\n"
+
+#. module: warning
+#: model:ir.model,name:warning.model_purchase_order_line
+#: field:product.product,purchase_line_warn:0
+msgid "Purchase Order Line"
+msgstr ""
+
+#. module: warning
+#: model:ir.model,name:warning.model_stock_picking_in
+msgid "Incoming Shipments"
+msgstr ""
+
+#. module: warning
+#: field:product.product,purchase_line_warn_msg:0
+msgid "Message for Purchase Order Line"
+msgstr ""
+
+#. module: warning
+#: model:ir.model,name:warning.model_stock_picking
+msgid "Picking List"
+msgstr ""
+
+#. module: warning
+#: view:product.product:0
+msgid "Warning when Purchasing this Product"
+msgstr ""
+
+#. module: warning
+#: model:ir.model,name:warning.model_product_product
+msgid "Product"
+msgstr ""
+
+#. module: warning
+#: view:product.product:0
+#: view:res.partner:0
+msgid "Warnings"
+msgstr ""
+
+#. module: warning
+#: selection:product.product,purchase_line_warn:0
+#: selection:product.product,sale_line_warn:0
+#: selection:res.partner,invoice_warn:0
+#: selection:res.partner,picking_warn:0
+#: selection:res.partner,purchase_warn:0
+#: selection:res.partner,sale_warn:0
+msgid "Blocking Message"
+msgstr ""
+
+#. module: warning
+#: view:res.partner:0
+msgid "Warning on the Invoice"
+msgstr ""
+
+#. module: warning
+#: selection:product.product,purchase_line_warn:0
+#: selection:product.product,sale_line_warn:0
+#: selection:res.partner,invoice_warn:0
+#: selection:res.partner,picking_warn:0
+#: selection:res.partner,purchase_warn:0
+#: selection:res.partner,sale_warn:0
+msgid "No Message"
+msgstr ""
+
+#. module: warning
+#: model:ir.model,name:warning.model_account_invoice
+#: field:res.partner,invoice_warn:0
+msgid "Invoice"
+msgstr ""
+
+#. module: warning
+#: view:product.product:0
+msgid "Warning when Selling this Product"
+msgstr ""
+
+#. module: warning
+#: field:res.partner,picking_warn:0
+msgid "Stock Picking"
+msgstr ""
+
+#. module: warning
+#: model:ir.model,name:warning.model_purchase_order
+#: field:res.partner,purchase_warn:0
+msgid "Purchase Order"
+msgstr ""
+
+#. module: warning
+#: field:res.partner,purchase_warn_msg:0
+msgid "Message for Purchase Order"
+msgstr ""
+
+#. module: warning
+#: code:addons/warning/warning.py:32
+#: help:product.product,purchase_line_warn:0
+#: help:product.product,sale_line_warn:0
+#: help:res.partner,invoice_warn:0
+#: help:res.partner,picking_warn:0
+#: help:res.partner,purchase_warn:0
+#: help:res.partner,sale_warn:0
+#, python-format
+msgid ""
+"Selecting the \"Warning\" option will notify user with the message, "
+"Selecting \"Blocking Message\" will throw an exception with the message and "
+"block the flow. The Message has to be written in the next field."
+msgstr ""
+
+#. module: warning
+#: code:addons/warning/warning.py:67
+#: code:addons/warning/warning.py:96
+#: code:addons/warning/warning.py:130
+#: code:addons/warning/warning.py:162
+#: code:addons/warning/warning.py:192
+#: code:addons/warning/warning.py:218
+#: code:addons/warning/warning.py:266
+#: code:addons/warning/warning.py:299
+#, python-format
+msgid "Alert for %s !"
+msgstr ""
+
+#. module: warning
+#: view:res.partner:0
+msgid "Warning on the Sales Order"
+msgstr ""
+
+#. module: warning
+#: field:res.partner,invoice_warn_msg:0
+msgid "Message for Invoice"
+msgstr ""
+
+#. module: warning
+#: field:res.partner,sale_warn_msg:0
+msgid "Message for Sales Order"
+msgstr ""
+
+#. module: warning
+#: view:res.partner:0
+msgid "Warning on the Picking"
+msgstr ""
+
+#. module: warning
+#: view:res.partner:0
+msgid "Warning on the Purchase Order"
+msgstr ""
+
+#. module: warning
+#: code:addons/warning/warning.py:68
+#: code:addons/warning/warning.py:97
+#: code:addons/warning/warning.py:132
+#: code:addons/warning/warning.py:163
+#: code:addons/warning/warning.py:193
+#: code:addons/warning/warning.py:219
+#: code:addons/warning/warning.py:267
+#: code:addons/warning/warning.py:300
+#, python-format
+msgid "Warning for %s"
+msgstr ""
+
+#. module: warning
+#: field:product.product,sale_line_warn_msg:0
+msgid "Message for Sales Order Line"
+msgstr ""
+
+#. module: warning
+#: selection:product.product,purchase_line_warn:0
+#: selection:product.product,sale_line_warn:0
+#: selection:res.partner,invoice_warn:0
+#: selection:res.partner,picking_warn:0
+#: selection:res.partner,purchase_warn:0
+#: selection:res.partner,sale_warn:0
+msgid "Warning"
+msgstr ""
+
+#. module: warning
+#: field:res.partner,picking_warn_msg:0
+msgid "Message for Stock Picking"
+msgstr ""
+
+#. module: warning
+#: model:ir.model,name:warning.model_res_partner
+msgid "Partner"
+msgstr ""
+
+#. module: warning
+#: model:ir.model,name:warning.model_sale_order
+#: field:res.partner,sale_warn:0
+msgid "Sales Order"
+msgstr ""
+
+#. module: warning
+#: model:ir.model,name:warning.model_stock_picking_out
+msgid "Delivery Orders"
+msgstr ""
+
+#. module: warning
+#: model:ir.model,name:warning.model_sale_order_line
+#: field:product.product,sale_line_warn:0
+msgid "Sales Order Line"
+msgstr ""
diff --git a/addons/web_shortcuts/static/src/css/web_shortcuts.css b/addons/web_shortcuts/static/src/css/web_shortcuts.css
index 8424e146d06..5d4e34f53b9 100644
--- a/addons/web_shortcuts/static/src/css/web_shortcuts.css
+++ b/addons/web_shortcuts/static/src/css/web_shortcuts.css
@@ -54,4 +54,7 @@
     border-left: none;
     padding-left: 0;
 }
-
+.oe_systray_shortcuts_items > li > a:hover {
+    overflow:visible;
+    white-space: normal;
+}
\ No newline at end of file