diff --git a/addons/account/__openerp__.py b/addons/account/__openerp__.py
index 43aaa2f58c1..a380a69dc03 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 @@
-->
Profit and Loss
+ sumIncome
+ detail_with_hierarchyaccount_typeExpense
+ detail_with_hierarchyaccount_type
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 @@
+
-
+
-
diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py
index c47cf70b673..29197a97b07 100644
--- a/addons/account/account_invoice.py
+++ b/addons/account/account_invoice.py
@@ -722,7 +722,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 +769,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 +783,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 +870,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 +986,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)
@@ -1517,8 +1519,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 +1663,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 @@
-
-
-
+
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 @@
-
+ {'search_default_partner_id': [active_id], 'default_partner_id': active_id}Contracts/Analytic Accountsaccount.analytic.account
- tree,form
+
+ partner.view.buttons
@@ -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"/>
-
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 @@
Analytic Accountsir.actions.act_windowaccount.analytic.account
+ {}formtree,form
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 @@
+
@@ -68,6 +69,7 @@
+
diff --git a/addons/account/res_config.py b/addons/account/res_config.py
index 53c604161ea..f1f1aee7d41 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'):
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..be1e0aac402 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
@@ -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 @@
-
or view
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_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_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 345c3378aa0..a043b15a518 100644
--- a/addons/account_voucher/__openerp__.py
+++ b/addons/account_voucher/__openerp__.py
@@ -67,6 +67,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/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/test/account_voucher.yml b/addons/account_voucher/test/account_voucher.yml
index c9270dc695c..2cd612affc7 100644
--- a/addons/account_voucher/test/account_voucher.yml
+++ b/addons/account_voucher/test/account_voucher.yml
@@ -6,7 +6,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 94f0c718980..8dce677fd9a 100644
--- a/addons/account_voucher/test/case_eur_usd.yml
+++ b/addons/account_voucher/test/case_eur_usd.yml
@@ -41,7 +41,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
@@ -79,7 +79,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 @@
+
+
+
account.voucher.payment.low.priority.formaccount.voucher
@@ -107,7 +110,7 @@
-
+
@@ -119,6 +122,7 @@
+
account.voucher.payment.formaccount.voucher
@@ -157,7 +161,7 @@
-
+
-
+
-
-
+
+
-
-
-
+
+
@@ -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"/>
+
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/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/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_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 ().
#
+# 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 ().
-#
-# 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 .
-#
-#
-##############################################################################
+#############################################################################
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 ().
#
+# 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 ().
-#
-# 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 .
-#
-#
-##############################################################################
+#############################################################################
+
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 ().
#
+# 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 ().
-#
-# 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 .
-#
-#
-##############################################################################
+#############################################################################
+
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 ().
#
+# 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 ().
-#
-# 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 .
-#
-#
-##############################################################################
+#############################################################################
+
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 ().
#
+# 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 ().
-#
-# 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 .
-#
-#
-##############################################################################
+#############################################################################
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 ().
#
+# 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 ().
-#
-# 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 .
-#
-#
-##############################################################################
+#############################################################################
+
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 ().
#
+# 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 ().
-#
-# 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 .
-#
-#
-##############################################################################
+#############################################################################
+
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 ().
#
+# 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 ().
-#
-# 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 .
-#
-#
-##############################################################################
-
+#############################################################################
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 ().
#
+# 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 ().
-#
-# 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 .
-#
-#
-##############################################################################
+#############################################################################
+
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 ().
#
+# 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 ().
-#
-# 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 .
-#
-#
-##############################################################################
+#############################################################################
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 ().
#
+# 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 ().
-#
-# 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 .
-#
-#
-##############################################################################
+#############################################################################
+
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 ().
#
+# 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 ().
-#
-# 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 .
-#
-#
-##############################################################################
+#############################################################################
+
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 ().
#
+# 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 ().
-#
-# 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 .
-#
-#
-##############################################################################
+#############################################################################
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 ().
#
+# 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 ().
-#
-# 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 .
-#
-#
-##############################################################################
+#############################################################################
+
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 ().
#
+# 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 ().
-#
-# 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 .
-#
-#
-##############################################################################
+#############################################################################
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 ().
#
+# 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 ().
-#
-# 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 .
-#
-#
-##############################################################################
+#############################################################################
+
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 ().
#
+# 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 ().
-#
-# 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 .
-#
-#
-##############################################################################
+#############################################################################
+
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 ().
#
+# 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 ().
-#
-# 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 .
+# 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 ().
#
+# 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 ().
-#
-# 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 .
+# 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 ().
#
+# 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 ().
-#
-# 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 .
+# 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 ().
#
+# 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 ().
-#
-# 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 .
+# 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 ().
#
+# 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 ().
-#
-# 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 .
-#
-#
-##############################################################################
+#############################################################################
import re
import uno
diff --git a/addons/crm/crm_case_section_view.xml b/addons/crm/crm_case_section_view.xml
index c788872b47e..703b4ebb254 100644
--- a/addons/crm/crm_case_section_view.xml
+++ b/addons/crm/crm_case_section_view.xml
@@ -43,8 +43,7 @@
{
'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',
diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 4e5dee5ae34..701a9671fee 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
@@ -980,15 +981,18 @@ 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 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_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 @@
{
'default_type':'lead',
'stage_type':'lead',
+ 'needaction_menu_ref': 'crm.menu_crm_opportunities',
'search_default_unassigned':1,
}
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 62090dd0efc..225b2ffc292 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -556,7 +556,7 @@
- 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/email_template/email_template.py b/addons/email_template/email_template.py
index 00285ebcd91..4a767457321 100644
--- a/addons/email_template/email_template.py
+++ b/addons/email_template/email_template.py
@@ -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))
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/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 @@
Use template
+ on_change="onchange_template_id(template_id, composition_mode, model, res_id, context)" domain="[('model_id.model','=',model)]"/>
+ context="{'default_groups_ref': ['base.group_user']}"/>
@@ -31,7 +31,7 @@
+ context="{'default_groups_ref': ['base.group_user']}"/>
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/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_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
+# Copyright (c) 2012-2013, Grupo OPENTIA () Registered EU Trademark.
+# Dpto. Consultoría
+# Copyright (c) 2013 Serv. Tecnol. Avanzados (http://www.serviciosbaeza.com)
+# Pedro Manuel Baeza
# $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 .
#
##############################################################################
{
- '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 @@
-
+
@@ -2722,7 +2722,7 @@
view
- Amortización acumulada de otras instaciones
+ Amortización acumulada de otras instalaciones
@@ -2730,7 +2730,7 @@
other
- Amortización acumulada de otras instaciones
+ Amortización acumulada de otras instalaciones
@@ -4743,7 +4743,7 @@
460
-
+ otherAnticipos de remuneraciones
@@ -4759,7 +4759,7 @@
465
-
+ otherRemuneraciones pendientes de pago
@@ -4775,7 +4775,7 @@
466
-
+ otherRemuneraciones mediante sistemas de aportación definida pendientes de pago
@@ -4805,8 +4805,8 @@
Hacienda Pública, deudora por IVA
-
- 4700
+
+ 470000receivable
@@ -4869,6 +4869,14 @@
Hacienda Pública, IVA soportado
+
+ 472000
+
+
+ other
+ Hacienda Pública. IVA soportado
+
+ 473
@@ -4877,6 +4885,14 @@
Hacienda Pública, retenciones y pagos a cuenta
+
+ 473000
+
+
+ other
+ Hacienda Pública, retenciones y pagos a cuenta
+
+ 474
@@ -4949,8 +4965,8 @@
Hacienda Pública, acreedora por IVA
-
- 4750
+
+ 475000payable
@@ -4965,8 +4981,8 @@
Hacienda Pública, acreedora por retenciones practicadas
-
- 4751
+
+ 475100payable
@@ -5029,6 +5045,14 @@
Hacienda Pública, IVA repercutido
+
+ 477000
+
+
+ other
+ Hacienda Pública. IVA repercutido
+
+ 479
@@ -8722,7 +8746,7 @@
view
- Ingresos de créditos a largo plazo
+ Intereses de deudas
@@ -8730,7 +8754,7 @@
view
- Ingresos de créditos a largo plazo, empresas del grupo
+ Intereses de deudas, empresas del grupo
@@ -8738,7 +8762,7 @@
other
- Ingresos de créditos a largo plazo, empresas del grupo
+ Intereses de deudas, empresas del grupo
@@ -8746,7 +8770,7 @@
view
- Ingresos de créditos a largo plazo, empresas asociadas
+ Intereses de deudas, empresas asociadas
@@ -8754,7 +8778,7 @@
other
- Ingresos de créditos a largo plazo, empresas asociadas
+ Intereses de deudas, empresas asociadas
@@ -8762,7 +8786,7 @@
view
- Ingresos de créditos a largo plazo, otras partes vinculadas
+ Intereses de deudas, otras partes vinculadas
@@ -8770,7 +8794,7 @@
other
- Ingresos de créditos a largo plazo, otras partes vinculadas
+ Intereses de deudas, otras partes vinculadas
@@ -8778,7 +8802,7 @@
view
- Ingresos de créditos a largo plazo con entidades de crédito
+ Intereses de deudas con entidades de crédito
@@ -8786,7 +8810,7 @@
other
- Ingresos de créditos a largo plazo con entidades de crédito
+ Intereses de deudas con entidades de crédito
@@ -8794,7 +8818,7 @@
view
- Ingresos de créditos a largo plazo, otras empresas
+ Intereses de deudas, otras empresas
@@ -8802,7 +8826,7 @@
other
- Ingresos de créditos a largo plazo, otras empresas
+ Intereses de deudas, otras empresas
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 @@
+
+
+
+
+
+
+
+
+ 0
+
+
+ view
+ Plan General Contable ASOCIACIONES 2008
+
+
+
+
+ 1
+
+
+ view
+ Financiación Básica
+
+
+
+ 10
+
+
+ view
+ Capital
+
+
+
+
+ 100
+
+
+ view
+ Dotación fundacional
+
+
+
+ 100
+
+
+ other
+ Dotación fundacional
+
+
+
+ 101
+
+
+ view
+ Fondo social
+
+
+
+ 101
+
+
+ other
+ Fondo social
+
+
+
+ 102
+
+
+ view
+ Capital
+
+
+
+ 102
+
+
+ other
+ Capital
+
+
+
+ 103
+
+
+ view
+ Fundadores/asociados por desembolsos no exigidos
+
+
+
+ 1030
+
+
+ view
+ Fundadores, parte no desembolsada en fundaciones
+
+
+
+ 1030
+
+
+ other
+ Fundadores, parte no desembolsada en fundaciones
+
+
+
+ 1034
+
+
+ view
+ Asociados, parte no desembolsada en asociaciones
+
+
+
+ 1034
+
+
+ other
+ Asociados, parte no desembolsada en asociaciones
+
+
+
+ 104
+
+
+ view
+ Fundadores/asociados por aportaciones no dinerarias pendientes
+
+
+
+ 1040
+
+
+ view
+ Fundadores, por aportaciones no dinerarias pendientes, en fundaciones
+
+
+
+ 1040
+
+
+ other
+ Fundadores, por aportaciones no dinerarias pendientes, en fundaciones
+
+
+
+ 1044
+
+
+ view
+ Asociados, por aportaciones no dinerarias pendientes, en asociaciones
+
+
+
+ 1044
+
+
+ other
+ Asociados, por aportaciones no dinerarias pendientes, en asociaciones
+
+
+
+ 108
+
+
+ view
+ Acciones o participaciones propias en situaciones especiales
+
+
+
+ 108
+
+
+ other
+ Acciones o participaciones propias en situaciones especiales
+
+
+
+ 109
+
+
+ view
+ Acciones o participaciones propias para reducción de capital
+
+
+
+ 109
+
+
+ other
+ Acciones o participaciones propias para reducción de capital
+
+
+
+ 11
+
+
+ view
+ Reservas y otros instrumentos de patrimonio
+
+
+
+ 110
+
+
+ view
+ Prima de Emisión o asunción
+
+
+
+ 110
+
+
+ other
+ Prima de Emisión o asunción
+
+
+
+ 112
+
+
+ view
+ Reserva Legal
+
+
+
+ 112
+
+
+ other
+ Reserva Legal
+
+
+
+ 113
+
+
+ view
+ Reservas voluntarias
+
+
+
+ 113
+
+
+ other
+ Reservas voluntarias
+
+
+
+ 114
+
+
+ view
+ Reservas especiales
+
+
+
+ 1140
+
+
+ view
+ Reservas para acciones o participaciones de la sociedad dominante
+
+
+
+ 1140
+
+
+ other
+ Reservas para acciones o participaciones de la sociedad dominante
+
+
+
+ 1141
+
+
+ view
+ Reservas estatutarias
+
+
+
+ 1141
+
+
+ other
+ Reservas estatutarias
+
+
+
+ 1142
+
+
+ view
+ Reserva por capital amortizado
+
+
+
+ 1142
+
+
+ other
+ Reserva por capital amortizado
+
+
+
+ 1144
+
+
+ view
+ Reservas por acciones propias aceptadas en garantía
+
+
+
+ 1144
+
+
+ other
+ Reservas por acciones propias aceptadas en garantía
+
+
+
+ 118
+
+
+ view
+ Aportaciones de socios o propietarios
+
+
+
+ 118
+
+
+ other
+ Aportaciones de socios o propietarios
+
+
+
+ 119
+
+
+ view
+ Diferencias por ajuste del capital a euros
+
+
+
+ 119
+
+
+ other
+ Diferencias por ajuste del capital a euros
+
+
+
+ 12
+
+
+ view
+ Excedentes pendientes de aplicación
+
+
+
+ 120
+
+
+ view
+ Remanente
+
+
+
+ 120
+
+
+ other
+ Remanente
+
+
+
+ 121
+
+
+ view
+ Excedentes negativos de ejercicios anteriores
+
+
+
+ 121
+
+
+ other
+ Excedentes negativos de ejercicios anteriores
+
+
+
+ 129
+
+
+ view
+ Excedente del ejercicio
+
+
+
+ 129
+
+
+ other
+ Excedente del ejercicio
+
+
+
+ 13
+
+
+ view
+ Subvenciones, donaciones y ajustes por cambio de valor
+
+
+
+ 130
+
+
+ view
+ Subvenciones oficiales de capital
+
+
+
+ 1300
+
+
+ view
+ Subvenciones del Estado
+
+
+
+ 1300
+
+
+ other
+ Subvenciones del Estado
+
+
+
+ 1301
+
+
+ view
+ Subvenciones de otras Administraciones Públicas
+
+
+
+ 1301
+
+
+ other
+ Subvenciones de otras Administraciones Públicas
+
+
+
+ 131
+
+
+ view
+ Donaciones y legados de capital
+
+
+
+ 131
+
+
+ other
+ Donaciones y legados de capital
+
+
+
+ 132
+
+
+ view
+ Otras subvenciones, donaciones y legados
+
+
+
+ 1320
+
+
+ view
+ Otras subvenciones
+
+
+
+ 1320
+
+
+ other
+ Otras subvenciones
+
+
+
+ 1321
+
+
+ view
+ Otras donaciones y legados
+
+
+
+ 1321
+
+
+ other
+ Otras donaciones y legados
+
+
+
+
+ 137
+
+
+ view
+ Ingresos fiscales a distribuir en varios ejercicios
+
+
+
+ 1370
+
+
+ view
+ Ingresos fiscales por diferencias permanentes a distribuir en varios ejercicios
+
+
+
+ 1370
+
+
+ other
+ Ingresos fiscales por diferencias permanentes a distribuir en varios ejercicios
+
+
+
+ 1371
+
+
+ view
+ Ingresos fiscales por deducciones y bonificaciones a distribuir en varios ejercicios
+
+
+
+ 1371
+
+
+ other
+ Ingresos fiscales por deducciones y bonificaciones a distribuir en varios ejercicios
+
+
+
+ 14
+
+
+ view
+ Provisiones
+
+
+
+ 141
+
+
+ view
+ Provisión para impuestos
+
+
+
+ 141
+
+
+ other
+ Provisión para impuestos
+
+
+
+ 142
+
+
+ view
+ Provisión para otras responsabilidades
+
+
+
+ 142
+
+
+ other
+ Provisión para otras responsabilidades
+
+
+
+ 143
+
+
+ view
+ Provisión por desmantelamiento, retiro o rehabilitación del inmovilizado
+
+
+
+ 143
+
+
+ other
+ Provisión por desmantelamiento, retiro o rehabilitación del inmovilizado
+
+
+
+ 145
+
+
+ view
+ Provisión para actuaciones medioambientales
+
+
+
+ 145
+
+
+ other
+ Provisión para actuaciones medioambientales
+
+
+
+ 15
+
+
+ view
+ Deudas con características especiales
+
+
+
+ 150
+
+
+ view
+ Acciones o participaciones consideradas como pasivos financieros
+
+
+
+ 150
+
+
+ other
+ Acciones o participaciones consideradas como pasivos financieros
+
+
+
+ 153
+
+
+ view
+ Desembolsos no exigidos por acciones o participaciones consideradas como pasivos financieros
+
+
+
+ 1533
+
+
+ view
+ Desembolsos no exigidos, empresas del grupo
+
+
+
+ 1533
+
+
+ other
+ Desembolsos no exigidos, empresas del grupo
+
+
+
+ 1534
+
+
+ view
+ Desembolsos no exigidos, empresas asociadas
+
+
+
+ 1534
+
+
+ other
+ Desembolsos no exigidos, empresas asociadas
+
+
+
+ 1535
+
+
+ view
+ Desembolsos no exigidos, otras partes vinculadas
+
+
+
+ 1535
+
+
+ other
+ Desembolsos no exigidos, otras partes vinculadas
+
+
+
+ 1536
+
+
+ view
+ Otros desembolsos no exigidos
+
+
+
+ 1536
+
+
+ other
+ Otros desembolsos no exigidos
+
+
+
+ 154
+
+
+ view
+ Aportaciones no dinerarias pendientes por acciones o participaciones consideradas como pasivos financieros
+
+
+
+ 1543
+
+
+ view
+ Aportaciones no dinerarias pendientes, empresas del grupo
+
+
+
+ 1543
+
+
+ other
+ Aportaciones no dinerarias pendientes, empresas del grupo
+
+
+
+ 1544
+
+
+ view
+ Aportaciones no dinerarias pendientes, empresas asociadas
+
+
+
+ 1544
+
+
+ other
+ Aportaciones no dinerarias pendientes, empresas asociadas
+
+
+
+ 1545
+
+
+ view
+ Aportaciones no dinerarias pendientes, otras partes vinculadas
+
+
+
+ 1545
+
+
+ other
+ Aportaciones no dinerarias pendientes, otras partes vinculadas
+
+
+
+ 1546
+
+
+ view
+ Otras aportaciones no dinerarias pendientes
+
+
+
+ 1546
+
+
+ other
+ Otras aportaciones no dinerarias pendientes
+
+
+
+ 16
+
+
+ view
+ Deudas con partes vinculadas
+
+
+
+ 160
+
+
+ view
+ Deudas con entidades de crédito vinculadas
+
+
+
+ 1603
+
+
+ view
+ Deudas con entidades de crédito vinculadas, empresas del grupo
+
+
+
+ 1603
+
+
+ other
+ Deudas con entidades de crédito vinculadas, empresas del grupo
+
+
+
+ 1604
+
+
+ view
+ Deudas con entidades de crédito vinculadas, empresas asociadas
+
+
+
+ 1604
+
+
+ other
+ Deudas con entidades de crédito vinculadas, empresas asociadas
+
+
+
+ 1605
+
+
+ view
+ Deudas con otras entidades de crédito vinculadas
+
+
+
+ 1605
+
+
+ other
+ Deudas con otras entidades de crédito vinculadas
+
+
+
+ 161
+
+
+ view
+ Proveedores de inmovilizado, partes vinculadas
+
+
+
+ 1613
+
+
+ view
+ Proveedores de inmovilizado, empresas del grupo
+
+
+
+ 1613
+
+
+ other
+ Proveedores de inmovilizado, empresas del grupo
+
+
+
+ 1614
+
+
+ view
+ Proveedores de inmovilizado, empresas asociadas
+
+
+
+ 1614
+
+
+ other
+ Proveedores de inmovilizado, empresas asociadas
+
+
+
+ 1615
+
+
+ view
+ Proveedores de inmovilizado, otras partes vinculadas
+
+
+
+ 1615
+
+
+ other
+ Proveedores de inmovilizado, otras partes vinculadas
+
+
+
+ 162
+
+
+ view
+ Acreedores por arrendamiento financiero, partes vinculadas
+
+
+
+ 1623
+
+
+ view
+ Acreedores por arrendamiento financiero, empresas de grupo
+
+
+
+ 1623
+
+
+ other
+ Acreedores por arrendamiento financiero, empresas de grupo
+
+
+
+ 1624
+
+
+ view
+ Acreedores por arrendamiento financiero, empresas asociadas
+
+
+
+ 1624
+
+
+ other
+ Acreedores por arrendamiento financiero, empresas asociadas
+
+
+
+ 1625
+
+
+ view
+ Acreedores por arrendamiento financiero, otras partes vinculadas
+
+
+
+ 1625
+
+
+ other
+ Acreedores por arrendamiento financiero, otras partes vinculadas
+
+
+
+ 163
+
+
+ view
+ Otras deudas con partes vinculadas
+
+
+
+ 1633
+
+
+ view
+ Otras deudas, empresas del grupo
+
+
+
+ 1633
+
+
+ other
+ Otras deudas, empresas del grupo
+
+
+
+ 1634
+
+
+ view
+ Otras deudas, empresas asociadas
+
+
+
+ 1634
+
+
+ other
+ Otras deudas, empresas asociadas
+
+
+
+ 1635
+
+
+ view
+ Otras deudas, con otras partes vinculadas
+
+
+
+ 1635
+
+
+ other
+ Otras deudas, con otras partes vinculadas
+
+
+
+ 17
+
+
+ view
+ Deudas por préstamos recibidos, empréstitos y otros conceptos
+
+
+
+ 170
+
+
+ view
+ Deudas con entidades de crédito
+
+
+
+ 170
+
+
+ other
+ Deudas con entidades de crédito
+
+
+
+ 171
+
+
+ view
+ Deudas
+
+
+
+ 171
+
+
+ other
+ Deudas
+
+
+
+ 172
+
+
+ view
+ Deudas transformables en subvenciones, donaciones y legados
+
+
+
+ 172
+
+
+ other
+ Deudas transformables en subvenciones, donaciones y legados
+
+
+
+ 173
+
+
+ view
+ Proveedores de inmovilizado
+
+
+
+ 173
+
+
+ other
+ Proveedores de inmovilizado
+
+
+
+ 174
+
+
+ view
+ Acreedores por arrendamiento financiero
+
+
+
+ 174
+
+
+ other
+ Acreedores por arrendamiento financiero
+
+
+
+ 175
+
+
+ view
+ Efectos a pagar
+
+
+
+ 175
+
+
+ other
+ Efectos a pagar
+
+
+
+ 176
+
+
+ view
+ Pasivos por derivados financieros
+
+
+
+ 176
+
+
+ other
+ Pasivos por derivados financieros
+
+
+
+ 177
+
+
+ view
+ Obligaciones y bonos
+
+
+
+ 177
+
+
+ other
+ Obligaciones y bonos
+
+
+
+ 179
+
+
+ view
+ Deudas representadas en otros valores negociables
+
+
+
+ 179
+
+
+ other
+ Deudas representadas en otros valores negociables
+
+
+
+ 18
+
+
+ view
+ Pasivos por fianzas, garantías y otros conceptos
+
+
+
+ 180
+
+
+ view
+ Fianzas recibidas
+
+
+
+ 180
+
+
+ other
+ Fianzas recibidas
+
+
+
+ 181
+
+
+ view
+ Anticipos recibidos por ventas o prestaciones de servicios
+
+
+
+ 181
+
+
+ other
+ Anticipos recibidos por ventas o prestaciones de servicios
+
+
+
+ 185
+
+
+ view
+ Depósitos recibidos
+
+
+
+ 185
+
+
+ other
+ Depósitos recibidos
+
+
+
+ 19
+
+
+ view
+ Situaciones transitorias de financiación
+
+
+
+ 190
+
+
+ view
+ Acciones o participaciones emitidas
+
+
+
+ 190
+
+
+ other
+ Acciones o participaciones emitidas
+
+
+
+ 192
+
+
+ view
+ Suscriptores de acciones
+
+
+
+ 192
+
+
+ other
+ Suscriptores de acciones
+
+
+
+ 194
+
+
+ view
+ Capital emitido pendiente de inscripción
+
+
+
+ 194
+
+
+ other
+ Capital emitido pendiente de inscripción
+
+
+
+ 195
+
+
+ view
+ Acciones o participaciones emitidas consideradas como pasivos financieros
+
+
+
+ 195
+
+
+ other
+ Acciones o participaciones emitidas consideradas como pasivos financieros
+
+
+
+ 197
+
+
+ view
+ Suscriptores de acciones consideradas como pasivos financieros
+
+
+
+ 197
+
+
+ other
+ Suscriptores de acciones consideradas como pasivos financieros
+
+
+
+ 199
+
+
+ view
+ Acciones o participaciones emitidas consideradas como pasivos financieros pendientes de inscripción
+
+
+
+ 199
+
+
+ other
+ Acciones o participaciones emitidas consideradas como pasivos financieros pendientes de inscripción
+
+
+
+ 2
+
+
+ view
+ Activo no corriente
+
+
+
+ 20
+
+
+ view
+ Inmovilizaciones intangibles
+
+
+
+ 200
+
+
+ view
+ Investigación
+
+
+
+ 200
+
+
+ other
+ Investigación
+
+
+
+ 201
+
+
+ view
+ Desarrollo
+
+
+
+ 201
+
+
+ other
+ Desarrollo
+
+
+
+ 202
+
+
+ view
+ Concesiones administrativas
+
+
+
+ 202
+
+
+ other
+ Concesiones administrativas
+
+
+
+ 203
+
+
+ view
+ Propiedad industrial
+
+
+
+ 203
+
+
+ other
+ Propiedad industrial
+
+
+
+ 205
+
+
+ view
+ Derechos de traspaso
+
+
+
+ 205
+
+
+ other
+ Derechos de traspaso
+
+
+
+ 206
+
+
+ view
+ Aplicaciones informáticas
+
+
+
+ 206
+
+
+ other
+ Aplicaciones informáticas
+
+
+
+ 207
+
+
+ view
+ Derechos sobre activos cedidos en uso
+
+
+
+ 207
+
+
+ other
+ Derechos sobre activos cedidos en uso
+
+
+
+ 209
+
+
+ view
+ Anticipos para inmovilizaciones intangibles
+
+
+
+ 209
+
+
+ other
+ Anticipos para inmovilizaciones intangibles
+
+
+
+ 21
+
+
+ view
+ Inmovilizaciones materiales
+
+
+
+ 210
+
+
+ view
+ Terrenos y bienes naturales
+
+
+
+ 210
+
+
+ other
+ Terrenos y bienes naturales
+
+
+
+ 211
+
+
+ view
+ Construcciones
+
+
+
+ 211
+
+
+ other
+ Construcciones
+
+
+
+ 212
+
+
+ view
+ Instalaciones técnicas
+
+
+
+ 212
+
+
+ other
+ Instalaciones técnicas
+
+
+
+ 213
+
+
+ view
+ Maquinaria
+
+
+
+ 213
+
+
+ other
+ Maquinaria
+
+
+
+ 214
+
+
+ view
+ Utillaje
+
+
+
+ 214
+
+
+ other
+ Utillaje
+
+
+
+ 215
+
+
+ view
+ Otras instalaciones
+
+
+
+ 215
+
+
+ other
+ Otras instalaciones
+
+
+
+ 216
+
+
+ view
+ Mobiliario
+
+
+
+ 216
+
+
+ other
+ Mobiliario
+
+
+
+ 217
+
+
+ view
+ Equipos para proceso de información
+
+
+
+ 217
+
+
+ other
+ Equipos para proceso de información
+
+
+
+ 218
+
+
+ view
+ Elementos de transporte
+
+
+
+ 218
+
+
+ other
+ Elementos de transporte
+
+
+
+ 219
+
+
+ view
+ Otro inmovilizado material
+
+
+
+ 219
+
+
+ other
+ Otro inmovilizado material
+
+
+
+ 22
+
+
+ view
+ Inversiones inmobiliarias
+
+
+
+ 220
+
+
+ view
+ Inversiones en terrenos y bienes naturales
+
+
+
+ 220
+
+
+ other
+ Inversiones en terrenos y bienes naturales
+
+
+
+ 221
+
+
+ view
+ Inversiones en construcciones
+
+
+
+ 221
+
+
+ other
+ Inversiones en construcciones
+
+
+
+ 23
+
+
+ view
+ Inmovilizaciones materiales en curso
+
+
+
+ 230
+
+
+ view
+ Adaptación de terrenos y bienes naturales
+
+
+
+ 230
+
+
+ other
+ Adaptación de terrenos y bienes naturales
+
+
+
+ 231
+
+
+ view
+ Construcciones en curso
+
+
+
+ 231
+
+
+ other
+ Construcciones en curso
+
+
+
+ 232
+
+
+ view
+ Instalaciones técnicas en montaje
+
+
+
+ 232
+
+
+ other
+ Instalaciones técnicas en montaje
+
+
+
+ 233
+
+
+ view
+ Maquinaria en montaje
+
+
+
+ 233
+
+
+ other
+ Maquinaria en montaje
+
+
+
+ 237
+
+
+ view
+ Equipos para procesos de información en montaje
+
+
+
+ 237
+
+
+ other
+ Equipos para procesos de información en montaje
+
+
+
+ 239
+
+
+ view
+ Anticipos para inmovilizaciones materiales
+
+
+
+ 239
+
+
+ other
+ Anticipos para inmovilizaciones materiales
+
+
+
+ 24
+
+
+ view
+ Bienes del patrimonio histórico
+
+
+
+ 240
+
+
+ view
+ Bienes inmuebles
+
+
+
+ 2400
+
+
+ view
+ Monumentos
+
+
+
+ 2400
+
+
+ other
+ Monumentos
+
+
+
+
+ 2401
+
+
+ view
+ Jardines históricos
+
+
+
+ 2401
+
+
+ other
+ Jardines históricos
+
+
+
+
+ 2402
+
+
+ view
+ Conjuntos históricos
+
+
+
+ 2402
+
+
+ other
+ Conjuntos históricos
+
+
+
+
+ 2403
+
+
+ view
+ Sitios históricos
+
+
+
+ 2403
+
+
+ other
+ Sitios históricos
+
+
+
+ 2404
+
+
+ view
+ Zonas arqueológicas
+
+
+
+ 2404
+
+
+ other
+ Zonas arqueológicas
+
+
+
+ 2405
+
+
+ view
+ Participaciones en otras partes vinculadas
+
+
+
+ 2405
+
+
+ other
+ Participaciones en otras partes vinculadas
+
+
+
+ 241
+
+
+ view
+ Archivos
+
+
+
+ 2413
+
+
+ view
+ Valores representativos de deuda de empresas del grupo
+
+
+
+ 2413
+
+
+ other
+ Valores representativos de deuda de empresas del grupo
+
+
+
+ 2414
+
+
+ view
+ Valores representativos de deuda de empresas asociadas
+
+
+
+ 2414
+
+
+ other
+ Valores representativos de deuda de empresas asociadas
+
+
+
+ 2415
+
+
+ view
+ Valores representativos de deuda de otras partes vinculadas
+
+
+
+ 2415
+
+
+ other
+ Valores representativos de deuda de otras partes vinculadas
+
+
+
+ 242
+
+
+ view
+ Bibliotecas
+
+
+
+ 2423
+
+
+ view
+ Créditos a empresas del grupo
+
+
+
+ 2423
+
+
+ other
+ Créditos a empresas del grupo
+
+
+
+ 2424
+
+
+ view
+ Créditos a empresas asociadas
+
+
+
+ 2424
+
+
+ other
+ Créditos a empresas asociadas
+
+
+
+ 2425
+
+
+ view
+ Créditos a otras partes vinculadas
+
+
+
+ 2425
+
+
+ other
+ Créditos a otras partes vinculadas
+
+
+
+
+ 243
+
+
+ view
+ Museos
+
+
+
+
+ 243
+
+
+ other
+ Museos
+
+
+
+
+ 244
+
+
+ view
+ Bienes muebles
+
+
+
+
+ 244
+
+
+ other
+ Bienes muebles
+
+
+
+
+
+ 249
+
+
+ view
+ Anticipos sobre bienes del Patrimonio Histórico
+
+
+
+
+ 2490
+
+
+ view
+ Anticipos sobre bienes inmuebles del Patrimonio Histórico
+
+
+
+ 2490
+
+
+ other
+ Anticipos sobre bienes inmuebles del Patrimonio Histórico
+
+
+
+
+ 2491
+
+
+ view
+ Anticipos sobre archivos del Patrimonio Histórico
+
+
+
+ 2491
+
+
+ other
+ Anticipos sobre archivos del Patrimonio Histórico
+
+
+
+
+ 2492
+
+
+ view
+ Anticipos sobre bibliotecas del Patrimonio Histórico
+
+
+
+ 2492
+
+
+ other
+ Anticipos sobre bibliotecas del Patrimonio Histórico
+
+
+
+
+
+ 2493
+
+
+ view
+ Anticipos sobre museos del Patrimonio Histórico
+
+
+
+ 2493
+
+
+ other
+ Anticipos sobre museos del Patrimonio Histórico
+
+
+
+
+ 2494
+
+
+ view
+ Anticipos sobre bienes muebles del Patrimonio Histórico
+
+
+
+ 2494
+
+
+ other
+ Anticipos sobre bienes muebles del Patrimonio Histórico
+
+
+
+ 2495
+
+
+ view
+ Desembolsos pendientes sobre participaciones en otras partes vinculadas
+
+
+
+ 2495
+
+
+ other
+ Desembolsos pendientes sobre participaciones en otras partes vinculadas
+
+
+
+ 25
+
+
+ view
+ Otras inversiones financieras
+
+
+
+ 250
+
+
+ view
+ Inversiones financieras en instrumentos de patrimonio
+
+
+
+ 250
+
+
+ other
+ Inversiones financieras en instrumentos de patrimonio
+
+
+
+ 251
+
+
+ view
+ Valores representativos de deuda
+
+
+
+ 251
+
+
+ other
+ Valores representativos de deuda
+
+
+
+ 252
+
+
+ view
+ Créditos
+
+
+
+ 252
+
+
+ other
+ Créditos
+
+
+
+ 253
+
+
+ view
+ Créditos por enajenación de inmovilizado
+
+
+
+ 253
+
+
+ other
+ Créditos por enajenación de inmovilizado
+
+
+
+ 254
+
+
+ view
+ Créditos al personal
+
+
+
+ 254
+
+
+ other
+ Créditos al personal
+
+
+
+ 255
+
+
+ view
+ Activos por derivados financieros
+
+
+
+ 255
+
+
+ other
+ Activos por derivados financieros
+
+
+
+ 258
+
+
+ view
+ Imposiciones
+
+
+
+ 258
+
+
+ other
+ Imposiciones
+
+
+
+ 259
+
+
+ view
+ Desembolsos pendientes sobre participaciones en el patrimonio neto
+
+
+
+ 259
+
+
+ other
+ Desembolsos pendientes sobre participaciones en el patrimonio neto
+
+
+
+ 26
+
+
+ view
+ Fianzas y depósitos constituidos
+
+
+
+ 260
+
+
+ view
+ Fianzas constituidas
+
+
+
+ 260
+
+
+ other
+ Fianzas constituidas
+
+
+
+ 265
+
+
+ view
+ Depósitos constituidos
+
+
+
+ 265
+
+
+ other
+ Depósitos constituidos
+
+
+
+ 28
+
+
+ view
+ Amortización acumulada del inmovilizado y otras cuentas correctoras
+
+
+
+ 280
+
+
+ view
+ Amortización acumulada del inmovilizado intangible
+
+
+
+
+ 2800
+
+
+ view
+ Amortización acumulada de investigación
+
+
+
+ 2800
+
+
+ other
+ Amortización acumulada de investigación
+
+
+
+
+
+ 2801
+
+
+ view
+ Amortización acumulada de desarrollo
+
+
+
+ 2801
+
+
+ other
+ Amortización acumulada de desarrollo
+
+
+
+ 2802
+
+
+ view
+ Amortización acumulada de concesiones administrativas
+
+
+
+ 2802
+
+
+ other
+ Amortización acumulada de concesiones administrativas
+
+
+
+ 2803
+
+
+ view
+ Amortización acumulada de propiedad industrial
+
+
+
+ 2803
+
+
+ other
+ Amortización acumulada de propiedad industrial
+
+
+
+ 2805
+
+
+ view
+ Amortización acumulada de derechos de traspaso
+
+
+
+ 2805
+
+
+ other
+ Amortización acumulada de derechos de traspaso
+
+
+
+
+ 2806
+
+
+ view
+ Amortización acumulada de aplicaciones informáticas
+
+
+
+ 2806
+
+
+ other
+ Amortización acumulada de aplicaciones informáticas
+
+
+
+
+ 2807
+
+
+ view
+ Amortización acumulada de derechos sobre activos cedidos en uso
+
+
+
+ 2807
+
+
+ other
+ Amortización acumulada de derechos sobre activos cedidos en uso
+
+
+
+
+
+
+ 281
+
+
+ view
+ Amortización acumulada del inmovilizado material
+
+
+
+ 2811
+
+
+ view
+ Amortización acumulada de construcciones
+
+
+
+ 2811
+
+
+ other
+ Amortización acumulada de construcciones
+
+
+
+ 2812
+
+
+ view
+ Amortización acumulada de instalaciones técnicas
+
+
+
+ 2812
+
+
+ other
+ Amortización acumulada de instalaciones técnicas
+
+
+
+ 2813
+
+
+ view
+ Amortización acumulada de maquinaria
+
+
+
+ 2813
+
+
+ other
+ Amortización acumulada de maquinaria
+
+
+
+ 2814
+
+
+ view
+ Amortización acumulada de utillaje
+
+
+
+ 2814
+
+
+ other
+ Amortización acumulada de utillaje
+
+
+
+ 2815
+
+
+ view
+ Amortización acumulada de otras instaciones
+
+
+
+ 2815
+
+
+ other
+ Amortización acumulada de otras instaciones
+
+
+
+ 2816
+
+
+ view
+ Amortización acumulada de mobiliario
+
+
+
+ 2816
+
+
+ other
+ Amortización acumulada de mobiliario
+
+
+
+ 2817
+
+
+ view
+ Amortización acumulada de equipos para proceso de información
+
+
+
+ 2817
+
+
+ other
+ Amortización acumulada de equipos para proceso de información
+
+
+
+ 2818
+
+
+ view
+ Amortización acumulada de elementos de transporte
+
+
+
+ 2818
+
+
+ other
+ Amortización acumulada de elementos de transporte
+
+
+
+ 2819
+
+
+ view
+ Amortización acumulada de otro inmovilizado material
+
+
+
+ 2819
+
+
+ other
+ Amortización acumulada de otro inmovilizado material
+
+
+
+ 282
+
+
+ view
+ Amortización acumulada de las inversiones inmobiliarias
+
+
+
+ 282
+
+
+ other
+ Amortización acumulada de las inversiones inmobiliarias
+
+
+
+
+ 283
+
+
+ view
+ Cesiones de uso sin contraprestación
+
+
+
+ 2830
+
+
+ view
+ Cesiones de uso del inmovilizado intangible
+
+
+
+ 2830
+
+
+ other
+ Cesiones de uso del inmovilizado intangible
+
+
+
+
+
+ 2831
+
+
+ view
+ Cesiones de uso del inmovilizado material
+
+
+
+ 2831
+
+
+ other
+ Cesiones de uso del inmovilizado material
+
+
+
+
+
+ 2832
+
+
+ view
+ Cesiones de uso de las inversiones inmobiliarias
+
+
+
+
+
+ 2832
+
+
+ other
+ Cesiones de uso de las inversiones inmobiliarias
+
+
+
+
+
+ 29
+
+
+ view
+ Deterioro de valor de activos no corrientes
+
+
+
+ 290
+
+
+ view
+ Deterioro de valor del inmovilizado intangible
+
+
+
+ 2900
+
+
+ view
+ Deterioro del valor de investigación
+
+
+
+ 2900
+
+
+ other
+ Deterioro del valor de investigación
+
+
+
+ 2901
+
+
+ view
+ Deterioro del valor de desarrollo
+
+
+
+ 2901
+
+
+ other
+ Deterioro del valor de desarrollo
+
+
+
+ 2902
+
+
+ view
+ Deterioro del valor de concesiones administrativas
+
+
+
+ 2902
+
+
+ other
+ Deterioro del valor de concesiones administrativas
+
+
+
+ 2903
+
+
+ view
+ Deterioro del valor de propiedad industrial
+
+
+
+ 2903
+
+
+ other
+ Deterioro del valor de propiedad industrial
+
+
+
+ 2905
+
+
+ view
+ Deterioro del valor de derechos de traspaso
+
+
+
+ 2905
+
+
+ other
+ Deterioro del valor de derechos de traspaso
+
+
+
+ 2906
+
+
+ view
+ Deterioro del valor de aplicaciones informáticas
+
+
+
+ 2906
+
+
+ other
+ Deterioro del valor de aplicaciones informáticas
+
+
+
+
+ 2907
+
+
+ view
+ Deterioro del valor sobre activos cedidos en uso
+
+
+
+ 2907
+
+
+ other
+ Deterioro del valor sobre activos cedidos en uso
+
+
+
+
+
+
+
+ 291
+
+
+ view
+ Deterioro del valor del inmovilizado material
+
+
+
+ 2910
+
+
+ view
+ Deterioro de valor de terrenos y bienes naturales
+
+
+
+ 2910
+
+
+ other
+ Deterioro de valor de terrenos y bienes naturales
+
+
+
+ 2911
+
+
+ view
+ Deterioro de valor de construcciones
+
+
+
+ 2911
+
+
+ other
+ Deterioro de valor de construcciones
+
+
+
+ 2912
+
+
+ view
+ Deterioro de valor de instalaciones técnicas
+
+
+
+ 2912
+
+
+ other
+ Deterioro de valor de instalaciones técnicas
+
+
+
+ 2913
+
+
+ view
+ Deterioro de valor de maquinaria
+
+
+
+ 2913
+
+
+ other
+ Deterioro de valor de maquinaria
+
+
+
+ 2914
+
+
+ view
+ Deterioro de valor de utillaje
+
+
+
+ 2914
+
+
+ other
+ Deterioro de valor de utillaje
+
+
+
+ 2915
+
+
+ view
+ Deterioro de valor de otras instaciones
+
+
+
+ 2915
+
+
+ other
+ Deterioro de valor de otras instaciones
+
+
+
+ 2916
+
+
+ view
+ Deterioro de valor de mobiliario
+
+
+
+ 2916
+
+
+ other
+ Deterioro de valor de mobiliario
+
+
+
+ 2917
+
+
+ view
+ Deterioro de valor de equipos para proceso de información
+
+
+
+ 2917
+
+
+ other
+ Deterioro de valor de equipos para proceso de información
+
+
+
+ 2918
+
+
+ view
+ Deterioro de valor de elementos de transporte
+
+
+
+ 2918
+
+
+ other
+ Deterioro de valor de elementos de transporte
+
+
+
+ 2919
+
+
+ view
+ Deterioro de valor de otro inmovilizado material
+
+
+
+ 2919
+
+
+ other
+ Deterioro de valor de otro inmovilizado material
+
+
+
+ 292
+
+
+ view
+ Deterioro de valor de las inversiones inmobiliarias
+
+
+
+ 2920
+
+
+ view
+ Deterioro de valor de los terrenos y bienes naturales
+
+
+
+ 2920
+
+
+ other
+ Deterioro de valor de los terrenos y bienes naturales
+
+
+
+ 2921
+
+
+ view
+ Deterioro de valor de construcciones
+
+
+
+ 2921
+
+
+ other
+ Deterioro de valor de construcciones
+
+
+
+ 293
+
+
+ view
+ Deterioro de valor de participaciones en partes vinculadas
+
+
+
+ 2933
+
+
+ view
+ Deterioro de valor de participaciones en empresas del grupo
+
+
+
+ 2933
+
+
+ other
+ Deterioro de valor de participaciones en empresas del grupo
+
+
+
+ 2934
+
+
+ view
+ Deterioro de valor de participaciones en empresas asociadas
+
+
+
+ 2934
+
+
+ other
+ Deterioro de valor de participaciones en empresas asociadas
+
+
+
+ 2935
+
+
+ view
+ Deterioro de valor de participaciones a largo plazo en otras partes vinculadas
+
+
+
+ 2935
+
+
+ other
+ Deterioro de valor de participaciones a largo plazo en otras partes vinculadas
+
+
+
+ 294
+
+
+ view
+ Deterioro de valor de valores representativos de deuda de partes vinculadas
+
+
+
+ 2943
+
+
+ view
+ Deterioro de valor de valores representativos de deuda de empresas del grupo
+
+
+
+ 2943
+
+
+ other
+ Deterioro de valor de valores representativos de deuda de empresas del grupo
+
+
+
+ 2944
+
+
+ view
+ Deterioro de valor de valores representativos de deuda de empresas asociadas
+
+
+
+ 2944
+
+
+ other
+ Deterioro de valor de valores representativos de deuda de empresas asociadas
+
+
+
+ 2945
+
+
+ view
+ Deterioro de valor de valores representativos de deuda de otras partes vinculadas
+
+
+
+ 2945
+
+
+ other
+ Deterioro de valor de valores representativos de deuda de otras partes vinculadas
+
+
+
+ 295
+
+
+ view
+ Deterioro de valor de créditos a partes vinculadas
+
+
+
+ 2953
+
+
+ view
+ Deterioro de valor de créditos a empresas del grupo
+
+
+
+ 2953
+
+
+ other
+ Deterioro de valor de créditos a empresas del grupo
+
+
+
+ 2954
+
+
+ view
+ Deterioro de valor de créditos a empresas asociadas
+
+
+
+ 2954
+
+
+ other
+ Deterioro de valor de créditos a empresas asociadas
+
+
+
+ 2955
+
+
+ view
+ Deterioro de valor de créditos a otras partes vinculadas
+
+
+
+ 2955
+
+
+ other
+ Deterioro de valor de créditos a otras partes vinculadas
+
+
+
+ 296
+
+
+ view
+ Deterioro de valor de participaciones en el patrimonio neto a largo plazo
+
+
+
+ 296
+
+
+ other
+ Deterioro de valor de participaciones en el patrimonio neto a largo plazo
+
+
+
+ 297
+
+
+ view
+ Deterioro de valor de valores representativos de deuda
+
+
+
+ 297
+
+
+ other
+ Deterioro de valor de valores representativos de deuda
+
+
+
+
+ 298
+
+
+ view
+ Deterioro de valor de créditos
+
+
+
+ 298
+
+
+ other
+ Deterioro de valor de créditos
+
+
+
+
+ 299
+
+
+ view
+ Deterioro de valor de bienes del Patrimonio Histórico
+
+
+
+ 299
+
+
+ other
+ Deterioro de valor de bienes del Patrimonio Histórico
+
+
+
+
+ 2990
+
+
+ view
+ Deterioro de valor de bienes inmuebles
+
+
+
+
+ 2991
+
+
+ view
+ Deterioro de valor de archivos
+
+
+
+ 2991
+
+
+ other
+ Deterioro de valor de archivos
+
+
+
+
+
+ 2992
+
+
+ view
+ Deterioro de valor de bibliotecas
+
+
+
+ 2992
+
+
+ other
+ Deterioro de valor de bibliotecas
+
+
+
+
+ 2993
+
+
+ view
+ Deterioro de valor de Museos
+
+
+
+ 2993
+
+
+ other
+ Deterioro de valor de Museos
+
+
+
+
+
+ 2994
+
+
+ view
+ Deterioro de valor de bienes muebles
+
+
+
+ 2994
+
+
+ other
+ Deterioro de valor de bienes muebles
+
+
+
+
+
+ 3
+
+
+ view
+ Existencias
+
+
+
+ 30
+
+
+ view
+ Bienes destinados a la actividad
+
+
+
+ 300
+
+
+ view
+ Mercaderías A
+
+
+
+ 300
+
+
+ other
+ Mercaderías A
+
+
+
+ 301
+
+
+ view
+ Mercaderías B
+
+
+
+ 301
+
+
+ other
+ Mercaderías B
+
+
+
+ 31
+
+
+ view
+ Materias Primas
+
+
+
+ 310
+
+
+ view
+ Materias Primas A
+
+
+
+ 310
+
+
+ other
+ Materias Primas A
+
+
+
+ 311
+
+
+ view
+ Materias Primas B
+
+
+
+ 311
+
+
+ other
+ Materias Primas B
+
+
+
+ 32
+
+
+ view
+ Otros aprovisionamientos
+
+
+
+ 320
+
+
+ view
+ Elementos y conjuntos incorporables
+
+
+
+ 320
+
+
+ other
+ Elementos y conjuntos incorporables
+
+
+
+ 321
+
+
+ view
+ Combustibles
+
+
+
+ 321
+
+
+ other
+ Combustibles
+
+
+
+ 322
+
+
+ view
+ Repuestos
+
+
+
+ 322
+
+
+ other
+ Repuestos
+
+
+
+ 325
+
+
+ view
+ Materiales diversos
+
+
+
+ 325
+
+
+ other
+ Materiales diversos
+
+
+
+ 326
+
+
+ view
+ Embalajes
+
+
+
+ 326
+
+
+ other
+ Embalajes
+
+
+
+ 327
+
+
+ view
+ Envases
+
+
+
+ 327
+
+
+ other
+ Envases
+
+
+
+ 328
+
+
+ view
+ Material de oficina
+
+
+
+ 328
+
+
+ other
+ Material de oficina
+
+
+
+ 33
+
+
+ view
+ Productos en curso
+
+
+
+ 330
+
+
+ view
+ Productos en curso A
+
+
+
+ 330
+
+
+ other
+ Productos en curso A
+
+
+
+ 331
+
+
+ view
+ Productos en curso B
+
+
+
+ 331
+
+
+ other
+ Productos en curso B
+
+
+
+ 34
+
+
+ view
+ Productos semiterminados
+
+
+
+ 340
+
+
+ view
+ Productos semiterminados A
+
+
+
+ 340
+
+
+ other
+ Productos semiterminados A
+
+
+
+ 341
+
+
+ view
+ Productos semiterminados B
+
+
+
+ 341
+
+
+ other
+ Productos semiterminados B
+
+
+
+ 35
+
+
+ view
+ Productos terminados
+
+
+
+ 350
+
+
+ view
+ Productos terminados A
+
+
+
+ 350
+
+
+ other
+ Productos terminados A
+
+
+
+ 351
+
+
+ view
+ Productos terminados B
+
+
+
+ 351
+
+
+ other
+ Productos terminados B
+
+
+
+ 36
+
+
+ view
+ Subproductos, residuos y materiales recuperados
+
+
+
+ 360
+
+
+ view
+ Subproductos A
+
+
+
+ 360
+
+
+ other
+ Subproductos A
+
+
+
+ 361
+
+
+ view
+ Subproductos B
+
+
+
+ 361
+
+
+ other
+ Subproductos B
+
+
+
+ 365
+
+
+ view
+ Residuos A
+
+
+
+ 365
+
+
+ other
+ Residuos A
+
+
+
+ 366
+
+
+ view
+ Residuos B
+
+
+
+ 366
+
+
+ other
+ Residuos B
+
+
+
+ 368
+
+
+ view
+ Materiales recuperados A
+
+
+
+ 368
+
+
+ other
+ Materiales recuperados A
+
+
+
+ 369
+
+
+ view
+ Materiales recuperados B
+
+
+
+ 369
+
+
+ other
+ Materiales recuperados B
+
+
+
+ 39
+
+
+ view
+ Deterioro de valor de las existencias
+
+
+
+ 390
+
+
+ view
+ Deterioro de valor de bienes destinados a la actividad
+
+
+
+ 390
+
+
+ other
+ Deterioro de valor de bienes destinados a la actividad
+
+
+
+ 391
+
+
+ view
+ Deterioro de valor de las materias primas
+
+
+
+ 391
+
+
+ other
+ Deterioro de valor de las materias primas
+
+
+
+ 392
+
+
+ view
+ Deterioro de valor de otros aprovisionamientos
+
+
+
+ 392
+
+
+ other
+ Deterioro de valor de otros aprovisionamientos
+
+
+
+ 393
+
+
+ view
+ Deterioro de valor de los productos en curso
+
+
+
+ 393
+
+
+ other
+ Deterioro de valor de los productos en curso
+
+
+
+ 394
+
+
+ view
+ Deterioro de valor de los productos semiterminados
+
+
+
+ 394
+
+
+ other
+ Deterioro de valor de los productos semiterminados
+
+
+
+ 395
+
+
+ view
+ Deterioro de valor de los productos terminados
+
+
+
+ 395
+
+
+ other
+ Deterioro de valor de los productos terminados
+
+
+
+ 396
+
+
+ view
+ Deterioro de valor de los subproductos, residuos y materiales recuperados
+
+
+
+ 396
+
+
+ other
+ Deterioro de valor de los subproductos, residuos y materiales recuperados
+
+
+
+ 4
+
+
+ view
+ Acreedores y deudores por operaciones de la actividad
+
+
+
+ 40
+
+
+ view
+ Proveedores
+
+
+
+ 400
+
+
+ view
+ Proveedores
+
+
+
+ 4000
+
+
+ view
+ Proveedores (euros)
+
+
+
+ 4000
+
+
+ payable
+ Proveedores (euros)
+
+
+
+ 4004
+
+
+ view
+ Proveedores (moneda extranjera)
+
+
+
+ 4004
+
+
+ payable
+ Proveedores (moneda extranjera)
+
+
+
+ 4009
+
+
+ view
+ Proveedores, facturas pendientes de recibir o de formalizar
+
+
+
+ 4009
+
+
+ payable
+ Proveedores, facturas pendientes de recibir o de formalizar
+
+
+
+ 401
+
+
+ view
+ Proveedores, efectos comerciales a pagar
+
+
+
+ 401
+
+
+ other
+ Proveedores, efectos comerciales a pagar
+
+
+
+ 403
+
+
+ view
+ Proveedores, empresas del grupo
+
+
+
+ 4030
+
+
+ view
+ Proveedores, empresas del grupo (euros)
+
+
+
+ 4030
+
+
+ payable
+ Proveedores, empresas del grupo (euros)
+
+
+
+ 4031
+
+
+ view
+ Efectos comerciales a pagar, empresas del grupo
+
+
+
+ 4031
+
+
+ payable
+ Efectos comerciales a pagar, empresas del grupo
+
+
+
+ 4034
+
+
+ view
+ Proveedores, empresas del grupo (moneda extranjera)
+
+
+
+ 4034
+
+
+ payable
+ Proveedores, empresas del grupo (moneda extranjera)
+
+
+
+ 4036
+
+
+ view
+ Envases y embalajes a devolver a proveedores, empresas del grupo
+
+
+
+ 4036
+
+
+ payable
+ Envases y embalajes a devolver a proveedores, empresas del grupo
+
+
+
+ 4039
+
+
+ view
+ Proveedores, empresas del grupo, facturas pendientes de recibir o de formalizar
+
+
+
+ 4039
+
+
+ payable
+ Proveedores, empresas del grupo, facturas pendientes de recibir o de formalizar
+
+
+
+ 404
+
+
+ view
+ Proveedores, empresas asociadas
+
+
+
+ 404
+
+
+ other
+ Proveedores, empresas asociadas
+
+
+
+ 405
+
+
+ view
+ Proveedores, otras partes vinculadas
+
+
+
+ 405
+
+
+ other
+ Proveedores, otras partes vinculadas
+
+
+
+ 406
+
+
+ view
+ Envases y embalajes a devolver a proveedores
+
+
+
+ 406
+
+
+ other
+ Envases y embalajes a devolver a proveedores
+
+
+
+ 407
+
+
+ view
+ Anticipos a proveedores
+
+
+
+ 407
+
+
+ other
+ Anticipos a proveedores
+
+
+
+ 41
+
+
+ view
+ Benerificiarios y acreedores varios
+
+
+
+ 410
+
+
+ view
+ Acreedores por prestaciones de servicios
+
+
+
+ 4100
+
+
+ view
+ Acreedores por prestaciones de servicios (euros)
+
+
+
+ 4100
+
+
+ payable
+ Acreedores por prestaciones de servicios (euros)
+
+
+
+ 4104
+
+
+ view
+ Acreedores por prestaciones de servicios (moneda extranjera)
+
+
+
+ 4104
+
+
+ payable
+ Acreedores por prestaciones de servicios (moneda extranjera)
+
+
+
+ 4109
+
+
+ view
+ Acreedores por prestaciones de servicios, facturas pendientes de recibir o de formalizar
+
+
+
+ 4109
+
+
+ payable
+ Acreedores por prestaciones de servicios, facturas pendientes de recibir o de formalizar
+
+
+
+ 411
+
+
+ view
+ Acreedores, efectos comerciales a pagar
+
+
+
+ 411
+
+
+ other
+ Acreedores, efectos comerciales a pagar
+
+
+
+ 412
+
+
+ view
+ Beneficiarios, acreedores
+
+
+
+ 412
+
+
+ other
+ Beneficiarios, acreedores
+
+
+
+
+
+
+
+
+ 419
+
+
+ view
+ Acreedores por operaciones en común
+
+
+
+ 419
+
+
+ other
+ Acreedores por operaciones en común
+
+
+
+ 43
+
+
+ view
+ Clientes
+
+
+
+ 430
+
+
+ view
+ Clientes
+
+
+
+ 4300
+
+
+ view
+ Clientes (euros)
+
+
+
+ 4300
+
+
+ receivable
+ Clientes (euros)
+
+
+
+ 4304
+
+
+ view
+ Clientes (moneda extranjera)
+
+
+
+ 4304
+
+
+ receivable
+ Clientes (moneda extranjera)
+
+
+
+ 4309
+
+
+ view
+ Clientes, facturas pendientes de recibir o de formalizar
+
+
+
+ 4309
+
+
+ receivable
+ Clientes, facturas pendientes de recibir o de formalizar
+
+
+
+ 431
+
+
+ view
+ Clientes, efectos comerciales a cobrar
+
+
+
+ 4310
+
+
+ view
+ Efectos comerciales en cartera
+
+
+
+ 4310
+
+
+ receivable
+ Efectos comerciales en cartera
+
+
+
+ 4311
+
+
+ view
+ Efectos comerciales descontados
+
+
+
+ 4311
+
+
+ receivable
+ Efectos comerciales descontados
+
+
+
+ 4312
+
+
+ view
+ Efectos comerciales en gestión de cobro
+
+
+
+ 4312
+
+
+ receivable
+ Efectos comerciales en gestión de cobro
+
+
+
+ 4315
+
+
+ view
+ Efectos comerciales impagados
+
+
+
+ 4315
+
+
+ receivable
+ Efectos comerciales impagados
+
+
+
+ 432
+
+
+ view
+ Clientes, operaciones de factoring
+
+
+
+ 432
+
+
+ other
+ Clientes, operaciones de factoring
+
+
+
+ 433
+
+
+ view
+ Clientes, empresas del grupo
+
+
+
+ 4330
+
+
+ view
+ Clientes empresas del grupo (euros)
+
+
+
+ 4330
+
+
+ receivable
+ Clientes empresas del grupo (euros)
+
+
+
+ 4331
+
+
+ view
+ Efectos comerciales a cobrar, empresas del grupo
+
+
+
+ 4331
+
+
+ receivable
+ Efectos comerciales a cobrar, empresas del grupo
+
+
+
+ 4332
+
+
+ view
+ Clientes empresas del grupo, operaciones de factoring
+
+
+
+ 4332
+
+
+ receivable
+ Clientes empresas del grupo, operaciones de factoring
+
+
+
+ 4334
+
+
+ view
+ Clientes empresas del grupo (moneda extranjera)
+
+
+
+ 4334
+
+
+ receivable
+ Clientes empresas del grupo (moneda extranjera)
+
+
+
+ 4336
+
+
+ view
+ Clientes empresas del grupo de dudoso cobro
+
+
+
+ 4336
+
+
+ receivable
+ Clientes empresas del grupo de dudoso cobro
+
+
+
+ 4337
+
+
+ view
+ Envases y embalajes a devolver a clientes, empresas del grupo
+
+
+
+ 4337
+
+
+ receivable
+ Envases y embalajes a devolver a clientes, empresas del grupo
+
+
+
+ 4339
+
+
+ view
+ Clientes empresas del grupo, facturas pendientes de formalizar
+
+
+
+ 4339
+
+
+ receivable
+ Clientes empresas del grupo, facturas pendientes de formalizar
+
+
+
+ 434
+
+
+ view
+ Clientes, empresas asociadas
+
+
+
+ 434
+
+
+ other
+ Clientes, empresas asociadas
+
+
+
+ 435
+
+
+ view
+ Clientes, otras partes vinculadas
+
+
+
+ 435
+
+
+ other
+ Clientes, otras partes vinculadas
+
+
+
+ 436
+
+
+ view
+ Clientes de dudoso cobro
+
+
+
+ 436
+
+
+ other
+ Clientes de dudoso cobro
+
+
+
+ 437
+
+
+ view
+ Envases y embalajes a devolver por clientes
+
+
+
+ 437
+
+
+ other
+ Envases y embalajes a devolver por clientes
+
+
+
+ 438
+
+
+ view
+ Anticipos de clientes
+
+
+
+ 438
+
+
+ other
+ Anticipos de clientes
+
+
+
+ 44
+
+
+ view
+ Usuarios y deudores varios
+
+
+
+ 440
+
+
+ view
+ Deudores
+
+
+
+ 4400
+
+
+ view
+ Deudores (euros)
+
+
+
+ 4400
+
+
+ receivable
+ Deudores (euros)
+
+
+
+ 4404
+
+
+ view
+ Deudores (moneda extranjera)
+
+
+
+ 4404
+
+
+ receivable
+ Deudores (moneda extranjera)
+
+
+
+ 4409
+
+
+ view
+ Deudores, facturas pendientes de formalizar
+
+
+
+ 4409
+
+
+ receivable
+ Deudores, facturas pendientes de formalizar
+
+
+
+ 441
+
+
+ view
+ Deudores, efectos comerciales a cobrar
+
+
+
+ 4410
+
+
+ view
+ Deudores, efectos comerciales en cartera
+
+
+
+ 4410
+
+
+ receivable
+ Deudores, efectos comerciales en cartera
+
+
+
+ 4411
+
+
+ view
+ Deudores, efectos comerciales descontados
+
+
+
+ 4411
+
+
+ receivable
+ Deudores, efectos comerciales descontados
+
+
+
+ 4412
+
+
+ view
+ Deudores, efectos comerciales en gestión de cobro
+
+
+
+ 4412
+
+
+ receivable
+ Deudores, efectos comerciales en gestión de cobro
+
+
+
+ 4415
+
+
+ view
+ Deudores, efectos comerciales impagados
+
+
+
+ 4415
+
+
+ receivable
+ Deudores, efectos comerciales impagados
+
+
+
+ 446
+
+
+ view
+ Deudores de dudoso cobro
+
+
+
+ 446
+
+
+ other
+ Deudores de dudoso cobro
+
+
+
+
+ 447
+
+
+ view
+ Usuarios, deudores
+
+
+
+ 447
+
+
+ other
+ Usuarios, deudores
+
+
+
+ 448
+
+
+ view
+ Patrocinadores, afiliados y otros deudores
+
+
+
+ 4480
+
+
+ view
+ Patrocinadores
+
+
+
+ 4480
+
+
+ other
+ Patrocinadores
+
+
+
+ 4482
+
+
+ view
+ Afiliados
+
+
+
+ 4482
+
+
+ other
+ Afiliados
+
+
+
+
+ 4489
+
+
+ view
+ Otros deudores
+
+
+
+ 4489
+
+
+ other
+ Otros deudores
+
+
+
+
+
+ 449
+
+
+ view
+ Deudores por operaciones en común
+
+
+
+ 449
+
+
+ other
+ Deudores por operaciones en común
+
+
+
+ 46
+
+
+ view
+ Personal
+
+
+
+ 460
+
+
+ view
+ Anticipos de remuneraciones
+
+
+
+ 460
+
+
+ other
+ Anticipos de remuneraciones
+
+
+
+
+ 464
+
+
+ view
+ Entregas para gastos a justificar
+
+
+
+ 464
+
+
+ other
+ Entregas para gastos a justificar
+
+
+
+
+
+ 465
+
+
+ view
+ Remuneraciones pendientes de pago
+
+
+
+ 465
+
+
+ other
+ Remuneraciones pendientes de pago
+
+
+
+ 47
+
+
+ view
+ Administraciones públicas
+
+
+
+ 470
+
+
+ view
+ Hacienda Pública, deudora por diversos conceptos
+
+
+
+ 4700
+
+
+ view
+ Hacienda Pública, deudora por IVA
+
+
+
+ 4700
+
+
+ receivable
+ Hacienda Pública, deudora por IVA
+
+
+
+ 4707
+
+
+ view
+ Hacienda Pública, deudora por colaboración en la entrega y distribución de subvenciones (art.12 Ley de Subvenciones)
+
+
+
+ 4707
+
+
+ receivable
+ Hacienda Pública, deudora por colaboración en la entrega y distribución de subvenciones (art.12 Ley de Subvenciones)
+
+
+
+
+
+ 4708
+
+
+ view
+ Hacienda Pública, deudora por subvenciones concedidas
+
+
+
+ 4708
+
+
+ receivable
+ Hacienda Pública, deudora por subvenciones concedidas
+
+
+
+ 4709
+
+
+ view
+ Hacienda Pública, deudora por devolución de impuestos
+
+
+
+ 4709
+
+
+ receivable
+ Hacienda Pública, deudora por devolución de impuestos
+
+
+
+ 471
+
+
+ view
+ Organismos de la Seguridad Social, deudores
+
+
+
+ 471
+
+
+ other
+ Organismos de la Seguridad Social, deudores
+
+
+
+ 472
+
+
+ view
+ Hacienda Pública, IVA soportado
+
+
+
+ 472000
+
+
+ other
+ Hacienda Pública. IVA soportado
+
+
+
+ 473
+
+
+ view
+ Hacienda Pública, retenciones y pagos a cuenta
+
+
+
+ 474
+
+
+ view
+ Activos por impuesto diferido
+
+
+
+ 4740
+
+
+ view
+ Activos por diferencias temporarias deducibles
+
+
+
+ 4740
+
+
+ other
+ Activos por diferencias temporarias deducibles
+
+
+
+ 4742
+
+
+ view
+ Derechos por deducciones y bonificaciones pendientes de aplicar
+
+
+
+ 4742
+
+
+ other
+ Derechos por deducciones y bonificaciones pendientes de aplicar
+
+
+
+ 4745
+
+
+ view
+ Crédito por pérdidas a compensar del ejercicio
+
+
+
+ 4745
+
+
+ other
+ Crédito por pérdidas a compensar del ejercicio
+
+
+
+ 475
+
+
+ view
+ Hacienda Pública, acreedora por conceptos fiscales
+
+
+
+ 4750
+
+
+ view
+ Hacienda Pública, acreedora por IVA
+
+
+
+ 475000
+
+
+ payable
+ Hacienda Pública, acreedora por IVA
+
+
+
+ 4751
+
+
+ view
+ Hacienda Pública, acreedora por retenciones practicadas
+
+
+
+ 4751
+
+
+ payable
+ Hacienda Pública, acreedora por retenciones practicadas
+
+
+
+ 4752
+
+
+ view
+ Hacienda Pública, acreedora por impuesto sobre sociedades
+
+
+
+ 4752
+
+
+ payable
+ Hacienda Pública, acreedora por impuesto sobre sociedades
+
+
+
+
+ 4757
+
+
+ view
+ Hacienda Pública, acreedora por subvenciones recibidas en concepto de entidad colaboradora (art.12 Ley de Subvenciones)
+
+
+
+ 4757
+
+
+ payable
+ Hacienda Pública, acreedora por subvenciones recibidas en concepto de entidad colaboradora (art.12 Ley de Subvencioens)
+
+
+
+
+ 4758
+
+
+ view
+ Hacienda Pública, acreedora por subvenciones a reintegrar
+
+
+
+ 4758
+
+
+ payable
+ Hacienda Pública, acreedora por subvenciones a reintegrar
+
+
+
+ 476
+
+
+ view
+ Organismos de la Seguridad Social, acreedores
+
+
+
+ 476
+
+
+ other
+ Organismos de la Seguridad Social, acreedores
+
+
+
+ 477
+
+
+ view
+ Hacienda Pública, IVA repercutido
+
+
+
+ 477000
+
+
+ other
+ Hacienda Pública. IVA repercutido
+
+
+
+ 479
+
+
+ view
+ Pasivos por diferencias temporarias imponibles
+
+
+
+ 479
+
+
+ other
+ Pasivos por diferencias temporarias imponibles
+
+
+
+ 48
+
+
+ view
+ Ajustes por periodificación
+
+
+
+ 480
+
+
+ view
+ Gastos anticipados
+
+
+
+ 480
+
+
+ other
+ Gastos anticipados
+
+
+
+ 485
+
+
+ view
+ Ingresos anticipados
+
+
+
+ 485
+
+
+ other
+ Ingresos anticipados
+
+
+
+ 49
+
+
+ view
+ Deterioro de valor por operaciones de la actividad y provisiones a corto plazo
+
+
+
+ 490
+
+
+ view
+ Deterioro de valor de créditos por operaciones de la actividad
+
+
+
+ 490
+
+
+ other
+ Deterioro de valor de créditos por operaciones de la actividad
+
+
+
+ 493
+
+
+ view
+ Deterioro de valor de créditos por operaciones comerciales con partes vinculadas
+
+
+
+ 4933
+
+
+ view
+ Deterioro de valor de créditos por operaciones comerciales con empresas del grupo
+
+
+
+ 4933
+
+
+ other
+ Deterioro de valor de créditos por operaciones comerciales con empresas del grupo
+
+
+
+ 4934
+
+
+ view
+ Deterioro de valor de créditos por operaciones comerciales con empresas asociadas
+
+
+
+ 4934
+
+
+ other
+ Deterioro de valor de créditos por operaciones comerciales con empresas asociadas
+
+
+
+ 4935
+
+
+ view
+ Deterioro de valor de créditos por operaciones comerciales con otras partes vinculadas
+
+
+
+ 4935
+
+
+ other
+ Deterioro de valor de créditos por operaciones comerciales con otras partes vinculadas
+
+
+
+ 499
+
+
+ view
+ Provisiones por operaciones comerciales
+
+
+
+ 4994
+
+
+ view
+ Provisión por contratos onerosos
+
+
+
+ 4994
+
+
+ other
+ Provisión por contratos onerosos
+
+
+
+ 4999
+
+
+ view
+ Provisión para otras operaciones comerciales
+
+
+
+ 4999
+
+
+ other
+ Provisión para otras operaciones comerciales
+
+
+
+ 5
+
+
+ view
+ Cuentas financieras
+
+
+
+ 50
+
+
+ view
+ Empréstitos, deudas con características especiales y otras emisiones análogas a corto plazo
+
+
+
+ 500
+
+
+ view
+ Obligaciones y bonos a corto plazo
+
+
+
+ 500
+
+
+ other
+ Obligaciones y bonos a corto plazo
+
+
+
+ 502
+
+
+ view
+ Acciones o participaciones a corto plazo consideradas como pasivos financieros
+
+
+
+ 502
+
+
+ other
+ Acciones o participaciones a corto plazo consideradas como pasivos financieros
+
+
+
+ 505
+
+
+ view
+ Deudas representadas en otros valores negociables a corto plazo
+
+
+
+ 505
+
+
+ other
+ Deudas representadas en otros valores negociables a corto plazo
+
+
+
+ 506
+
+
+ view
+ Intereses a corto plazo de empréstitos y otras emisiones análogas
+
+
+
+ 506
+
+
+ other
+ Intereses a corto plazo de empréstitos y otras emisiones análogas
+
+
+
+ 507
+
+
+ view
+ Dividendos de acciones o participaciones consideradas como pasivos financieros
+
+
+
+ 507
+
+
+ other
+ Dividendos de acciones o participaciones consideradas como pasivos financieros
+
+
+
+ 509
+
+
+ view
+ Valores negociables amortizados
+
+
+
+ 5090
+
+
+ view
+ Obligaciones y bonos amortizados
+
+
+
+ 5090
+
+
+ other
+ Obligaciones y bonos amortizados
+
+
+
+ 5095
+
+
+ view
+ Otros valores negociables amortizados
+
+
+
+ 5095
+
+
+ other
+ Otros valores negociables amortizados
+
+
+
+ 51
+
+
+ view
+ Deudas a corto plazo con partes vinculadas
+
+
+
+ 510
+
+
+ view
+ Deudas a corto plazo con entidades de crédito vinculadas
+
+
+
+ 5103
+
+
+ view
+ Deudas a corto plazo con entidades de crédito, empresas del grupo
+
+
+
+ 5103
+
+
+ other
+ Deudas a corto plazo con entidades de crédito, empresas del grupo
+
+
+
+ 5104
+
+
+ view
+ Deudas a corto plazo con entidades de crédito, empresas asociadas
+
+
+
+ 5104
+
+
+ other
+ Deudas a corto plazo con entidades de crédito, empresas asociadas
+
+
+
+ 5105
+
+
+ view
+ Deudas a corto plazo con otras entidades de crédito vinculadas
+
+
+
+ 5105
+
+
+ other
+ Deudas a corto plazo con otras entidades de crédito vinculadas
+
+
+
+ 511
+
+
+ view
+ Proveedores de inmovilizado a corto plazo, partes vinculadas
+
+
+
+ 5113
+
+
+ view
+ Proveedores de inmovilizado a corto plazo, empresas del grupo
+
+
+
+ 5113
+
+
+ other
+ Proveedores de inmovilizado a corto plazo, empresas del grupo
+
+
+
+ 5114
+
+
+ view
+ Proveedores de inmovilizado a corto plazo, empresas asociadas
+
+
+
+ 5114
+
+
+ other
+ Proveedores de inmovilizado a corto plazo, empresas asociadas
+
+
+
+ 5115
+
+
+ view
+ Proveedores de inmovilizado a corto plazo, otras partes vinculadas
+
+
+
+ 5115
+
+
+ other
+ Proveedores de inmovilizado a corto plazo, otras partes vinculadas
+
+
+
+ 512
+
+
+ view
+ Acreedores por arrendamiento financiero a corto plazo, partes vinculadas
+
+
+
+ 5123
+
+
+ view
+ Acreedores por arrendamiento financiero a corto plazo, empresas del grupo
+
+
+
+ 5123
+
+
+ other
+ Acreedores por arrendamiento financiero a corto plazo, empresas del grupo
+
+
+
+ 5124
+
+
+ view
+ Acreedores por arrendamiento financiero a corto plazo, empresas asociadas
+
+
+
+ 5124
+
+
+ other
+ Acreedores por arrendamiento financiero a corto plazo, empresas asociadas
+
+
+
+ 5125
+
+
+ view
+ Acreedores por arrendamiento financiero a corto plazo, otras partes vinculadas
+
+
+
+ 5125
+
+
+ other
+ Acreedores por arrendamiento financiero a corto plazo, otras partes vinculadas
+
+
+
+ 513
+
+
+ view
+ Otras deudas a corto plazo con partes vinculadas
+
+
+
+ 5133
+
+
+ view
+ Otras deudas a corto plazo con empresas del grupo
+
+
+
+ 5133
+
+
+ other
+ Otras deudas a corto plazo con empresas del grupo
+
+
+
+ 5134
+
+
+ view
+ Otras deudas a corto plazo con empresas asociadas
+
+
+
+ 5134
+
+
+ other
+ Otras deudas a corto plazo con empresas asociadas
+
+
+
+ 5135
+
+
+ view
+ Otras deudas a corto plazo con otras partes vinculadas
+
+
+
+ 5135
+
+
+ other
+ Otras deudas a corto plazo con otras partes vinculadas
+
+
+
+ 514
+
+
+ view
+ Intereses a corto plazo de deudas con partes vinculadas
+
+
+
+ 5143
+
+
+ view
+ Intereses a corto plazo de deudas con empresas del grupo
+
+
+
+ 5143
+
+
+ other
+ Intereses a corto plazo de deudas con empresas del grupo
+
+
+
+ 5144
+
+
+ view
+ Intereses a corto plazo de deudas con empresas asociadas
+
+
+
+ 5144
+
+
+ other
+ Intereses a corto plazo de deudas con empresas asociadas
+
+
+
+ 5145
+
+
+ view
+ Intereses a corto plazo de deudas con otras partes vinculadas
+
+
+
+ 5145
+
+
+ other
+ Intereses a corto plazo de deudas con otras partes vinculadas
+
+
+
+ 52
+
+
+ view
+ Deudas a corto plazo por préstamos recibidos y otros conceptos
+
+
+
+ 520
+
+
+ view
+ Deudas a corto plazo con entidades de crédito
+
+
+
+ 5200
+
+
+ view
+ Préstamos a corto plazo de entidades de crédito
+
+
+
+ 5200
+
+
+ other
+ Préstamos a corto plazo de entidades de crédito
+
+
+
+ 5201
+
+
+ view
+ Deudas a corto plazo por crédito dispuesto
+
+
+
+ 5201
+
+
+ other
+ Deudas a corto plazo por crédito dispuesto
+
+
+
+ 5208
+
+
+ view
+ Deudas por efectos descontados
+
+
+
+ 5208
+
+
+ other
+ Deudas por efectos descontados
+
+
+
+ 5209
+
+
+ view
+ Deudas por operaciones de “factoring”
+
+
+
+ 5209
+
+
+ other
+ Deudas por operaciones de “factoring”
+
+
+
+ 521
+
+
+ view
+ Deudas a corto plazo
+
+
+
+ 521
+
+
+ other
+ Deudas a corto plazo
+
+
+
+ 522
+
+
+ view
+ Deudas a corto plazo transformables en subvenciones, donaciones y legados
+
+
+
+ 522
+
+
+ other
+ Deudas a corto plazo transformables en subvenciones, donaciones y legados
+
+
+
+ 523
+
+
+ view
+ Proveedores de inmovilizado a corto plazo
+
+
+
+ 523
+
+
+ other
+ Proveedores de inmovilizado a corto plazo
+
+
+
+ 524
+
+
+ view
+ Acreedores por arrendamiento financiero a corto plazo
+
+
+
+ 524
+
+
+ other
+ Acreedores por arrendamiento financiero a corto plazo
+
+
+
+ 525
+
+
+ view
+ Efectos a pagar a corto plazo
+
+
+
+ 525
+
+
+ other
+ Efectos a pagar a corto plazo
+
+
+
+ 526
+
+
+ view
+ Dividendo activo a pagar
+
+
+
+ 526
+
+
+ other
+ Dividendo activo a pagar
+
+
+
+ 527
+
+
+ view
+ Intereses a corto plazo de deudas con entidades de crédito
+
+
+
+ 527
+
+
+ other
+ Intereses a corto plazo de deudas con entidades de crédito
+
+
+
+ 528
+
+
+ view
+ Intereses a corto plazo de deudas
+
+
+
+ 528
+
+
+ other
+ Intereses a corto plazo de deudas
+
+
+
+ 529
+
+
+ view
+ Provisiones a corto plazo
+
+
+
+ 5290
+
+
+ view
+ Provisión a corto plazo por retribuciones al personal
+
+
+
+ 5290
+
+
+ other
+ Provisión a corto plazo por retribuciones al personal
+
+
+
+ 5291
+
+
+ view
+ Provisión a corto plazo para impuestos
+
+
+
+ 5291
+
+
+ other
+ Provisión a corto plazo para impuestos
+
+
+
+ 5292
+
+
+ view
+ Provisión a corto plazo para otras responsabilidades
+
+
+
+ 5292
+
+
+ other
+ Provisión a corto plazo para otras responsabilidades
+
+
+
+ 5293
+
+
+ view
+ Provisión a corto plazo por desmantelamiento, retiro o rehabilitación del inmovilizado
+
+
+
+ 5293
+
+
+ other
+ Provisión a corto plazo por desmantelamiento, retiro o rehabilitación del inmovilizado
+
+
+
+ 5295
+
+
+ view
+ Provisión a corto plazo para actuaciones medioambientales
+
+
+
+ 5295
+
+
+ other
+ Provisión a corto plazo para actuaciones medioambientales
+
+
+
+ 53
+
+
+ view
+ Inversiones financieras a corto plazo en partes vinculadas
+
+
+
+ 530
+
+
+ view
+ Participaciones a corto plazo en partes vinculadas
+
+
+
+ 5303
+
+
+ view
+ Participaciones a corto plazo en empresas del grupo
+
+
+
+ 5303
+
+
+ other
+ Participaciones a corto plazo en empresas del grupo
+
+
+
+ 5304
+
+
+ view
+ Participaciones a corto plazo en empresas asociadas
+
+
+
+ 5304
+
+
+ other
+ Participaciones a corto plazo en empresas asociadas
+
+
+
+ 5305
+
+
+ view
+ Participaciones a corto plazo en otras partes vinculadas
+
+
+
+ 5305
+
+
+ other
+ Participaciones a corto plazo en otras partes vinculadas
+
+
+
+ 531
+
+
+ view
+ Valores representativos de deuda a corto plazo de partes vinculadas
+
+
+
+ 5313
+
+
+ view
+ Valores representativos de deuda a corto plazo de empresas del grupo
+
+
+
+ 5313
+
+
+ other
+ Valores representativos de deuda a corto plazo de empresas del grupo
+
+
+
+ 5314
+
+
+ view
+ Valores representativos de deuda a corto plazo de empresas asociadas
+
+
+
+ 5314
+
+
+ other
+ Valores representativos de deuda a corto plazo de empresas asociadas
+
+
+
+ 5315
+
+
+ view
+ Valores representativos de deuda a corto plazo de otras partes vinculadas
+
+
+
+ 5315
+
+
+ other
+ Valores representativos de deuda a corto plazo de otras partes vinculadas
+
+
+
+ 532
+
+
+ view
+ Créditos a corto plazo a partes vinculadas
+
+
+
+ 5323
+
+
+ view
+ Créditos a corto plazo a empresas del grupo
+
+
+
+ 5323
+
+
+ other
+ Créditos a corto plazo a empresas del grupo
+
+
+
+ 5324
+
+
+ view
+ Créditos a corto plazo a empresas asociadas
+
+
+
+ 5324
+
+
+ other
+ Créditos a corto plazo a empresas asociadas
+
+
+
+ 5325
+
+
+ view
+ Créditos a corto plazo a otras partes vinculadas
+
+
+
+ 5325
+
+
+ other
+ Créditos a corto plazo a otras partes vinculadas
+
+
+
+ 533
+
+
+ view
+ Intereses a corto plazo de valores representativos de deuda de partes vinculadas
+
+
+
+ 5333
+
+
+ view
+ Intereses a corto plazo de valores representativos de deuda de empresas del grupo
+
+
+
+ 5333
+
+
+ other
+ Intereses a corto plazo de valores representativos de deuda de empresas del grupo
+
+
+
+ 5334
+
+
+ view
+ Intereses a corto plazo de valores representativos de deuda de empresas asociadas
+
+
+
+ 5334
+
+
+ other
+ Intereses a corto plazo de valores representativos de deuda de empresas asociadas
+
+
+
+ 5335
+
+
+ view
+ Intereses a corto plazo de valores representativos de deuda de otras partes vinculadas
+
+
+
+ 5335
+
+
+ other
+ Intereses a corto plazo de valores representativos de deuda de otras partes vinculadas
+
+
+
+ 534
+
+
+ view
+ Intereses a corto plazo de créditos a partes vinculadas
+
+
+
+ 5343
+
+
+ view
+ Intereses a corto plazo de créditos a empresas del grupo
+
+
+
+ 5343
+
+
+ other
+ Intereses a corto plazo de créditos a empresas del grupo
+
+
+
+ 5344
+
+
+ view
+ Intereses a corto plazo de créditos a empresas asociadas
+
+
+
+ 5344
+
+
+ other
+ Intereses a corto plazo de créditos a empresas asociadas
+
+
+
+ 5345
+
+
+ view
+ Intereses a corto plazo de créditos a otras partes vinculadas
+
+
+
+ 5345
+
+
+ other
+ Intereses a corto plazo de créditos a otras partes vinculadas
+
+
+
+ 535
+
+
+ view
+ Dividendo a cobrar de inversiones financieras en partes vinculadas
+
+
+
+ 5353
+
+
+ view
+ Dividendo a cobrar de inversiones financieras en empresas del grupo
+
+
+
+ 5353
+
+
+ other
+ Dividendo a cobrar de inversiones financieras en empresas del grupo
+
+
+
+ 5354
+
+
+ view
+ Dividendo a cobrar de inversiones financieras en empresas asociadas
+
+
+
+ 5354
+
+
+ other
+ Dividendo a cobrar de inversiones financieras en empresas asociadas
+
+
+
+ 5355
+
+
+ view
+ Dividendo a cobrar de inversiones financieras en otras partes vinculadas
+
+
+
+ 5355
+
+
+ other
+ Dividendo a cobrar de inversiones financieras en otras partes vinculadas
+
+
+
+ 539
+
+
+ view
+ Desembolsos pendientes sobre participaciones a corto plazo en partes vinculadas
+
+
+
+ 5393
+
+
+ view
+ Desembolsos pendientes sobre participaciones a corto plazo en empresas del grupo
+
+
+
+ 5393
+
+
+ other
+ Desembolsos pendientes sobre participaciones a corto plazo en empresas del grupo
+
+
+
+ 5394
+
+
+ view
+ Desembolsos pendientes sobre participaciones a corto plazo en empresas asociadas
+
+
+
+ 5394
+
+
+ other
+ Desembolsos pendientes sobre participaciones a corto plazo en empresas asociadas
+
+
+
+ 5395
+
+
+ view
+ Desembolsos pendientes sobre participaciones a corto plazo en otras partes vinculadas
+
+
+
+ 5395
+
+
+ other
+ Desembolsos pendientes sobre participaciones a corto plazo en otras partes vinculadas
+
+
+
+ 54
+
+
+ view
+ Otras inversiones financieras a corto plazo
+
+
+
+ 540
+
+
+ view
+ Inversiones financieras a corto plazo en instrumentos de patrimonio
+
+
+
+ 540
+
+
+ other
+ Inversiones financieras a corto plazo en instrumentos de patrimonio
+
+
+
+ 541
+
+
+ view
+ Valores representativos de deuda a corto plazo
+
+
+
+ 541
+
+
+ other
+ Valores representativos de deuda a corto plazo
+
+
+
+ 542
+
+
+ view
+ Créditos a corto plazo
+
+
+
+ 542
+
+
+ other
+ Créditos a corto plazo
+
+
+
+ 543
+
+
+ view
+ Créditos a corto plazo por enajenación de inmovilizado
+
+
+
+ 543
+
+
+ other
+ Créditos a corto plazo por enajenación de inmovilizado
+
+
+
+ 544
+
+
+ view
+ Créditos a corto plazo al personal
+
+
+
+ 544
+
+
+ other
+ Créditos a corto plazo al personal
+
+
+
+ 545
+
+
+ view
+ Dividendo a cobrar
+
+
+
+ 545
+
+
+ other
+ Dividendo a cobrar
+
+
+
+ 546
+
+
+ view
+ Intereses a corto plazo de valores representativos de deudas
+
+
+
+ 546
+
+
+ other
+ Intereses a corto plazo de valores representativos de deudas
+
+
+
+ 547
+
+
+ view
+ Intereses a corto plazo de créditos
+
+
+
+ 547
+
+
+ other
+ Intereses a corto plazo de créditos
+
+
+
+ 548
+
+
+ view
+ Imposiciones a corto plazo
+
+
+
+ 548
+
+
+ other
+ Imposiciones a corto plazo
+
+
+
+ 549
+
+
+ view
+ Desembolsos pendientes sobre participaciones en el patrimonio neto a corto plazo
+
+
+
+ 549
+
+
+ other
+ Desembolsos pendientes sobre participaciones en el patrimonio neto a corto plazo
+
+
+
+ 55
+
+
+ view
+ Otras cuentas no bancarias
+
+
+
+ 550
+
+
+ view
+ Titular de la explotación
+
+
+
+ 550
+
+
+ other
+ Titular de la explotación
+
+
+
+ 551
+
+
+ view
+ Cuenta corriente con patronos y otros
+
+
+
+ 551
+
+
+ other
+ Cuenta corriente con patronos y otros
+
+
+
+ 552
+
+
+ view
+ Cuenta corriente con otras personas y entidades vinculadas
+
+
+
+ 5523
+
+
+ view
+ Cuenta corriente con empresas del grupo
+
+
+
+ 5523
+
+
+ other
+ Cuenta corriente con empresas del grupo
+
+
+
+ 5524
+
+
+ view
+ Cuenta corriente con empresas asociadas
+
+
+
+ 5524
+
+
+ other
+ Cuenta corriente con empresas asociadas
+
+
+
+ 5525
+
+
+ view
+ Cuenta corriente con otras partes vinculadas
+
+
+
+ 5525
+
+
+ other
+ Cuenta corriente con otras partes vinculadas
+
+
+
+ 554
+
+
+ view
+ Cuenta corriente con uniones temporales de empresas y comunidades de bienes
+
+
+
+ 554
+
+
+ other
+ Cuenta corriente con uniones temporales de empresas y comunidades de bienes
+
+
+
+ 555
+
+
+ view
+ Partidas pendientes de aplicación
+
+
+
+ 555
+
+
+ other
+ Partidas pendientes de aplicación
+
+
+
+ 556
+
+
+ view
+ Desembolsos exigidos sobre participaciones en el patrimonio neto
+
+
+
+ 5563
+
+
+ view
+ Desembolsos exigidos sobre participaciones, empresas del grupo
+
+
+
+ 5563
+
+
+ other
+ Desembolsos exigidos sobre participaciones, empresas del grupo
+
+
+
+ 5564
+
+
+ view
+ Desembolsos exigidos sobre participaciones, empresas asociadas
+
+
+
+ 5564
+
+
+ other
+ Desembolsos exigidos sobre participaciones, empresas asociadas
+
+
+
+ 5565
+
+
+ view
+ Desembolsos exigidos sobre participaciones, otras partes vinculadas
+
+
+
+ 5565
+
+
+ other
+ Desembolsos exigidos sobre participaciones, otras partes vinculadas
+
+
+
+ 5566
+
+
+ view
+ Desembolsos exigidos sobre participaciones de otras empresas
+
+
+
+ 5566
+
+
+ other
+ Desembolsos exigidos sobre participaciones de otras empresas
+
+
+
+ 557
+
+
+ view
+ Dividendo activo a cuenta
+
+
+
+ 557
+
+
+ other
+ Dividendo activo a cuenta
+
+
+
+ 558
+
+
+ view
+ Fundadores y asociados por desembolsos exigidos
+
+
+
+ 5580
+
+
+ view
+ Socios por desembolsos exigidos sobre acciones o participaciones ordinarias
+
+
+
+ 5580
+
+
+ other
+ Socios por desembolsos exigidos sobre acciones o participaciones ordinarias
+
+
+
+ 5585
+
+
+ view
+ Socios por desembolsos exigidos sobre acciones o participaciones consideradas como pasivos financieros
+
+
+
+ 5585
+
+
+ other
+ Socios por desembolsos exigidos sobre acciones o participaciones consideradas como pasivos financieros
+
+
+
+ 559
+
+
+ view
+ Derivados financieros a corto plazo
+
+
+
+ 5590
+
+
+ view
+ Activos por derivados financieros a corto plazo
+
+
+
+ 5590
+
+
+ other
+ Activos por derivados financieros a corto plazo
+
+
+
+ 5595
+
+
+ view
+ Pasivos por derivados financieros a corto plazo
+
+
+
+ 5595
+
+
+ other
+ Pasivos por derivados financieros a corto plazo
+
+
+
+ 56
+
+
+ view
+ Fianzas y depósitos recibidos y constituidos a corto plazo y ajustes por periodificación
+
+
+
+ 560
+
+
+ view
+ Fianzas recibidas a corto plazo
+
+
+
+ 560
+
+
+ other
+ Fianzas recibidas a corto plazo
+
+
+
+ 561
+
+
+ view
+ Depósitos recibidos a corto plazo
+
+
+
+ 561
+
+
+ other
+ Depósitos recibidos a corto plazo
+
+
+
+ 565
+
+
+ view
+ Fianzas constituidas a corto plazo
+
+
+
+ 565
+
+
+ other
+ Fianzas constituidas a corto plazo
+
+
+
+ 566
+
+
+ view
+ Depósitos constituidos a corto plazo
+
+
+
+ 566
+
+
+ other
+ Depósitos constituidos a corto plazo
+
+
+
+ 567
+
+
+ view
+ Intereses pagados por anticipado
+
+
+
+ 567
+
+
+ other
+ Intereses pagados por anticipado
+
+
+
+ 568
+
+
+ view
+ Intereses cobrados por anticipado
+
+
+
+ 568
+
+
+ other
+ Intereses cobrados por anticipado
+
+
+
+ 57
+
+
+ view
+ Tesorería
+
+
+
+ 570
+
+
+ view
+ Caja, euros
+
+
+
+ 570
+
+
+ liquidity
+ Caja, euros
+
+
+
+ 571
+
+
+ view
+ Caja, moneda extranjera
+
+
+
+ 571
+
+
+ liquidity
+ Caja, moneda extranjera
+
+
+
+ 572
+
+
+ view
+ Bancos e instituciones de crédito c/c vista, euros
+
+
+
+ 572
+
+
+ liquidity
+ Bancos e instituciones de crédito c/c vista, euros
+
+
+
+ 573
+
+
+ view
+ Bancos e instituciones de crédito c/c vista, moneda extranjera
+
+
+
+ 573
+
+
+ liquidity
+ Bancos e instituciones de crédito c/c vista, moneda extranjera
+
+
+
+ 574
+
+
+ view
+ Bancos e instituciones de crédito, cuentas de ahorro, euros
+
+
+
+ 574
+
+
+ liquidity
+ Bancos e instituciones de crédito, cuentas de ahorro, euros
+
+
+
+ 575
+
+
+ view
+ Bancos e instituciones de crédito, cuentas de ahorro, moneda extranjera
+
+
+
+ 575
+
+
+ liquidity
+ Bancos e instituciones de crédito, cuentas de ahorro, moneda extranjera
+
+
+
+ 576
+
+
+ view
+ Inversiones a corto plazo de gran liquidez
+
+
+
+ 576
+
+
+ liquidity
+ Inversiones a corto plazo de gran liquidez
+
+
+
+ 59
+
+
+ view
+ Deterioro del valor de inversiones financieras a corto plazo y de activos no corrientes mantenidos para la venta
+
+
+
+ 593
+
+
+ view
+ Deterioro de valor de participaciones a corto plazo en partes vinculadas
+
+
+
+ 5933
+
+
+ view
+ Deterioro de valor de participaciones a corto plazo en empresas del grupo
+
+
+
+ 5933
+
+
+ other
+ Deterioro de valor de participaciones a corto plazo en empresas del grupo
+
+
+
+ 5934
+
+
+ view
+ Deterioro de valor de participaciones a corto plazo en empresas asociadas
+
+
+
+ 5934
+
+
+ other
+ Deterioro de valor de participaciones a corto plazo en empresas asociadas
+
+
+
+ 5935
+
+
+ view
+ Deterioro de valor de participaciones a corto plazo en otras partes vinculadas
+
+
+
+ 5935
+
+
+ other
+ Deterioro de valor de participaciones a corto plazo en otras partes vinculadas
+
+
+
+ 594
+
+
+ view
+ Deterioro de valor de valores representativos de deuda a corto plazo de partes vinculadas
+
+
+
+ 5943
+
+
+ view
+ Deterioro de valor de valores representativos de deuda a corto plazo de empresas del grupo
+
+
+
+ 5943
+
+
+ other
+ Deterioro de valor de valores representativos de deuda a corto plazo de empresas del grupo
+
+
+
+ 5944
+
+
+ view
+ Deterioro de valor de valores representativos de deuda a corto plazo de empresas asociadas
+
+
+
+ 5944
+
+
+ other
+ Deterioro de valor de valores representativos de deuda a corto plazo de empresas asociadas
+
+
+
+ 5945
+
+
+ view
+ Deterioro de valor de valores representativos de deuda a corto plazo de otras partes vinculadas
+
+
+
+ 5945
+
+
+ other
+ Deterioro de valor de valores representativos de deuda a corto plazo de otras partes vinculadas
+
+
+
+ 595
+
+
+ view
+ Deterioro de valor de créditos a corto plazo a partes vinculadas
+
+
+
+ 5953
+
+
+ view
+ Deterioro de valor de créditos a corto plazo a empresas del grupo
+
+
+
+ 5953
+
+
+ other
+ Deterioro de valor de créditos a corto plazo a empresas del grupo
+
+
+
+ 5954
+
+
+ view
+ Deterioro de valor de créditos a corto plazo a empresas asociadas
+
+
+
+ 5954
+
+
+ other
+ Deterioro de valor de créditos a corto plazo a empresas asociadas
+
+
+
+ 5955
+
+
+ view
+ Deterioro de valor de créditos a corto plazo a otras partes vinculadas
+
+
+
+ 5955
+
+
+ other
+ Deterioro de valor de créditos a corto plazo a otras partes vinculadas
+
+
+
+ 596
+
+
+ view
+ Deterioro de valor de participaciones a corto plazo
+
+
+
+ 596
+
+
+ other
+ Deterioro de valor de participaciones a corto plazo
+
+
+
+ 597
+
+
+ view
+ Deterioro de valor de valores representativos de deuda a corto plazo
+
+
+
+ 597
+
+
+ other
+ Deterioro de valor de valores representativos de deuda a corto plazo
+
+
+
+ 598
+
+
+ view
+ Deterioro de valor de créditos a corto plazo
+
+
+
+ 598
+
+
+ other
+ Deterioro de valor de créditos a corto plazo
+
+
+
+ 6
+
+
+ view
+ Compras y Gastos
+
+
+
+ 60
+
+
+ view
+ Compras
+
+
+
+ 600
+
+
+ view
+ Compras de bienes destinados a la actividad
+
+
+
+ 600
+
+
+ other
+ Compras de bienes destinados a la actividad
+
+
+
+ 601
+
+
+ view
+ Compras de materias primas
+
+
+
+ 601
+
+
+ other
+ Compras de materias primas
+
+
+
+ 602
+
+
+ view
+ Compras de otros aprovisionamientos
+
+
+
+ 602
+
+
+ other
+ Compras de otros aprovisionamientos
+
+
+
+ 606
+
+
+ view
+ Descuentos sobre compras por pronto pago
+
+
+
+ 6060
+
+
+ view
+ Descuentos sobre compras por pronto pago de bienes destinados a la actividad
+
+
+
+ 6060
+
+
+ other
+ Descuentos sobre compras por pronto pago de bienes destinados a la actividad
+
+
+
+ 6061
+
+
+ view
+ Descuentos sobre compras por pronto pago de materias primas
+
+
+
+ 6061
+
+
+ other
+ Descuentos sobre compras por pronto pago de materias primas
+
+
+
+ 6062
+
+
+ view
+ Descuentos sobre compras por pronto pago de otros aprovisionamientos
+
+
+
+ 6062
+
+
+ other
+ Descuentos sobre compras por pronto pago de otros aprovisionamientos
+
+
+
+ 607
+
+
+ view
+ Trabajos realizados por otras empresas
+
+
+
+ 607
+
+
+ other
+ Trabajos realizados por otras empresas
+
+
+
+ 608
+
+
+ view
+ Devoluciones de compras y operaciones similares
+
+
+
+ 6080
+
+
+ view
+ Devoluciones de compras de bienes destinados a la actividad
+
+
+
+ 6080
+
+
+ other
+ Devoluciones de compras de bienes destinados a la actividad
+
+
+
+ 6081
+
+
+ view
+ Devoluciones de compras de materias primas
+
+
+
+ 6081
+
+
+ other
+ Devoluciones de compras de materias primas
+
+
+
+ 6082
+
+
+ view
+ Devoluciones de compras de otros aprovisionamientos
+
+
+
+ 6082
+
+
+ other
+ Devoluciones de compras de otros aprovisionamientos
+
+
+
+ 609
+
+
+ view
+ “Rappels” por compras
+
+
+
+ 6090
+
+
+ view
+ "Rappels" por compras de bienes destinados a la actividad
+
+
+
+ 6090
+
+
+ other
+ "Rappels" por compras de bienes destinados a la actividad
+
+
+
+ 6091
+
+
+ view
+ "Rappels" por compras de materias primas
+
+
+
+ 6091
+
+
+ other
+ "Rappels" por compras de materias primas
+
+
+
+ 6092
+
+
+ view
+ "Rappels" por compras de otros aprovisionamientos
+
+
+
+ 6092
+
+
+ other
+ "Rappels" por compras de otros aprovisionamientos
+
+
+
+ 61
+
+
+ view
+ Variación de existencias
+
+
+
+ 610
+
+
+ view
+ Variación de existencias de bienes destinados a la actividad
+
+
+
+ 610
+
+
+ other
+ Variación de existencias de mercaderías
+
+
+
+ 611
+
+
+ view
+ Variación de existencias de materias primas
+
+
+
+ 611
+
+
+ other
+ Variación de existencias de materias primas
+
+
+
+ 612
+
+
+ view
+ Variación de existencias de otros aprovisionamientos
+
+
+
+ 612
+
+
+ other
+ Variación de existencias de otros aprovisionamientos
+
+
+
+ 62
+
+
+ view
+ Servicios Exteriores
+
+
+
+ 620
+
+
+ view
+ Gastos en investigación y desarrollo del ejercicio
+
+
+
+ 620
+
+
+ other
+ Gastos en investigación y desarrollo del ejercicio
+
+
+
+ 621
+
+
+ view
+ Arrendamientos y cánones
+
+
+
+ 621
+
+
+ other
+ Arrendamientos y cánones
+
+
+
+ 622
+
+
+ view
+ Reparaciones y conservación
+
+
+
+ 622
+
+
+ other
+ Reparaciones y conservación
+
+
+
+ 623
+
+
+ view
+ Servicios de profesionales independientes
+
+
+
+ 623
+
+
+ other
+ Servicios de profesionales independientes
+
+
+
+ 624
+
+
+ view
+ Transportes
+
+
+
+ 624
+
+
+ other
+ Transportes
+
+
+
+ 625
+
+
+ view
+ Primas de seguros
+
+
+
+ 625
+
+
+ other
+ Primas de seguros
+
+
+
+ 626
+
+
+ view
+ Servicios bancarios y similares
+
+
+
+ 626
+
+
+ other
+ Servicios bancarios y similares
+
+
+
+ 627
+
+
+ view
+ Publicidad, propaganda y relaciones públicas
+
+
+
+ 627
+
+
+ other
+ Publicidad, propaganda y relaciones públicas
+
+
+
+ 628
+
+
+ view
+ Suministros
+
+
+
+ 628
+
+
+ other
+ Suministros
+
+
+
+ 629
+
+
+ view
+ Otros servicios
+
+
+
+ 629
+
+
+ other
+ Otros servicios
+
+
+
+ 63
+
+
+ view
+ Tributos
+
+
+
+ 630
+
+
+ view
+ Impuesto sobre beneficios
+
+
+
+ 6300
+
+
+ view
+ Impuesto corriente
+
+
+
+ 6300
+
+
+ other
+ Impuesto corriente
+
+
+
+ 6301
+
+
+ view
+ Impuesto diferido
+
+
+
+ 6301
+
+
+ other
+ Impuesto diferido
+
+
+
+ 631
+
+
+ view
+ Otros tributos
+
+
+
+ 631
+
+
+ other
+ Otros tributos
+
+
+
+ 633
+
+
+ view
+ Ajustes negativos en la imposición sobre beneficios
+
+
+
+ 633
+
+
+ other
+ Ajustes negativos en la imposición sobre beneficios
+
+
+
+ 634
+
+
+ view
+ Ajustes negativos en la imposición indirecta
+
+
+
+ 6341
+
+
+ view
+ Ajustes negativos en IVA de activo corriente
+
+
+
+ 6341
+
+
+ other
+ Ajustes negativos en IVA de activo corriente
+
+
+
+ 6342
+
+
+ view
+ Ajustes negativos en IVA de inversiones
+
+
+
+ 6342
+
+
+ other
+ Ajustes negativos en IVA de inversiones
+
+
+
+ 636
+
+
+ view
+ Devolución de impuestos
+
+
+
+ 636
+
+
+ other
+ Devolución de impuestos
+
+
+
+ 638
+
+
+ view
+ Ajustes positivos en la imposición sobre beneficios
+
+
+
+ 638
+
+
+ other
+ Ajustes positivos en la imposición sobre beneficios
+
+
+
+ 639
+
+
+ view
+ Ajustes positivos en la imposición indirecta
+
+
+
+ 6391
+
+
+ view
+ Ajustes positivos en IVA de activo corriente
+
+
+
+ 6391
+
+
+ other
+ Ajustes positivos en IVA de activo corriente
+
+
+
+ 6392
+
+
+ view
+ Ajustes positivos en IVA de inversiones
+
+
+
+ 6392
+
+
+ other
+ Ajustes positivos en IVA de inversiones
+
+
+
+ 64
+
+
+ view
+ Gastos de personal
+
+
+
+ 640
+
+
+ view
+ Sueldos y salarios
+
+
+
+ 640
+
+
+ other
+ Sueldos y salarios
+
+
+
+ 641
+
+
+ view
+ Indemnizaciones
+
+
+
+ 641
+
+
+ other
+ Indemnizaciones
+
+
+
+ 642
+
+
+ view
+ Seguridad Social a cargo de la empresa
+
+
+
+ 642
+
+
+ other
+ Seguridad Social a cargo de la empresa
+
+
+
+ 649
+
+
+ view
+ Otros gastos sociales
+
+
+
+ 649
+
+
+ other
+ Otros gastos sociales
+
+
+
+ 65
+
+
+ view
+ Ayudas monetarias de la entidad y otros gastos de gestión
+
+
+
+ 650
+
+
+ view
+ Ayudas monetarias
+
+
+
+
+ 6501
+
+
+ view
+ Ayudas monetarias individuales
+
+
+
+ 6501
+
+
+ other
+ Ayudas monetarias individuales
+
+
+
+
+ 6502
+
+
+ view
+ Ayudas monetarias a entidades
+
+
+
+ 6502
+
+
+ other
+ Ayudas monetarias a entidades
+
+
+
+
+ 6503
+
+
+ view
+ Ayudas monetarias realizadas a través de otras entidades o centros
+
+
+
+ 6503
+
+
+ other
+ Ayudas monetarias realizadas a través de otras entidades o centros
+
+
+
+
+ 6504
+
+
+ view
+ Ayudas monetarias de cooperación internacional
+
+
+
+ 6504
+
+
+ other
+ Ayudas monetarias de cooperación internacional
+
+
+
+
+
+
+
+ 651
+
+
+ view
+ Ayudas no monetarias
+
+
+
+ 6510
+
+
+ view
+ Beneficio transferido (gestor)
+
+
+
+ 6510
+
+
+ other
+ Beneficio transferido (gestor)
+
+
+
+ 6511
+
+
+ view
+ Ayudas no monetarias individuales
+
+
+
+ 6511
+
+
+ other
+ Ayudas no monetarias individuales
+
+
+
+ 6512
+
+
+ view
+ Ayudas no monetarias a entidades
+
+
+
+ 6512
+
+
+ other
+ Ayudas no monetarias a entidades
+
+
+
+
+ 6513
+
+
+ view
+ Ayudas no monetarias realizadas a través de otras entidades o centros
+
+
+
+ 6513
+
+
+ other
+ Ayudas no monetarias realizadas a través de otras entidades o centros
+
+
+
+
+ 6514
+
+
+ view
+ Ayudas no monetarias de cooperación internacional
+
+
+
+ 6514
+
+
+ other
+ Ayudas no monetarias de cooperación internacional
+
+
+
+
+ 653
+
+
+ view
+ Compensación de gastos por prestaciones de colaboración
+
+
+
+ 653
+
+
+ other
+ Compensación de gastos por prestaciones de colaboración
+
+
+
+
+ 654
+
+
+ view
+ Reembolsos de gastos al órgano de gobierno
+
+
+
+ 654
+
+
+ other
+ Reembolsos de gastos al órgano de gobierno
+
+
+
+
+ 655
+
+
+ view
+ Pérdidas de créditos derivados de la actividad incobrables
+
+
+
+ 655
+
+
+ other
+ Pérdidas de créditos derivados de la actividad incobrables
+
+
+
+
+
+ 656
+
+
+ view
+ Resultados de operaciones en común
+
+
+
+ 6560
+
+
+ view
+ Beneficio transferido (gestor)
+
+
+
+ 6560
+
+
+ other
+ Beneficio transferido (gestor)
+
+
+
+
+ 6561
+
+
+ view
+ Pérdida soportada (partícipe o asociado no gestor)
+
+
+
+ 6561
+
+
+ other
+ Pérdida soportada(partícipe o asociado no gestor)
+
+
+
+
+ 658
+
+
+ view
+ Reintegro de subvenciones, donaciones y legados recibidos, afectados a la actividad propia de la entidad
+
+
+
+ 658
+
+
+ other
+ Reintegro de subvenciones, donaciones y legados recibidos, afectos a la actividad propia de la entidad
+
+
+
+
+
+ 659
+
+
+ view
+ Otras pérdidas en gestión corriente
+
+
+
+ 659
+
+
+ other
+ Otras pérdidas en gestión corriente
+
+
+
+ 66
+
+
+ view
+ Gastos financieros
+
+
+
+ 660
+
+
+ view
+ Gastos financieros por actualización de provisiones
+
+
+
+ 660
+
+
+ other
+ Gastos financieros por actualización de provisiones
+
+
+
+ 661
+
+
+ view
+ Intereses de obligaciones y bonos
+
+
+
+ 6610
+
+
+ view
+ Intereses de obligaciones y bonos, empresas del grupo
+
+
+
+ 6610
+
+
+ other
+ Intereses de obligaciones y bonos, empresas del grupo
+
+
+
+ 6611
+
+
+ view
+ Intereses de obligaciones y bonos, empresas asociadas
+
+
+
+ 6611
+
+
+ other
+ Intereses de obligaciones y bonos, empresas asociadas
+
+
+
+ 6612
+
+
+ view
+ Intereses de obligaciones y bonos, otras partes vinculadas
+
+
+
+ 6612
+
+
+ other
+ Intereses de obligaciones y bonos, otras partes vinculadas
+
+
+
+ 6613
+
+
+ view
+ Intereses de obligaciones y bonos, otras empresas
+
+
+
+ 6613
+
+
+ other
+ Intereses de obligaciones y bonos, otras empresas
+
+
+
+ 6615
+
+
+ view
+ Intereses de obligaciones y bonos a corto plazo, empresas del grupo
+
+
+
+ 6615
+
+
+ other
+ Intereses de obligaciones y bonos a corto plazo, empresas del grupo
+
+
+
+ 6616
+
+
+ view
+ Intereses de obligaciones y bonos a corto plazo, empresas asociadas
+
+
+
+ 6616
+
+
+ other
+ Intereses de obligaciones y bonos a corto plazo, empresas asociadas
+
+
+
+ 6617
+
+
+ view
+ Intereses de obligaciones y bonos a corto plazo, otras partes vinculadas
+
+
+
+ 6617
+
+
+ other
+ Intereses de obligaciones y bonos a corto plazo, otras partes vinculadas
+
+
+
+ 6618
+
+
+ view
+ Intereses de obligaciones y bonos a corto plazo, otras empresas
+
+
+
+ 6618
+
+
+ other
+ Intereses de obligaciones y bonos a corto plazo, otras empresas
+
+
+
+ 662
+
+
+ view
+ Ingresos de créditos a largo plazo
+
+
+
+ 6620
+
+
+ view
+ Ingresos de créditos a largo plazo, empresas del grupo
+
+
+
+ 6620
+
+
+ other
+ Ingresos de créditos a largo plazo, empresas del grupo
+
+
+
+ 6621
+
+
+ view
+ Ingresos de créditos a largo plazo, empresas asociadas
+
+
+
+ 6621
+
+
+ other
+ Ingresos de créditos a largo plazo, empresas asociadas
+
+
+
+ 6622
+
+
+ view
+ Ingresos de créditos a largo plazo, otras partes vinculadas
+
+
+
+ 6622
+
+
+ other
+ Ingresos de créditos a largo plazo, otras partes vinculadas
+
+
+
+ 6623
+
+
+ view
+ Ingresos de créditos a largo plazo con entidades de crédito
+
+
+
+ 6623
+
+
+ other
+ Ingresos de créditos a largo plazo con entidades de crédito
+
+
+
+ 6624
+
+
+ view
+ Ingresos de créditos a largo plazo, otras empresas
+
+
+
+ 6624
+
+
+ other
+ Ingresos de créditos a largo plazo, otras empresas
+
+
+
+ 663
+
+
+ view
+ Pérdidas por valoración de activos y pasivos financieros por su valor razonable
+
+
+
+ 663
+
+
+ other
+ Pérdidas por valoración de activos y pasivos financieros por su valor razonable
+
+
+
+ 664
+
+
+ view
+ Dividendos de acciones o participaciones consideradas como pasivos financieros
+
+
+
+ 6640
+
+
+ view
+ Dividendos de pasivos, empresas del grupo
+
+
+
+ 6640
+
+
+ other
+ Dividendos de pasivos, empresas del grupo
+
+
+
+ 6641
+
+
+ view
+ Dividendos de pasivos, empresas asociadas
+
+
+
+ 6641
+
+
+ other
+ Dividendos de pasivos, empresas asociadas
+
+
+
+ 6642
+
+
+ view
+ Dividendos de pasivos, otras partes vinculadas
+
+
+
+ 6642
+
+
+ other
+ Dividendos de pasivos, otras partes vinculadas
+
+
+
+ 6643
+
+
+ view
+ Dividendos de pasivos, otras empresas
+
+
+
+ 6643
+
+
+ other
+ Dividendos de pasivos, otras empresas
+
+
+
+ 665
+
+
+ view
+ Intereses por descuento de efectos y operaciones de “factoring”
+
+
+
+ 6650
+
+
+ view
+ Intereses por descuento de efectos en entidades de crédito del grupo
+
+
+
+ 6650
+
+
+ other
+ Intereses por descuento de efectos en entidades de crédito del grupo
+
+
+
+ 6651
+
+
+ view
+ Intereses por descuento de efectos en entidades de crédito asociadas
+
+
+
+ 6651
+
+
+ other
+ Intereses por descuento de efectos en entidades de crédito asociadas
+
+
+
+ 6652
+
+
+ view
+ Intereses por descuento de efectos en entidades de crédito vinculadas
+
+
+
+ 6652
+
+
+ other
+ Intereses por descuento de efectos en entidades de crédito vinculadas
+
+
+
+ 6653
+
+
+ view
+ Intereses por descuento de efectos en otras entidades de crédito
+
+
+
+ 6653
+
+
+ other
+ Intereses por descuento de efectos en otras entidades de crédito
+
+
+
+ 6654
+
+
+ view
+ Intereses por operaciones de "factoring" con entidades de crédito del grupo
+
+
+
+ 6654
+
+
+ other
+ Intereses por operaciones de "factoring" con entidades de crédito del grupo
+
+
+
+ 6655
+
+
+ view
+ Intereses por operaciones de "factoring" con entidades de crédito asociadas
+
+
+
+ 6655
+
+
+ other
+ Intereses por operaciones de "factoring" con entidades de crédito asociadas
+
+
+
+ 6656
+
+
+ view
+ Intereses por operaciones de "factoring" con entidades de crédito vinculadas
+
+
+
+ 6656
+
+
+ other
+ Intereses por operaciones de "factoring" con entidades de crédito vinculadas
+
+
+
+ 6657
+
+
+ view
+ Intereses por operaciones de "factoring" con otras entidades de crédito
+
+
+
+ 6657
+
+
+ other
+ Intereses por operaciones de "factoring" con otras entidades de crédito
+
+
+
+ 666
+
+
+ view
+ Pérdidas en participaciones y valores representativos de deuda
+
+
+
+ 6660
+
+
+ view
+ Pérdidas en valores representativos de deuda, empresas del grupo
+
+
+
+ 6660
+
+
+ other
+ Pérdidas en valores representativos de deuda, empresas del grupo
+
+
+
+ 6661
+
+
+ view
+ Pérdidas en valores representativos de deuda, empresas asociadas
+
+
+
+ 6661
+
+
+ other
+ Pérdidas en valores representativos de deuda, empresas asociadas
+
+
+
+ 6662
+
+
+ view
+ Pérdidas en valores representativos de deuda, otras partes vinculadas
+
+
+
+ 6662
+
+
+ other
+ Pérdidas en valores representativos de deuda, otras partes vinculadas
+
+
+
+ 6663
+
+
+ view
+ Pérdidas en valores representativos de deuda, otras empresas
+
+
+
+ 6663
+
+
+ other
+ Pérdidas en valores representativos de deuda, otras empresas
+
+
+
+ 6665
+
+
+ view
+ Pérdidas en valores representativos de deuda a corto plazo, empresas del grupo
+
+
+
+ 6665
+
+
+ other
+ Pérdidas en valores representativos de deuda a corto plazo, empresas del grupo
+
+
+
+ 6666
+
+
+ view
+ Pérdidas en valores representativos de deuda a corto plazo, empresas asociadas
+
+
+
+ 6666
+
+
+ other
+ Pérdidas en valores representativos de deuda a corto plazo, empresas asociadas
+
+
+
+ 6667
+
+
+ view
+ Pérdidas en valores representativos de deuda a corto plazo, otras partes vinculadas
+
+
+
+ 6667
+
+
+ other
+ Pérdidas en valores representativos de deuda a corto plazo, otras partes vinculadas
+
+
+
+ 6668
+
+
+ view
+ Pérdidas en valores representativos de deuda a corto plazo, otras empresas
+
+
+
+ 6668
+
+
+ other
+ Pérdidas en valores representativos de deuda a corto plazo, otras empresas
+
+
+
+ 667
+
+
+ view
+ Pérdidas de créditos no comerciales
+
+
+
+ 6670
+
+
+ view
+ Pérdidas de créditos, empresas del grupo
+
+
+
+ 6670
+
+
+ other
+ Pérdidas de créditos, empresas del grupo
+
+
+
+ 6671
+
+
+ view
+ Pérdidas de créditos, empresas asociadas
+
+
+
+ 6671
+
+
+ other
+ Pérdidas de créditos, empresas asociadas
+
+
+
+ 6672
+
+
+ view
+ Pérdidas de créditos, otras partes vinculadas
+
+
+
+ 6672
+
+
+ other
+ Pérdidas de créditos, otras partes vinculadas
+
+
+
+ 6673
+
+
+ view
+ Pérdidas de créditos, otras empresas
+
+
+
+ 6673
+
+
+ other
+ Pérdidas de créditos, otras empresas
+
+
+
+ 6675
+
+
+ view
+ Pérdidas de créditos a corto plazo, empresas del grupo
+
+
+
+ 6675
+
+
+ other
+ Pérdidas de créditos a corto plazo, empresas del grupo
+
+
+
+ 6676
+
+
+ view
+ Pérdidas de créditos a corto plazo, empresas asociadas
+
+
+
+ 6676
+
+
+ other
+ Pérdidas de créditos a corto plazo, empresas asociadas
+
+
+
+ 6677
+
+
+ view
+ Pérdidas de créditos a corto plazo, otras partes vinculadas
+
+
+
+ 6677
+
+
+ other
+ Pérdidas de créditos a corto plazo, otras partes vinculadas
+
+
+
+ 6678
+
+
+ view
+ Pérdidas de créditos a corto plazo, otras empresas
+
+
+
+ 6678
+
+
+ other
+ Pérdidas de créditos a corto plazo, otras empresas
+
+
+
+ 668
+
+
+ view
+ Diferencias negativas de cambio
+
+
+
+ 668
+
+
+ other
+ Diferencias negativas de cambio
+
+
+
+ 669
+
+
+ view
+ Otros gastos financieros
+
+
+
+ 669
+
+
+ other
+ Otros gastos financieros
+
+
+
+ 67
+
+
+ view
+ Pérdidas procedentes de activos no corrientes y gastos excepcionales
+
+
+
+ 670
+
+
+ view
+ Pérdidas procedentes del inmovilizado intangible
+
+
+
+ 670
+
+
+ other
+ Pérdidas procedentes del inmovilizado intangible
+
+
+
+ 671
+
+
+ view
+ Pérdidas procedentes del inmovilizado material y bienes del Patrimonio Histórico
+
+
+
+ 671
+
+
+ other
+ Pérdidas procedentes del inmovilizado material y bienes del Patrimonio Histórico
+
+
+
+ 672
+
+
+ view
+ Pérdidas procedentes de las inversiones inmobiliarias
+
+
+
+ 672
+
+
+ other
+ Pérdidas procedentes de las inversiones inmobiliarias
+
+
+
+ 673
+
+
+ view
+ Pérdidas procedentes de participaciones en partes vinculadas
+
+
+
+ 6733
+
+
+ view
+ Pérdidas procedentes de participaciones en, empresas del grupo
+
+
+
+ 6733
+
+
+ other
+ Pérdidas procedentes de participaciones en, empresas del grupo
+
+
+
+ 6734
+
+
+ view
+ Pérdidas procedentes de participaciones, empresas asociadas
+
+
+
+ 6734
+
+
+ other
+ Pérdidas procedentes de participaciones, empresas asociadas
+
+
+
+ 6735
+
+
+ view
+ Pérdidas procedentes de participaciones, otras partes vinculadas
+
+
+
+ 6735
+
+
+ other
+ Pérdidas procedentes de participaciones, otras partes vinculadas
+
+
+
+ 675
+
+
+ view
+ Pérdidas por operaciones con obligaciones propias
+
+
+
+ 675
+
+
+ other
+ Pérdidas por operaciones con obligaciones propias
+
+
+
+ 678
+
+
+ view
+ Gastos excepcionales
+
+
+
+ 678
+
+
+ other
+ Gastos excepcionales
+
+
+
+ 68
+
+
+ view
+ Dotaciones para amortizaciones
+
+
+
+ 680
+
+
+ view
+ Amortización del inmovilizado intangible
+
+
+
+ 680
+
+
+ other
+ Amortización del inmovilizado intangible
+
+
+
+ 681
+
+
+ view
+ Amortización del inmovilizado material
+
+
+
+ 681
+
+
+ other
+ Amortización del inmovilizado material
+
+
+
+ 682
+
+
+ view
+ Amortización de las inversiones inmobiliarias
+
+
+
+ 682
+
+
+ other
+ Amortización de las inversiones inmobiliarias
+
+
+
+ 69
+
+
+ view
+ Pérdidas por deterioro y otras dotaciones
+
+
+
+ 690
+
+
+ view
+ Pérdidas por deterioro del inmovilizado intangible
+
+
+
+ 690
+
+
+ other
+ Pérdidas por deterioro del inmovilizado intangible
+
+
+
+ 691
+
+
+ view
+ Pérdidas por deterioro del inmovilizado material y bienes del Patrimonio Histórico
+
+
+
+ 691
+
+
+ other
+ Pérdidas por deterioro del inmovilizado material y bienes del Patrimonio Histórico
+
+
+
+
+ 6910
+
+
+ view
+ Pérdidas por deterioro del inmovilizado material
+
+
+
+
+ 6911
+
+
+ view
+ Pérdidas por deterioro de bienes del Patrimonio Histórico
+
+
+
+ 6911
+
+
+ other
+ Pérdidas por deterioro bienes del Patrimonio Histórico
+
+
+
+
+
+
+ 692
+
+
+ view
+ Pérdidas por deterioro de las inversiones inmobiliarias
+
+
+
+ 692
+
+
+ other
+ Pérdidas por deterioro de las inversiones inmobiliarias
+
+
+
+ 693
+
+
+ view
+ Pérdidas por deterioro de existencias
+
+
+
+ 6930
+
+
+ view
+ Pérdidas por deterioro de productos terminados y en curso de fabricación
+
+
+
+ 6930
+
+
+ other
+ Pérdidas por deterioro de productos terminados y en curso de fabricación
+
+
+
+ 6931
+
+
+ view
+ Pérdidas por deterioro de mercaderías
+
+
+
+ 6931
+
+
+ other
+ Pérdidas por deterioro de mercaderías
+
+
+
+ 6932
+
+
+ view
+ Pérdidas por deterioro de materias primas
+
+
+
+ 6932
+
+
+ other
+ Pérdidas por deterioro de materias primas
+
+
+
+ 6933
+
+
+ view
+ Pérdidas por deterioro de otros aprovisionamientos
+
+
+
+ 6933
+
+
+ other
+ Pérdidas por deterioro de otros aprovisionamientos
+
+
+
+ 694
+
+
+ view
+ Pérdidas por deterioro de créditos por operaciones de la actividad
+
+
+
+ 694
+
+
+ other
+ Pérdidas por deterioro de créditos por operaciones de la actividad
+
+
+
+ 695
+
+
+ view
+ Dotación a la provisión por operaciones comerciales
+
+
+
+ 6954
+
+
+ view
+ Dotación a la provisión por contratos onerosos
+
+
+
+ 6954
+
+
+ other
+ Dotación a la provisión por contratos onerosos
+
+
+
+ 6959
+
+
+ view
+ Dotación a la provisión para otras operaciones comerciales
+
+
+
+ 6959
+
+
+ other
+ Dotación a la provisión para otras operaciones comerciales
+
+
+
+ 696
+
+
+ view
+ Pérdidas por deterioro de participaciones y valores representativos de deuda
+
+
+
+ 6960
+
+
+ view
+ Pérdidas por deterioro de participaciones en instrumentos de patrimonio neto, empresas del grupo
+
+
+
+ 6960
+
+
+ other
+ Pérdidas por deterioro de participaciones en instrumentos de patrimonio neto, empresas del grupo
+
+
+
+ 6961
+
+
+ view
+ Pérdidas por deterioro de participaciones en instrumentos de patrimonio neto, empresas asociadas
+
+
+
+ 6961
+
+
+ other
+ Pérdidas por deterioro de participaciones en instrumentos de patrimonio neto, empresas asociadas
+
+
+
+ 6962
+
+
+ view
+ Pérdidas por deterioro de participaciones en instrumentos de patrimonio neto, otras partes vinculadas
+
+
+
+ 6962
+
+
+ other
+ Pérdidas por deterioro de participaciones en instrumentos de patrimonio neto, otras partes vinculadas
+
+
+
+ 6963
+
+
+ view
+ Pérdidas por deterioro de participaciones en instrumentos de patrimonio neto, otras empresas
+
+
+
+ 6963
+
+
+ other
+ Pérdidas por deterioro de participaciones en instrumentos de patrimonio neto, otras empresas
+
+
+
+ 6965
+
+
+ view
+ Pérdidas por deterioro en valores representativos de deuda, empresas del grupo
+
+
+
+ 6965
+
+
+ other
+ Pérdidas por deterioro en valores representativos de deuda, empresas del grupo
+
+
+
+ 6966
+
+
+ view
+ Pérdidas por deterioro en valores representativos de deuda, empresas asociadas
+
+
+
+ 6966
+
+
+ other
+ Pérdidas por deterioro en valores representativos de deuda, empresas asociadas
+
+
+
+ 6967
+
+
+ view
+ Pérdidas por deterioro en valores representativos de deuda, otras partes vinculadas
+
+
+
+ 6967
+
+
+ other
+ Pérdidas por deterioro en valores representativos de deuda, otras partes vinculadas
+
+
+
+ 6968
+
+
+ view
+ Pérdidas por deterioro en valores representativos de deuda, otras empresas
+
+
+
+ 6968
+
+
+ other
+ Pérdidas por deterioro en valores representativos de deuda, otras empresas
+
+
+
+ 697
+
+
+ view
+ Pérdidas por deterioro de créditos
+
+
+
+ 6970
+
+
+ view
+ Pérdidas por deterioro de créditos, empresas del grupo
+
+
+
+ 6970
+
+
+ other
+ Pérdidas por deterioro de créditos, empresas del grupo
+
+
+
+ 6971
+
+
+ view
+ Pérdidas por deterioro de créditos, empresas asociadas
+
+
+
+ 6971
+
+
+ other
+ Pérdidas por deterioro de créditos, empresas asociadas
+
+
+
+ 6972
+
+
+ view
+ Pérdidas por deterioro de créditos, otras partes vinculadas
+
+
+
+ 6972
+
+
+ other
+ Pérdidas por deterioro de créditos, otras partes vinculadas
+
+
+
+ 6973
+
+
+ view
+ Pérdidas por deterioro de créditos, otras empresas
+
+
+
+ 6973
+
+
+ other
+ Pérdidas por deterioro de créditos, otras empresas
+
+
+
+ 698
+
+
+ view
+ Pérdidas por deterioro de participaciones y valores representativos de deuda a corto plazo
+
+
+
+ 6980
+
+
+ view
+ Pérdidas por deterioro de participaciones en instrumentos de patrimonio neto a corto plazo, empresas del grupo
+
+
+
+ 6980
+
+
+ other
+ Pérdidas por deterioro de participaciones en instrumentos de patrimonio neto a corto plazo, empresas del grupo
+
+
+
+ 6981
+
+
+ view
+ Pérdidas por deterioro de participaciones en instrumentos de patrimonio neto a corto plazo, empresas asociadas
+
+
+
+ 6981
+
+
+ other
+ Pérdidas por deterioro de participaciones en instrumentos de patrimonio neto a corto plazo, empresas asociadas
+
+
+
+ 6985
+
+
+ view
+ Pérdidas por deterioro en valores representativos de deuda a corto plazo, empresas del grupo
+
+
+
+ 6985
+
+
+ other
+ Pérdidas por deterioro en valores representativos de deuda a corto plazo, empresas del grupo
+
+
+
+ 6986
+
+
+ view
+ Pérdidas por deterioro en valores representativos de deuda a corto plazo, empresas asociadas
+
+
+
+ 6986
+
+
+ other
+ Pérdidas por deterioro en valores representativos de deuda a corto plazo, empresas asociadas
+
+
+
+ 6987
+
+
+ view
+ Pérdidas por deterioro en valores representativos de deuda a corto plazo, otras partes vinculadas
+
+
+
+ 6987
+
+
+ other
+ Pérdidas por deterioro en valores representativos de deuda a corto plazo, otras partes vinculadas
+
+
+
+ 6988
+
+
+ view
+ Pérdidas por deterioro en valores representativos de deuda a corto plazo, otras empresas
+
+
+
+ 6988
+
+
+ other
+ Pérdidas por deterioro en valores representativos de deuda a corto plazo, otras empresas
+
+
+
+ 699
+
+
+ view
+ Pérdidas por deterioro de créditos a corto plazo
+
+
+
+ 6990
+
+
+ view
+ Pérdidas por deterioro de créditos a corto plazo, empresas del grupo
+
+
+
+ 6990
+
+
+ other
+ Pérdidas por deterioro de créditos a corto plazo, empresas del grupo
+
+
+
+ 6991
+
+
+ view
+ Pérdidas por deterioro de créditos a corto plazo, empresas asociadas
+
+
+
+ 6991
+
+
+ other
+ Pérdidas por deterioro de créditos a corto plazo, empresas asociadas
+
+
+
+ 6992
+
+
+ view
+ Pérdidas por deterioro de créditos a corto plazo, otras partes vinculadas
+
+
+
+ 6992
+
+
+ other
+ Pérdidas por deterioro de créditos a corto plazo, otras partes vinculadas
+
+
+
+ 6993
+
+
+ view
+ Pérdidas por deterioro de créditos a corto plazo, otras empresas
+
+
+
+ 6993
+
+
+ other
+ Pérdidas por deterioro de créditos a corto plazo, otras empresas
+
+
+
+ 7
+
+
+ view
+ Ventas e ingresos
+
+
+
+ 70
+
+
+ view
+ Ventas de mercaderías, de producción propia, de servicios, etc.
+
+
+
+ 700
+
+
+ view
+ Ventas de mercaderías
+
+
+
+ 7000
+
+
+ view
+ Ventas de mercaderías en España
+
+
+
+ 7000
+
+
+ other
+ Ventas de mercaderías en España
+
+
+
+ 7001
+
+
+ view
+ Ventas de mercaderías Intracomunitarias
+
+
+
+ 7001
+
+
+ other
+ Ventas de mercaderías Intracomunitarias
+
+
+
+ 7002
+
+
+ view
+ Ventas de mercaderías Exportación
+
+
+
+ 7002
+
+
+ other
+ Ventas de mercaderías Exportación
+
+
+
+ 701
+
+
+ view
+ Ventas de productos terminados
+
+
+
+ 7010
+
+
+ view
+ Ventas de productos terminados en España
+
+
+
+ 7010
+
+
+ other
+ Ventas de productos terminados en España
+
+
+
+ 7011
+
+
+ view
+ Ventas de productos terminados Intracomunitarias
+
+
+
+ 7011
+
+
+ other
+ Ventas de productos terminados Intracomunitarias
+
+
+
+ 7012
+
+
+ view
+ Ventas de productos terminados Exportación
+
+
+
+ 7012
+
+
+ other
+ Ventas de productos terminados Exportación
+
+
+
+ 702
+
+
+ view
+ Ventas de productos semiterminados
+
+
+
+ 7020
+
+
+ view
+ Ventas de productos semiterminados en España
+
+
+
+ 7020
+
+
+ other
+ Ventas de productos semiterminados en España
+
+
+
+ 7021
+
+
+ view
+ Ventas de productos semiterminados Intracomunitarias
+
+
+
+ 7021
+
+
+ other
+ Ventas de productos semiterminados Intracomunitarias
+
+
+
+ 7022
+
+
+ view
+ Ventas de productos semiterminados Exportación
+
+
+
+ 7022
+
+
+ other
+ Ventas de productos semiterminados Exportación
+
+
+
+ 703
+
+
+ view
+ Ventas de subproductos y residuos
+
+
+
+ 7030
+
+
+ view
+ Ventas de subproductos y residuos en España
+
+
+
+ 7030
+
+
+ other
+ Ventas de subproductos y residuos en España
+
+
+
+ 7031
+
+
+ view
+ Ventas de subproductos y residuos Intracomunitarias
+
+
+
+ 7031
+
+
+ other
+ Ventas de subproductos y residuos Intracomunitarias
+
+
+
+ 7032
+
+
+ view
+ Ventas de subproductos y residuos Exportación
+
+
+
+ 7032
+
+
+ other
+ Ventas de subproductos y residuos Exportación
+
+
+
+ 704
+
+
+ view
+ Ventas de envases y embalajes
+
+
+
+ 7040
+
+
+ view
+ Ventas de envases y embalajes en España
+
+
+
+ 7040
+
+
+ other
+ Ventas de envases y embalajes en España
+
+
+
+ 7041
+
+
+ view
+ Ventas de envases y embalajes Intracomunitarias
+
+
+
+ 7041
+
+
+ other
+ Ventas de envases y embalajes Intracomunitarias
+
+
+
+ 7042
+
+
+ view
+ Ventas de envases y embalajes Exportación
+
+
+
+ 7042
+
+
+ other
+ Ventas de envases y embalajes Exportación
+
+
+
+ 705
+
+
+ view
+ Prestaciones de servicios
+
+
+
+ 7050
+
+
+ view
+ Prestaciones de servicios en España
+
+
+
+ 7050
+
+
+ other
+ Prestaciones de servicios en España
+
+
+
+ 7051
+
+
+ view
+ Prestaciones de servicios Intracomunitarias
+
+
+
+ 7051
+
+
+ other
+ Prestaciones de servicios Intracomunitarias
+
+
+
+ 7052
+
+
+ view
+ Prestaciones de servicios fuera de la UE
+
+
+
+ 7052
+
+
+ other
+ Prestaciones de servicios fuera de la UE
+
+
+
+ 706
+
+
+ view
+ Descuentos sobre ventas por pronto pago
+
+
+
+ 7060
+
+
+ view
+ Descuentos sobre ventas por pronto pago de mercaderías
+
+
+
+ 7060
+
+
+ other
+ Descuentos sobre ventas por pronto pago de mercaderías
+
+
+
+ 7061
+
+
+ view
+ Descuentos sobre ventas por pronto pago de productos terminados
+
+
+
+ 7061
+
+
+ other
+ Descuentos sobre ventas por pronto pago de productos terminados
+
+
+
+ 7062
+
+
+ view
+ Descuentos sobre ventas por pronto pago de productos semiterminados
+
+
+
+ 7062
+
+
+ other
+ Descuentos sobre ventas por pronto pago de productos semiterminados
+
+
+
+ 7063
+
+
+ view
+ Descuentos sobre ventas por pronto pago de subproductos y residuos
+
+
+
+ 7063
+
+
+ other
+ Descuentos sobre ventas por pronto pago de subproductos y residuos
+
+
+
+ 708
+
+
+ view
+ Devoluciones de ventas y operaciones similares
+
+
+
+ 7080
+
+
+ view
+ Devoluciones de ventas de mercaderías
+
+
+
+ 7080
+
+
+ other
+ Devoluciones de ventas de mercaderías
+
+
+
+ 7081
+
+
+ view
+ Devoluciones de ventas de productos terminados
+
+
+
+ 7081
+
+
+ other
+ Devoluciones de ventas de productos terminados
+
+
+
+ 7082
+
+
+ view
+ Devoluciones de ventas de productos semiterminados
+
+
+
+ 7082
+
+
+ other
+ Devoluciones de ventas de productos semiterminados
+
+
+
+ 7083
+
+
+ view
+ Devoluciones de ventas de subproductos y residuos
+
+
+
+ 7083
+
+
+ other
+ Devoluciones de ventas de subproductos y residuos
+
+
+
+ 7084
+
+
+ view
+ Devoluciones de ventas de envases y embalajes
+
+
+
+ 7084
+
+
+ other
+ Devoluciones de ventas de envases y embalajes
+
+
+
+ 709
+
+
+ view
+ "Rappels" sobre ventas
+
+
+
+ 7090
+
+
+ view
+ "Rappels" sobre ventas de mercaderías
+
+
+
+ 7090
+
+
+ other
+ "Rappels" sobre ventas de mercaderías
+
+
+
+ 7091
+
+
+ view
+ "Rappels" sobre ventas de productos terminados
+
+
+
+ 7091
+
+
+ other
+ "Rappels" sobre ventas de productos terminados
+
+
+
+ 7092
+
+
+ view
+ "Rappels" sobre ventas de productos semiterminados
+
+
+
+ 7092
+
+
+ other
+ "Rappels" sobre ventas de productos semiterminados
+
+
+
+ 7093
+
+
+ view
+ "Rappels" sobre ventas de subproductos y residuos
+
+
+
+ 7093
+
+
+ other
+ "Rappels" sobre ventas de subproductos y residuos
+
+
+
+ 7094
+
+
+ view
+ "Rappels" sobre ventas de envases y embalajes
+
+
+
+ 7094
+
+
+ other
+ "Rappels" sobre ventas de envases y embalajes
+
+
+
+ 71
+
+
+ view
+ Variación de existencias
+
+
+
+ 710
+
+
+ view
+ Variación de existencias de productos en curso
+
+
+
+ 710
+
+
+ other
+ Variación de existencias de productos en curso
+
+
+
+ 711
+
+
+ view
+ Variación de existencias de productos semiterminados
+
+
+
+ 711
+
+
+ other
+ Variación de existencias de productos semiterminados
+
+
+
+ 712
+
+
+ view
+ Variación de existencias de productos terminados
+
+
+
+ 712
+
+
+ other
+ Variación de existencias de productos terminados
+
+
+
+ 713
+
+
+ view
+ Variación de existencias de subproductos, residuos y materiales recuperados
+
+
+
+ 713
+
+
+ other
+ Variación de existencias de subproductos, residuos y materiales recuperados
+
+
+
+ 72
+
+
+ view
+ Ingresos propios de la entidad
+
+
+
+ 720
+
+
+ view
+ Cuotas de asociados y afiliados
+
+
+
+ 720
+
+
+ other
+ Cuotas de asociados y afiliados
+
+
+
+
+ 721
+
+
+ view
+ Cuotas de usuarios
+
+
+
+ 721
+
+
+ other
+ Cuotas de usuarios
+
+
+
+
+ 722
+
+
+ view
+ Promociones de captación de recursos
+
+
+
+ 722
+
+
+ other
+ Promociones de captación de recursos
+
+
+
+
+ 723
+
+
+ view
+ Ingresos de patrocinadores y colaboraciones
+
+
+
+ 7230
+
+
+ view
+ Patrocinio
+
+
+
+ 7230
+
+
+ other
+ Patrocinio
+
+
+
+
+ 7231
+
+
+ view
+ Patrocinio publicitario
+
+
+
+ 7231
+
+
+ other
+ Patrocinio publicitario
+
+
+
+
+
+ 7233
+
+
+ view
+ Colaboraciones empresariales
+
+
+
+ 7233
+
+
+ other
+ Colaboraciones empresariales
+
+
+
+
+
+
+ 728
+
+
+ view
+ Ingresos por reintegro de ayudas y asignaciones
+
+
+
+ 728
+
+
+ other
+ Ingresos por reintegro de ayudas y asignaciones
+
+
+
+
+
+
+ 73
+
+
+ view
+ Trabajos realizados para la empresa
+
+
+
+ 730
+
+
+ view
+ Trabajos realizados para el inmovilizado intangible
+
+
+
+ 730
+
+
+ other
+ Trabajos realizados para el inmovilizado intangible
+
+
+
+ 731
+
+
+ view
+ Trabajos realizados para el inmovilizado material
+
+
+
+ 731
+
+
+ other
+ Trabajos realizados para el inmovilizado material
+
+
+
+ 732
+
+
+ view
+ Trabajos realizados en inversiones inmobiliarias
+
+
+
+ 732
+
+
+ other
+ Trabajos realizados en inversiones inmobiliarias
+
+
+
+ 733
+
+
+ view
+ Trabajos realizados para el inmovilizado material en curso
+
+
+
+ 733
+
+
+ other
+ Trabajos realizados para el inmovilizado material en curso
+
+
+
+ 74
+
+
+ view
+ Subvenciones, donaciones y legados
+
+
+
+ 740
+
+
+ view
+ Subvenciones, donaciones y legados a la explotación
+
+
+
+ 740
+
+
+ other
+ Subvenciones, donaciones y legados a la explotación
+
+
+
+ 746
+
+
+ view
+ Subvenciones, donaciones y legados de capital transferidos al resultado del ejercicio
+
+
+
+ 746
+
+
+ other
+ Subvenciones, donaciones y legados de capital transferidos al resultado del ejercicio
+
+
+
+ 747
+
+
+ view
+ Otras subvenciones, donaciones y legados transferidos al resultado del ejercicio
+
+
+
+ 747
+
+
+ other
+ Otras subvenciones, donaciones y legados transferidos al resultado del ejercicio
+
+
+
+ 75
+
+
+ view
+ Otros ingresos de gestión
+
+
+
+ 751
+
+
+ view
+ Resultados de operaciones en común
+
+
+
+ 7510
+
+
+ view
+ Pérdida transferido (gestor)
+
+
+
+ 7510
+
+
+ other
+ Pérdida transferido (gestor)
+
+
+
+ 7511
+
+
+ view
+ Beneficio atribuido (partícipe o asociado no gestor)
+
+
+
+ 7511
+
+
+ other
+ Beneficio atribuido (partícipe o asociado no gestor)
+
+
+
+ 752
+
+
+ view
+ Ingresos por arrendamientos
+
+
+
+ 752
+
+
+ other
+ Ingresos por arrendamientos
+
+
+
+ 753
+
+
+ view
+ Ingresos de propiedad industrial cedida en explotación
+
+
+
+ 753
+
+
+ other
+ Ingresos de propiedad industrial cedida en explotación
+
+
+
+ 754
+
+
+ view
+ Ingresos por comisiones
+
+
+
+ 754
+
+
+ other
+ Ingresos por comisiones
+
+
+
+ 755
+
+
+ view
+ Ingresos por servicios al personal
+
+
+
+ 755
+
+
+ other
+ Ingresos por servicios al personal
+
+
+
+ 759
+
+
+ view
+ Ingresos por servicios diversos
+
+
+
+ 759
+
+
+ other
+ Ingresos por servicios diversos
+
+
+
+ 76
+
+
+ view
+ Ingresos financieros
+
+
+
+ 760
+
+
+ view
+ Ingresos de participaciones en instrumentos de patrimonio
+
+
+
+ 7600
+
+
+ view
+ Ingresos de participaciones en instrumentos de patrimonio, empresas del grupo
+
+
+
+ 7600
+
+
+ other
+ Ingresos de participaciones en instrumentos de patrimonio, empresas del grupo
+
+
+
+ 7601
+
+
+ view
+ Ingresos de participaciones en instrumentos de patrimonio, empresas asociadas
+
+
+
+ 7601
+
+
+ other
+ Ingresos de participaciones en instrumentos de patrimonio, empresas asociadas
+
+
+
+ 7602
+
+
+ view
+ Ingresos de participaciones en instrumentos de patrimonio, otras partes vinculadas
+
+
+
+ 7602
+
+
+ other
+ Ingresos de participaciones en instrumentos de patrimonio, otras partes vinculadas
+
+
+
+ 7603
+
+
+ view
+ Ingresos de participaciones en instrumentos de patrimonio, otras empresas
+
+
+
+ 7603
+
+
+ other
+ Ingresos de participaciones en instrumentos de patrimonio, otras empresas
+
+
+
+ 761
+
+
+ view
+ Ingresos de valores representativos de deuda
+
+
+
+ 7610
+
+
+ view
+ Ingresos de valores representativos de deuda, empresas del grupo
+
+
+
+ 7610
+
+
+ other
+ Ingresos de valores representativos de deuda, empresas del grupo
+
+
+
+ 7611
+
+
+ view
+ Ingresos de valores representativos de deuda, empresas asociadas
+
+
+
+ 7611
+
+
+ other
+ Ingresos de valores representativos de deuda, empresas asociadas
+
+
+
+ 7612
+
+
+ view
+ Ingresos de valores representativos de deuda, otras partes vinculadas
+
+
+
+ 7612
+
+
+ other
+ Ingresos de valores representativos de deuda, otras partes vinculadas
+
+
+
+ 7613
+
+
+ view
+ Ingresos de valores representativos de deuda, otras empresas
+
+
+
+ 7613
+
+
+ other
+ Ingresos de valores representativos de deuda, otras empresas
+
+
+
+ 762
+
+
+ view
+ Ingresos de créditos
+
+
+
+ 7620
+
+
+ view
+ Ingresos de créditos a largo plazo
+
+
+
+ 76200
+
+
+ view
+ Ingresos de créditos a largo plazo, empresas del grupo
+
+
+
+ 76200
+
+
+ other
+ Ingresos de créditos a largo plazo, empresas del grupo
+
+
+
+ 76201
+
+
+ view
+ Ingresos de créditos a largo plazo, empresas asociadas
+
+
+
+ 76201
+
+
+ other
+ Ingresos de créditos a largo plazo, empresas asociadas
+
+
+
+ 76202
+
+
+ view
+ Ingresos de créditos a largo plazo, otras partes vinculadas
+
+
+
+ 76202
+
+
+ other
+ Ingresos de créditos a largo plazo, otras partes vinculadas
+
+
+
+ 76203
+
+
+ view
+ Ingresos de créditos a largo plazo, otras empresas
+
+
+
+ 76203
+
+
+ other
+ Ingresos de créditos a largo plazo, otras empresas
+
+
+
+ 7621
+
+
+ view
+ Ingresos de créditos a corto plazo
+
+
+
+ 76210
+
+
+ view
+ Ingresos de créditos a corto plazo, empresas del grupo
+
+
+
+ 76210
+
+
+ other
+ Ingresos de créditos a corto plazo, empresas del grupo
+
+
+
+ 76211
+
+
+ view
+ Ingresos de créditos a corto plazo, empresas asociadas
+
+
+
+ 76211
+
+
+ other
+ Ingresos de créditos a corto plazo, empresas asociadas
+
+
+
+ 76212
+
+
+ view
+ Ingresos de créditos a corto plazo, otras partes vinculadas
+
+
+
+ 76212
+
+
+ other
+ Ingresos de créditos a corto plazo, otras partes vinculadas
+
+
+
+ 76213
+
+
+ view
+ Ingresos de créditos a corto plazo, otras empresas
+
+
+
+ 76213
+
+
+ other
+ Ingresos de créditos a corto plazo, otras empresas
+
+
+
+ 763
+
+
+ view
+ Beneficios por valoración de activos y pasivos financieros por su valor razonable
+
+
+
+ 763
+
+
+ other
+ Beneficios por valoración de activos y pasivos financieros por su valor razonable
+
+
+
+ 766
+
+
+ view
+ Beneficios en participaciones y valores representativos de deuda
+
+
+
+ 7660
+
+
+ view
+ Beneficios en valores representativos de deuda a largo plazo, empresas del grupo
+
+
+
+ 7660
+
+
+ other
+ Beneficios en valores representativos de deuda a largo plazo, empresas del grupo
+
+
+
+ 7661
+
+
+ view
+ Beneficios en valores representativos de deuda a largo plazo, empresas asociadas
+
+
+
+ 7661
+
+
+ other
+ Beneficios en valores representativos de deuda a largo plazo, empresas asociadas
+
+
+
+ 7662
+
+
+ view
+ Beneficios en valores representativos de deuda a largo plazo, otras partes vinculadas
+
+
+
+ 7662
+
+
+ other
+ Beneficios en valores representativos de deuda a largo plazo, otras partes vinculadas
+
+
+
+ 7663
+
+
+ view
+ Beneficios en valores representativos de deuda a largo plazo, otras empresas
+
+
+
+ 7663
+
+
+ other
+ Beneficios en valores representativos de deuda a largo plazo, otras empresas
+
+
+
+ 7665
+
+
+ view
+ Beneficios en valores representativos de deuda a corto plazo, empresas del grupo
+
+
+
+ 7665
+
+
+ other
+ Beneficios en valores representativos de deuda a corto plazo, empresas del grupo
+
+
+
+ 7666
+
+
+ view
+ Beneficios en valores representativos de deuda a corto plazo, empresas asociadas
+
+
+
+ 7666
+
+
+ other
+ Beneficios en valores representativos de deuda a corto plazo, empresas asociadas
+
+
+
+ 7667
+
+
+ view
+ Beneficios en valores representativos de deuda a corto plazo, otras partes vinculadas
+
+
+
+ 7667
+
+
+ other
+ Beneficios en valores representativos de deuda a corto plazo, otras partes vinculadas
+
+
+
+ 7668
+
+
+ view
+ Beneficios en valores representativos de deuda a corto plazo, otras empresas
+
+
+
+ 7668
+
+
+ other
+ Beneficios en valores representativos de deuda a corto plazo, otras empresas
+
+
+
+ 768
+
+
+ view
+ Diferencias positivas de cambio
+
+
+
+ 768
+
+
+ other
+ Diferencias positivas de cambio
+
+
+
+ 769
+
+
+ view
+ Otros ingresos financieros
+
+
+
+ 769
+
+
+ other
+ Otros ingresos financieros
+
+
+
+ 77
+
+
+ view
+ Beneficios procedentes de activos no corrientes e ingresos excepcionales
+
+
+
+ 770
+
+
+ view
+ Beneficios procedentes del inmovilizado intangible
+
+
+
+ 770
+
+
+ other
+ Beneficios procedentes del inmovilizado intangible
+
+
+
+ 771
+
+
+ view
+ Beneficios procedentes del inmovilizado material
+
+
+
+ 771
+
+
+ other
+ Beneficios procedentes del inmovilizado material
+
+
+
+ 772
+
+
+ view
+ Beneficios procedentes de las inversiones inmobiliarias
+
+
+
+ 772
+
+
+ other
+ Beneficios procedentes de las inversiones inmobiliarias
+
+
+
+ 773
+
+
+ view
+ Beneficios procedentes de participaciones a largo plazo en partes vinculadas
+
+
+
+ 7733
+
+
+ view
+ Beneficios procedentes de participaciones a largo plazo en, empresas del grupo
+
+
+
+ 7733
+
+
+ other
+ Beneficios procedentes de participaciones a largo plazo en, empresas del grupo
+
+
+
+ 7734
+
+
+ view
+ Beneficios procedentes de participaciones a largo plazo, empresas asociadas
+
+
+
+ 7734
+
+
+ other
+ Beneficios procedentes de participaciones a largo plazo, empresas asociadas
+
+
+
+ 7735
+
+
+ view
+ Beneficios procedentes de participaciones a largo plazo, otras partes vinculadas
+
+
+
+ 7735
+
+
+ other
+ Beneficios procedentes de participaciones a largo plazo, otras partes vinculadas
+
+
+
+ 775
+
+
+ view
+ Beneficos por operaciones con obligaciones propias
+
+
+
+ 775
+
+
+ other
+ Beneficos por operaciones con obligaciones propias
+
+
+
+ 778
+
+
+ view
+ Ingresos excepcionales
+
+
+
+ 778
+
+
+ other
+ Ingresos excepcionales
+
+
+
+ 79
+
+
+ view
+ Excesos y aplicaciones de provisiones y de pérdidas por deterioro
+
+
+
+ 790
+
+
+ view
+ Reversión del deterioro del inmovilizado intangible
+
+
+
+ 790
+
+
+ other
+ Reversión del deterioro del inmovilizado intangible
+
+
+
+ 791
+
+
+ view
+ Reversión del deterioro del inmovilizado material y de bienes del Patrimonio Histórico
+
+
+
+ 791
+
+
+ other
+ Reversión del deterioro del inmovilizado material y de bienes del Patrimonio Histórico
+
+
+
+ 792
+
+
+ view
+ Reversión del deterioro de las inversiones inmobiliarias
+
+
+
+ 792
+
+
+ other
+ Reversión del deterioro de las inversiones inmobiliarias
+
+
+
+ 793
+
+
+ view
+ Reversión del deterioro de existencias
+
+
+
+ 7930
+
+
+ view
+ Reversión del deterioro de productos terminados y en curso de fabricación
+
+
+
+ 7930
+
+
+ other
+ Reversión del deterioro de productos terminados y en curso de fabricación
+
+
+
+ 7931
+
+
+ view
+ Reversión del deterioro de mercaderías
+
+
+
+ 7931
+
+
+ other
+ Reversión del deterioro de mercaderías
+
+
+
+ 7932
+
+
+ view
+ Reversión del deterioro de materias primas
+
+
+
+ 7932
+
+
+ other
+ Reversión del deterioro de materias primas
+
+
+
+ 7933
+
+
+ view
+ Reversión del deterioro de otros aprovisionamientos
+
+
+
+ 7933
+
+
+ other
+ Reversión del deterioro de otros aprovisionamientos
+
+
+
+ 794
+
+
+ view
+ Reversión del deterioro de créditos por operaciones de la actividad
+
+
+
+ 794
+
+
+ other
+ Reversión del deterioro de créditos por operaciones de la actividad
+
+
+
+ 795
+
+
+ view
+ Exceso de provisiones
+
+
+
+ 7951
+
+
+ view
+ Exceso de provisión para impuestos
+
+
+
+ 7951
+
+
+ other
+ Exceso de provisión para impuestos
+
+
+
+ 7952
+
+
+ view
+ Exceso de provisión para otras responsabilidades
+
+
+
+ 7952
+
+
+ other
+ Exceso de provisión para otras responsabilidades
+
+
+
+ 7954
+
+
+ view
+ Exceso de provisión por operaciones comerciales
+
+
+
+ 79544
+
+
+ view
+ Exceso de provisión por contratos onerosos
+
+
+
+ 79544
+
+
+ other
+ Exceso de provisión por contratos onerosos
+
+
+
+ 79549
+
+
+ view
+ Exceso de provisión para otras operaciones comerciales
+
+
+
+ 79549
+
+
+ other
+ Exceso de provisión para otras operaciones comerciales
+
+
+
+ 7955
+
+
+ view
+ Exceso de provisión para actuaciones medioambientales
+
+
+
+ 7955
+
+
+ other
+ Exceso de provisión para actuaciones medioambientales
+
+
+
+ 796
+
+
+ view
+ Reversión del deterioro de participaciones y valores representativos de deuda a largo plazo
+
+
+
+ 7960
+
+
+ view
+ Reversión del deterioro de participaciones en instrumentos de patrimonio neto a largo plazo, empresas del grupo
+
+
+
+ 7960
+
+
+ other
+ Reversión del deterioro de participaciones en instrumentos de patrimonio neto a largo plazo, empresas del grupo
+
+
+
+ 7961
+
+
+ view
+ Reversión del deterioro de participaciones en instrumentos de patrimonio neto a largo plazo, empresas asociadas
+
+
+
+ 7961
+
+
+ other
+ Reversión del deterioro de participaciones en instrumentos de patrimonio neto a largo plazo, empresas asociadas
+
+
+
+ 7962
+
+
+ view
+ Reversión del deterioro de participaciones en instrumentos de patrimonio neto a largo plazo, otras partes vinculadas
+
+
+
+ 7962
+
+
+ other
+ Reversión del deterioro de participaciones en instrumentos de patrimonio neto a largo plazo, otras partes vinculadas
+
+
+
+ 7963
+
+
+ view
+ Reversión del deterioro de participaciones en instrumentos de patrimonio neto a largo plazo, otras empresas
+
+
+
+ 7963
+
+
+ other
+ Reversión del deterioro de participaciones en instrumentos de patrimonio neto a largo plazo, otras empresas
+
+
+
+ 7965
+
+
+ view
+ Reversión del deterioro de valores representativos de deuda a largo plazo, empresas del grupo
+
+
+
+ 7965
+
+
+ other
+ Reversión del deterioro de valores representativos de deuda a largo plazo, empresas del grupo
+
+
+
+ 7966
+
+
+ view
+ Reversión del deterioro de valores representativos de deuda a largo plazo, empresas asociadas
+
+
+
+ 7966
+
+
+ other
+ Reversión del deterioro de valores representativos de deuda a largo plazo, empresas asociadas
+
+
+
+ 7967
+
+
+ view
+ Reversión del deterioro de valores representativos de deuda a largo plazo, otras partes vinculadas
+
+
+
+ 7967
+
+
+ other
+ Reversión del deterioro de valores representativos de deuda a largo plazo, otras partes vinculadas
+
+
+
+ 7968
+
+
+ view
+ Reversión del deterioro de valores representativos de deuda a largo plazo, otras empresas
+
+
+
+ 7968
+
+
+ other
+ Reversión del deterioro de valores representativos de deuda a largo plazo, otras empresas
+
+
+
+ 797
+
+
+ view
+ Reversión del deterioro de créditos a largo plazo
+
+
+
+ 7970
+
+
+ view
+ Reversión del deterioro de créditos a largo plazo, empresas del grupo
+
+
+
+ 7970
+
+
+ other
+ Reversión del deterioro de créditos a largo plazo, empresas del grupo
+
+
+
+ 7971
+
+
+ view
+ Reversión del deterioro de créditos a largo plazo, empresas asociadas
+
+
+
+ 7971
+
+
+ other
+ Reversión del deterioro de créditos a largo plazo, empresas asociadas
+
+
+
+ 7972
+
+
+ view
+ Reversión del deterioro de créditos a largo plazo, otras partes vinculadas
+
+
+
+ 7972
+
+
+ other
+ Reversión del deterioro de créditos a largo plazo, otras partes vinculadas
+
+
+
+ 7973
+
+
+ view
+ Reversión del deterioro de créditos a largo plazo, otras empresas
+
+
+
+ 7973
+
+
+ other
+ Reversión del deterioro de créditos a largo plazo, otras empresas
+
+
+
+ 798
+
+
+ view
+ Reversión del deterioro de participaciones y valores representativos de deuda a corto plazo
+
+
+
+ 7980
+
+
+ view
+ Reversión del deterioro de participaciones en instrumentos de patrimonio neto a corto plazo, empresas del grupo
+
+
+
+ 7980
+
+
+ other
+ Reversión del deterioro de participaciones en instrumentos de patrimonio neto a corto plazo, empresas del grupo
+
+
+
+ 7981
+
+
+ view
+ Reversión del deterioro de participaciones en instrumentos de patrimonio neto a corto plazo, empresas asociadas
+
+
+
+ 7981
+
+
+ other
+ Reversión del deterioro de participaciones en instrumentos de patrimonio neto a corto plazo, empresas asociadas
+
+
+
+ 7985
+
+
+ view
+ Reversión del deterioro de valores representativos de deuda a corto plazo, empresas del grupo
+
+
+
+ 7985
+
+
+ other
+ Reversión del deterioro de valores representativos de deuda a corto plazo, empresas del grupo
+
+
+
+ 7986
+
+
+ view
+ Reversión del deterioro de valores representativos de deuda a corto plazo, empresas asociadas
+
+
+
+ 7986
+
+
+ other
+ Reversión del deterioro de valores representativos de deuda a corto plazo, empresas asociadas
+
+
+
+ 7987
+
+
+ view
+ Reversión del deterioro de valores representativos de deuda a corto plazo, otras partes vinculadas
+
+
+
+ 7987
+
+
+ other
+ Reversión del deterioro de valores representativos de deuda a corto plazo, otras partes vinculadas
+
+
+
+ 7988
+
+
+ view
+ Reversión del deterioro de valores representativos de deuda a corto plazo, otras empresas
+
+
+
+ 7988
+
+
+ other
+ Reversión del deterioro de valores representativos de deuda a corto plazo, otras empresas
+
+
+
+ 799
+
+
+ view
+ Reversión del deterioro de créditos a corto plazo
+
+
+
+ 7990
+
+
+ view
+ Reversión del deterioro de créditos a corto plazo, empresas del grupo
+
+
+
+ 7990
+
+
+ other
+ Reversión del deterioro de créditos a corto plazo, empresas del grupo
+
+
+
+ 7991
+
+
+ view
+ Reversión del deterioro de créditos a corto plazo, empresas asociadas
+
+
+
+ 7991
+
+
+ other
+ Reversión del deterioro de créditos a corto plazo, empresas asociadas
+
+
+
+ 7992
+
+
+ view
+ Reversión del deterioro de créditos a corto plazo, otras partes vinculadas
+
+
+
+ 7992
+
+
+ other
+ Reversión del deterioro de créditos a corto plazo, otras partes vinculadas
+
+
+
+ 7993
+
+
+ view
+ Reversión del deterioro de créditos a corto plazo, otras empresas
+
+
+
+ 7993
+
+
+ other
+ Reversión del deterioro de créditos a corto plazo, otras empresas
+
+
+
+
+
+
+ Plantilla Plan de Impuestos ASSOC
+
+
+
+
+
+ Plantilla PGCE Asociaciones 2008
+
+
+
+
+
+
+
+
+
+
+
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 @@
-
+
+ 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 -->
+
+
-
Régimen Nacional
@@ -32,6 +36,16 @@
+
+ Retención IRPF 21%
+
+
+
+
+ Retención IRPF 20%
+
+
+
Retención IRPF 19%
@@ -47,6 +61,11 @@
+
+ Retención IRPF 9%
+
+
+
Retención IRPF 7%
@@ -68,6 +87,54 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -78,7 +145,7 @@
-
+
@@ -90,35 +157,15 @@
-
+
-
-
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -138,6 +185,12 @@
+
+
+
+
+
+
@@ -148,29 +201,24 @@
+
+
+
+
+
-
+
-
-
+
+
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -178,30 +226,71 @@
+
+
+
-
+
+
-
-
+
+
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -215,27 +304,87 @@
-
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -260,42 +409,188 @@
-
+
-
-
+
+
-
+
-
-
-
-
-
-
-
-
+
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -372,7 +667,310 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -386,18 +984,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
@@ -410,6 +996,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -434,6 +1044,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
@@ -446,18 +1068,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
@@ -470,6 +1080,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -495,6 +1129,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
@@ -508,6 +1154,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -520,18 +1190,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
@@ -556,6 +1214,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
@@ -568,6 +1238,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -580,18 +1274,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
@@ -616,7 +1298,19 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -630,18 +1324,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
@@ -654,6 +1336,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -678,6 +1384,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
@@ -690,18 +1408,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
@@ -714,6 +1420,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -738,7 +1468,142 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -752,18 +1617,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
@@ -776,6 +1629,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -800,6 +1677,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
@@ -812,6 +1701,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -824,18 +1737,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
@@ -862,6 +1763,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
@@ -874,18 +1787,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
@@ -898,6 +1799,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -922,6 +1847,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
@@ -934,18 +1871,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
@@ -958,6 +1883,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -984,6 +1933,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -996,18 +1958,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1020,6 +1970,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1044,6 +2018,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1056,18 +2042,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1080,6 +2054,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1104,5 +2102,222 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
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 @@
+
+
+
+
+
+
+
+ Régimen Nacional
+
+
+
+
+ Recargo de Equivalencia
+
+
+
+
+ Régimen Extracomunitario
+
+
+
+
+ Régimen Intracomunitario
+
+
+
+
+ Retención IRPF 21%
+
+
+
+
+ Retención IRPF 20%
+
+
+
+
+ Retención IRPF 19%
+
+
+
+
+ Retención IRPF 18%
+
+
+
+
+ Retención IRPF 15%
+
+
+
+
+ Retención IRPF 9%
+
+
+
+
+ Retención IRPF 7%
+
+
+
+
+ Retención IRPF 2%
+
+
+
+
+ Retención IRPF 1%
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
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 @@
-
+
+ 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 -->
+
+
-
Régimen Nacional
@@ -59,6 +63,16 @@
+
+ Retención IRPF 21%
+
+
+
+
+ Retención IRPF 20%
+
+
+
Retención IRPF 19%
@@ -74,6 +88,11 @@
+
+ Retención IRPF 9%
+
+
+
Retención IRPF 7%
@@ -94,26 +113,16 @@
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -121,30 +130,69 @@
+
+
+
-
+
+
-
-
+
+
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -164,6 +212,12 @@
+
+
+
+
+
+
@@ -175,8 +229,62 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -198,35 +306,15 @@
-
+
-
-
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -246,6 +334,12 @@
+
+
+
+
+
+
@@ -257,30 +351,24 @@
+
+
+
+
+
+
-
+
-
-
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -294,7 +382,7 @@
-
+
@@ -307,16 +395,220 @@
-
+
-
-
+
+
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -395,9 +687,312 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -410,18 +1005,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
@@ -434,6 +1017,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -458,6 +1065,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
@@ -470,6 +1089,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -482,18 +1125,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
@@ -520,6 +1151,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
@@ -532,18 +1175,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
@@ -556,6 +1187,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -580,6 +1235,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
@@ -592,18 +1259,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
@@ -616,6 +1271,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -642,6 +1321,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
@@ -654,18 +1345,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
@@ -678,6 +1357,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -702,6 +1405,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
@@ -714,18 +1429,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
@@ -738,6 +1441,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -762,8 +1489,142 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -776,18 +1637,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
@@ -800,6 +1649,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -824,6 +1697,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
@@ -836,6 +1721,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -848,17 +1757,6 @@
-
-
-
-
-
-
-
-
-
-
-
@@ -886,6 +1784,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
@@ -898,18 +1808,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
@@ -922,6 +1820,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -946,6 +1868,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
@@ -958,18 +1892,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
@@ -982,6 +1904,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1008,6 +1954,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1020,18 +1978,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1044,6 +1990,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1068,6 +2038,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1080,6 +2062,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1092,18 +2098,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1128,5 +2122,222 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
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 @@
-
-
-
+
+
-
+
+ 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
+
+ -->
+
+
-
-
+
+
-
+
@@ -28,46 +40,102 @@
1.0
-
-
-
+
+
+
+ Base adquisiciones exentas
+
+ --
+ 1.0
+
+
+
+ Base ventas exentas
+ --
+
+ 1.0
+
+
+
+
+
+ IVA Soportado exento (operaciones corrientes)
+
+ percent
+
+
+
+
+
+
+ purchase
+
+
+
+
+
+ IVA Exento
+
+ percent
+
+
+
+
+
+
+ sale
+
+
-
+
Régimen general IVA Devengado. Base Imponible 4%[01]1.0
-
+
Régimen general IVA Devengado. Base Imponible 7%[04]1.0
-
+
Régimen general IVA Devengado. Base Imponible 8%[04]1.0
-
+
+
+ Régimen general IVA Devengado. Base Imponible 10%
+ [04]
+
+ 1.0
+
+
Régimen general IVA Devengado. Base Imponible 16%[07]1.0
-
+
Régimen general IVA Devengado. Base Imponible 18%[07]1.0
-
+
+ Régimen general IVA Devengado. Base Imponible 21%
+ [07]
+
+ 1.0
+
+
-
+
Recargo Equivalencia Base Imponible 0.5%[10]1.0
-
+
Recargo Equivalencia Base Imponible 1%[13]1.0
-
+
+
+ Recargo Equivalencia Base Imponible 1.4%
+ [13]
+
+ 1.0
+
+
Recargo Equivalencia Base Imponible 4%[16]1.0
-
-
+
+
+ Recargo Equivalencia Base Imponible 5.2%
+ [16]
+
+ 1.0
+
+
-
+
Adquisiciones intracomunitarias. Base Imponible[19]1.0
-
+
-
-
+
+
-
-
+
+
IVA Cuota total devengada[21]1.0
-
+
Régimen general IVA Devengado. Cuota 4%[03]1.0
-
+
Régimen general IVA Devengado. Cuota 7%[06]1.0
-
+
Régimen general IVA Devengado. Cuota 8%[06]1.0
-
+
+
+ Régimen general IVA Devengado. Cuota 10%
+ [06]
+
+ 1.0
+
+
Régimen general IVA Devengado. Cuota 16%[09]
@@ -155,7 +243,14 @@
1.0
-
+
+
+ Régimen general IVA Devengado. Cuota 21%
+ [09]
+
+ 1.0
+
+
-
+
Recargo Equivalencia. Cuota 0.5%[12]1.0
-
+
Recargo Equivalencia. Cuota 1%[15]1.0
-
+
+
+ Recargo Equivalencia. Cuota 1.4%
+ [15]
+
+ 1.0
+
+
Recargo Equivalencia. Cuota 4%[18]1.0
-
-
+
+
+ Recargo Equivalencia. Cuota 5.2%
+ [18]
+
+ 1.0
+
+
+
-
+
Adquisiciones intracomunitarias. Cuota[20]1.0
-
-
-
-
-
+
+
+
+
+
-
-
+
+
@@ -212,7 +321,7 @@
1.0
-
+
Base operaciones interiores corrientes
@@ -220,19 +329,12 @@
1.0
-
- Base operaciones interiores corrientes (16%)
+
+ Base operaciones interiores corrientes (4%)--1.0
-
- Base operaciones interiores corrientes (18%)
- --
-
- 1.0
-
-
Base operaciones interiores corrientes (7%)--
@@ -245,13 +347,30 @@
1.0
-
- Base operaciones interiores corrientes (4%)
+
+ Base operaciones interiores corrientes (10%)
+ --
+
+ 1.0
+
+
+ Base operaciones interiores corrientes (16%)
+ --
+
+ 1.0
+
+
+ Base operaciones interiores corrientes (18%)
+ --
+
+ 1.0
+
+
+ Base operaciones interiores corrientes (21%)--1.0
-
Base operaciones interiores bienes inversión
@@ -259,19 +378,12 @@
1.0
-
- Base operaciones interiores bienes inversión (16%)
+
+ Base operaciones interiores bienes inversión (4%)--1.0
-
- Base operaciones interiores bienes inversión (18%)
- --
-
- 1.0
-
-
Base operaciones interiores bienes inversión (7%)--
@@ -284,14 +396,31 @@
1.0
-
- Base operaciones interiores bienes inversión (4%)
+
+ Base operaciones interiores bienes inversión (10%)--1.0
-
-
+
+ Base operaciones interiores bienes inversión (16%)
+ --
+
+ 1.0
+
+
+ Base operaciones interiores bienes inversión (18%)
+ --
+
+ 1.0
+
+
+ Base operaciones interiores bienes inversión (21%)
+ --
+
+ 1.0
+
+
Base importaciones bienes corrientes
@@ -299,6 +428,30 @@
1.0
+
+ Base importaciones bienes corrientes (4%)
+ --
+
+ 1.0
+
+
+ Base importaciones bienes corrientes (7%)
+ --
+
+ 1.0
+
+
+ Base importaciones bienes corrientes (8%)
+ --
+
+ 1.0
+
+
+ Base importaciones bienes corrientes (10%)
+ --
+
+ 1.0
+ Base importaciones bienes corrientes (16%)--
@@ -311,26 +464,13 @@
1.0
-
-
- Base importaciones bienes corrientes (7%)
+
+ Base importaciones bienes corrientes (21%)--1.0
-
- Base importaciones bienes corrientes (8%)
- --
-
- 1.0
-
-
- Base importaciones bienes corrientes (4%)
- --
-
- 1.0
-
-
+
Base importaciones bienes inversión
@@ -338,19 +478,12 @@
1.0
-
- Base importaciones bienes inversión (16%)
+
+ Base importaciones bienes inversión (4%)--1.0
-
- Base importaciones bienes inversión (18%)
- --
-
- 1.0
-
-
Base importaciones bienes inversión (7%)--
@@ -363,13 +496,31 @@
1.0
-
- Base importaciones bienes inversión (4%)
+
+ Base importaciones bienes inversión (10%)--1.0
-
+
+ Base importaciones bienes inversión (16%)
+ --
+
+ 1.0
+
+
+ Base importaciones bienes inversión (18%)
+ --
+
+ 1.0
+
+
+ Base importaciones bienes inversión (21%)
+ --
+
+ 1.0
+
+
Base adquisiciones intracomunitarias bienes corrientes
@@ -377,6 +528,30 @@
1.0
+
+ Base adquisiciones intracomunitarias bienes corrientes (4%)
+ --
+
+ 1.0
+
+
+ Base adquisiciones intracomunitarias bienes corrientes (7%)
+ --
+
+ 1.0
+
+
+ Base adquisiciones intracomunitarias bienes corrientes (8%)
+ --
+
+ 1.0
+
+
+ Base adquisiciones intracomunitarias bienes corrientes (10%)
+ --
+
+ 1.0
+ Base adquisiciones intracomunitarias bienes corrientes (16%)--
@@ -389,26 +564,13 @@
1.0
-
-
- Base adquisiciones intracomunitarias bienes corrientes (7%)
+
+ Base adquisiciones intracomunitarias bienes corrientes (21%)--1.0
-
- Base adquisiciones intracomunitarias bienes corrientes (8%)
- --
-
- 1.0
-
-
- Base adquisiciones intracomunitarias bienes corrientes (4%)
- --
-
- 1.0
-
-
+
Base adquisiciones intracomunitarias bienes inversión
@@ -416,19 +578,12 @@
1.0
-
- Base adquisiciones intracomunitarias bienes inversión (16%)
+
+ Base adquisiciones intracomunitarias bienes inversión (4%)--1.0
-
- Base adquisiciones intracomunitarias bienes inversión (18%)
- --
-
- 1.0
-
-
Base adquisiciones intracomunitarias bienes inversión (7%)--
@@ -441,18 +596,71 @@
1.0
-
- Base adquisiciones intracomunitarias bienes inversión (4%)
+
+ Base adquisiciones intracomunitarias bienes inversión (10%)--1.0
-
-
-
+
+ Base adquisiciones intracomunitarias bienes inversión (16%)
+ --
+
+ 1.0
+
+
+ Base adquisiciones intracomunitarias bienes inversión (18%)
+ --
+
+ 1.0
+
+
+ Base adquisiciones intracomunitarias bienes inversión (21%)
+ --
+
+ 1.0
+
+
+
+
+ Recargo Equivalencia Ded. Base Imponible 0.5%
+ --
+
+ 1.0
+
+
+
+ Recargo Equivalencia Ded. Base Imponible 1%
+ --
+
+ 1.0
+
+
+
+ Recargo Equivalencia Ded. Base Imponible 1.4%
+ --
+
+ 1.0
+
+
+
+ Recargo Equivalencia Ded. Base Imponible 4%
+ --
+
+ 1.0
+
+
+
+ Recargo Equivalencia Ded. Base Imponible 5.2%
+ --
+
+ 1.0
+
+
+
-
+
IVA deducible (Cuota)- Total a deducir [Mod.303][37]
@@ -467,19 +675,12 @@
1.0
-
- Cuotas soportadas operaciones interiores corrientes (16%)
+
+ Cuotas soportadas operaciones interiores corrientes (4%)--1.0
-
- Cuotas soportadas operaciones interiores corrientes (18%)
- --
-
- 1.0
-
-
Cuotas soportadas operaciones interiores corrientes (7%)--
@@ -492,13 +693,31 @@
1.0
-
- Cuotas soportadas operaciones interiores corrientes (4%)
+
+ Cuotas soportadas operaciones interiores corrientes (10%)--1.0
-
+
+ Cuotas soportadas operaciones interiores corrientes (16%)
+ --
+
+ 1.0
+
+
+ Cuotas soportadas operaciones interiores corrientes (18%)
+ --
+
+ 1.0
+
+
+ Cuotas soportadas operaciones interiores corrientes (21%)
+ --
+
+ 1.0
+
+
Cuotas soportadas operaciones interiores bienes inversión
@@ -506,19 +725,12 @@
1.0
-
- Cuotas soportadas operaciones interiores bienes inversión (16%)
+
+ Cuotas soportadas operaciones interiores bienes inversión (4%)--1.0
-
- Cuotas soportadas operaciones interiores bienes inversión (18%)
- --
-
- 1.0
-
-
Cuotas soportadas operaciones interiores bienes inversión (7%)--
@@ -531,13 +743,31 @@
1.0
-
- Cuotas soportadas operaciones interiores bienes inversión (4%)
+
+ Cuotas soportadas operaciones interiores bienes inversión (10%)--1.0
-
+
+ Cuotas soportadas operaciones interiores bienes inversión (16%)
+ --
+
+ 1.0
+
+
+ Cuotas soportadas operaciones interiores bienes inversión (18%)
+ --
+
+ 1.0
+
+
+ Cuotas soportadas operaciones interiores bienes inversión (21%)
+ --
+
+ 1.0
+
+
Cuotas devengadas importaciones bienes corrientes
@@ -545,19 +775,12 @@
1.0
-
- Cuotas devengadas importaciones bienes corrientes (16%)
+
+ Cuotas devengadas importaciones bienes corrientes (4%)--1.0
-
- Cuotas devengadas importaciones bienes corrientes (18%)
- --
-
- 1.0
-
-
Cuotas devengadas importaciones bienes corrientes (7%)--
@@ -570,13 +793,31 @@
1.0
-
- Cuotas devengadas importaciones bienes corrientes (4%)
+
+ Cuotas devengadas importaciones bienes corrientes (10%)--1.0
-
+
+ Cuotas devengadas importaciones bienes corrientes (16%)
+ --
+
+ 1.0
+
+
+ Cuotas devengadas importaciones bienes corrientes (18%)
+ --
+
+ 1.0
+
+
+ Cuotas devengadas importaciones bienes corrientes (21%)
+ --
+
+ 1.0
+
+
Cuotas devengadas importaciones bienes inversión
@@ -584,19 +825,12 @@
1.0
-
- Cuotas devengadas importaciones bienes inversión (16%)
+
+ Cuotas devengadas importaciones bienes inversión (4%)--1.0
-
- Cuotas devengadas importaciones bienes inversión (18%)
- --
-
- 1.0
-
-
Cuotas devengadas importaciones bienes inversión (7%)--
@@ -609,13 +843,30 @@
1.0
-
- Cuotas devengadas importaciones bienes inversión (4%)
+
+ Cuotas devengadas importaciones bienes inversión (10%)
+ --
+
+ 1.0
+
+
+ Cuotas devengadas importaciones bienes inversión (16%)
+ --
+
+ 1.0
+
+
+ Cuotas devengadas importaciones bienes inversión (18%)
+ --
+
+ 1.0
+
+
+ Cuotas devengadas importaciones bienes inversión (21%)--1.0
-
En adquisiciones intracomunitarias bienes corrientes
@@ -623,6 +874,30 @@
1.0
+
+ En adquisiciones intracomunitarias bienes corrientes (4%)
+ --
+
+ 1.0
+
+
+ En adquisiciones intracomunitarias bienes corrientes (7%)
+ --
+
+ 1.0
+
+
+ En adquisiciones intracomunitarias bienes corrientes (8%)
+ --
+
+ 1.0
+
+
+ En adquisiciones intracomunitarias bienes corrientes (10%)
+ --
+
+ 1.0
+ En adquisiciones intracomunitarias bienes corrientes (16%)--
@@ -635,26 +910,12 @@
1.0
-
-
- En adquisiciones intracomunitarias bienes corrientes (7%)
+
+ En adquisiciones intracomunitarias bienes corrientes (21%)--1.0
-
- En adquisiciones intracomunitarias bienes corrientes (8%)
- --
-
- 1.0
-
-
- En adquisiciones intracomunitarias bienes corrientes (4%)
- --
-
- 1.0
-
-
En adquisiciones intracomunitarias bienes inversión
@@ -662,19 +923,12 @@
1.0
-
- En adquisiciones intracomunitarias bienes inversión (16%)
+
+ En adquisiciones intracomunitarias bienes inversión (4%)--1.0
-
- En adquisiciones intracomunitarias bienes inversión (18%)
- --
-
- 1.0
-
-
En adquisiciones intracomunitarias bienes inversión (7%)--
@@ -687,8 +941,26 @@
1.0
-
- En adquisiciones intracomunitarias bienes inversión (4%)
+
+ En adquisiciones intracomunitarias bienes inversión (10%)
+ --
+
+ 1.0
+
+
+ En adquisiciones intracomunitarias bienes inversión (16%)
+ --
+
+ 1.0
+
+
+ En adquisiciones intracomunitarias bienes inversión (18%)
+ --
+
+ 1.0
+
+
+ En adquisiciones intracomunitarias bienes inversión (21%)--1.0
@@ -716,110 +988,42 @@
1.0
-
-
-
-
-
- 472004
-
-
- other
- Hacienda Pública. IVA soportado 4%
-
-
-
-
- 472007
-
-
- other
- Hacienda Pública. IVA soportado 7%
-
-
-
-
- 472008
-
-
- other
- Hacienda Pública. IVA soportado 8%
-
-
-
-
- 472016
-
-
- other
- Hacienda Pública. IVA soportado 16%
-
-
-
-
- 472018
-
-
- other
- Hacienda Pública. IVA soportado 18%
-
-
-
-
- 477004
-
-
- other
- Hacienda Pública. IVA repercutido 4%
-
-
-
-
- 477007
-
-
- other
- Hacienda Pública. IVA repercutido 7%
-
-
-
-
- 477008
-
-
- other
- Hacienda Pública. IVA repercutido 8%
-
-
-
-
- 477016
-
-
- other
- Hacienda Pública. IVA repercutido 16%
-
+
+
+ Recargo Equivalencia Ded. Cuota 0.5%
+ [12]
+
+ 1.0
-
- 477018
-
-
- other
- Hacienda Pública. IVA repercutido 18%
-
+
+ Recargo Equivalencia Ded. Cuota 1%
+ [15]
+
+ 1.0
-
-
- 475001
-
-
- payable
- Hacienda acreedora IVA
-
+
+
+ Recargo Equivalencia Ded. Cuota 1.4%
+ [15]
+
+ 1.0
-
-
+
+
+ Recargo Equivalencia Ded. Cuota 4%
+ [18]
+
+ 1.0
+
+
+
+ Recargo Equivalencia Ded. Cuota 5.2%
+ [18]
+
+ 1.0
+
+
@@ -831,8 +1035,8 @@
4% IVA Soportado (operaciones corrientes)percent
-
-
+
+
@@ -843,14 +1047,14 @@
purchase
-
+
4% IVA Soportado (bienes de inversión)percent
-
-
+
+
@@ -861,14 +1065,14 @@
purchase
-
+
7% IVA Soportado (operaciones corrientes)percent
-
-
+
+
@@ -879,14 +1083,14 @@
purchase
-
+
7% IVA Soportado (bienes de inversión)percent
-
-
+
+
@@ -897,14 +1101,14 @@
purchase
-
+
8% IVA Soportado (operaciones corrientes)percent
-
-
+
+
@@ -915,14 +1119,14 @@
purchase
-
+
8% IVA Soportado (bienes de inversión)percent
-
-
+
+
@@ -933,14 +1137,50 @@
purchase
-
+
+
+
+ 10% IVA Soportado (operaciones corrientes)
+
+ percent
+
+
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+
+ 10% IVA Soportado (bienes de inversión)
+
+ percent
+
+
+
+
+
+
+
+
+
+
+ purchase
+
+
16% IVA Soportado (operaciones corrientes)percent
-
-
+
+
@@ -951,14 +1191,14 @@
purchase
-
+
16% IVA Soportado (bienes de inversión)percent
-
-
+
+
@@ -969,14 +1209,14 @@
purchase
-
+
18% IVA Soportado (operaciones corrientes)percent
-
-
+
+
@@ -986,15 +1226,16 @@
purchase
+
-
+
18% IVA Soportado (bienes de inversión)percent
-
-
+
+
@@ -1005,7 +1246,44 @@
purchase
-
+
+
+
+ 21% IVA Soportado (operaciones corrientes)
+
+ percent
+
+
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+
+
+ 21% IVA Soportado (bienes de inversión)
+
+ percent
+
+
+
+
+
+
+
+
+
+
+ purchase
+
+
@@ -1036,15 +1314,15 @@
purchase
-
+
IVA 4% Importaciones bienes corrientesIVA 4% Importaciones bienes corrientespercent
-
-
+
+
@@ -1061,8 +1339,8 @@
IVA 4% Importaciones bienes de inversiónpercent
-
-
+
+
@@ -1073,15 +1351,15 @@
purchase
-
+
IVA 7% Importaciones bienes corrientesIVA 7% Importaciones bienes corrientespercent
-
-
+
+
@@ -1098,8 +1376,8 @@
IVA 7% Importaciones bienes de inversiónpercent
-
-
+
+
@@ -1110,15 +1388,15 @@
purchase
-
+
IVA 8% Importaciones bienes corrientesIVA 8% Importaciones bienes corrientespercent
-
-
+
+
@@ -1135,8 +1413,8 @@
IVA 8% Importaciones bienes de inversiónpercent
-
-
+
+
@@ -1147,15 +1425,53 @@
purchase
-
+
+
+
+ IVA 10% Importaciones bienes corrientes
+ IVA 10% Importaciones bienes corrientes
+
+ percent
+
+
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+ IVA 10% Importaciones bienes de inversión
+ IVA 10% Importaciones bienes de inversión
+
+ percent
+
+
+
+
+
+
+
+
+
+
+ purchase
+
+
+
IVA 16% Importaciones bienes corrientesIVA 16% Importaciones bienes corrientespercent
-
-
+
+
@@ -1172,8 +1488,8 @@
IVA 16% Importaciones bienes de inversiónpercent
-
-
+
+
@@ -1184,15 +1500,15 @@
purchase
-
+
IVA 18% Importaciones bienes corrientesIVA 18% Importaciones bienes corrientespercent
-
-
+
+
@@ -1209,8 +1525,8 @@
IVA 18% Importaciones bienes de inversiónpercent
-
-
+
+
@@ -1221,7 +1537,44 @@
purchase
-
+
+
+
+ IVA 21% Importaciones bienes corrientes
+ IVA 21% Importaciones bienes corrientes
+
+ percent
+
+
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+ IVA 21% Importaciones bienes de inversión
+ IVA 21% Importaciones bienes de inversión
+
+ percent
+
+
+
+
+
+
+
+
+
+
+ purchase
+
+
@@ -1269,16 +1622,16 @@
percent
-
-
+
+
-
+
-
+ purchase
@@ -1287,8 +1640,8 @@
percent
-
-
+
+
@@ -1299,7 +1652,7 @@
purchase
-
+
IVA 18% Inversión del sujeto pasivo
@@ -1333,16 +1686,16 @@
percent
-
-
+
+
-
+
-
+ purchase
@@ -1351,8 +1704,8 @@
percent
-
-
+
+
@@ -1363,16 +1716,81 @@
purchase
-
-
+
+
+
+
+ IVA 21% Inversión del sujeto pasivo
+ IVA 21% Inversión del sujeto pasivo
+
+ percent
+
+
+
+
+
+ purchase
+
+
+
+ IVA 21% Inversión del sujeto pasivo (1)
+
+
+ percent
+
+
+
+
+
+
+ purchase
+
+
+
+ IVA 21% Inversión del sujeto pasivo (2)
+
+
+ percent
+
+
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+ IVA 21% Inversión del sujeto pasivo (3)
+
+
+ percent
+
+
+
+
+
+
+
+
+
+
+ purchase
+
+
+
IVA 4%percent
-
-
+
+
@@ -1383,14 +1801,14 @@
sale
-
+
IVA 7%percent
-
-
+
+
@@ -1401,14 +1819,14 @@
sale
-
+
IVA 8%percent
-
-
+
+
@@ -1419,14 +1837,32 @@
sale
-
+
+
+
+ IVA 10%
+
+ percent
+
+
+
+
+
+
+
+
+
+
+ sale
+
+
IVA 16%percent
-
-
+
+
@@ -1437,14 +1873,14 @@
sale
-
+
IVA 18%percent
-
-
+
+
@@ -1454,17 +1890,37 @@
sale
+
-
-
+
+
+
+ IVA 21%
+
+ percent
+
+
+
+
+
+
+
+
+
+
+ sale
+
+
+
+
- 0.50% Recargo Equivalencia
+ 0.50% Recargo Equivalencia Ventaspercent
-
-
+
+
@@ -1475,14 +1931,14 @@
sale
-
+
- 1% Recargo Equivalencia
+ 1% Recargo Equivalencia Ventaspercent
-
-
+
+
@@ -1493,14 +1949,32 @@
sale
-
+
+
+
+ 1.4% Recargo Equivalencia Ventas
+
+ percent
+
+
+
+
+
+
+
+
+
+
+ sale
+
+
- 4% Recargo Equivalencia
+ 4% Recargo Equivalencia Ventaspercent
-
-
+
+
@@ -1511,10 +1985,118 @@
sale
-
-
+
+
+
+ 5.2% Recargo Equivalencia Ventas
+
+ percent
+
+
+
+
+
+
+
+
+
+
+ sale
+
+
+
+
+ 0.50% Recargo Equivalencia Compras
+
+ percent
+
+
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+
+ 1% Recargo Equivalencia Compras
+
+ percent
+
+
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+
+ 1.4% Recargo Equivalencia Compras
+
+ percent
+
+
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+
+ 4% Recargo Equivalencia Compras
+
+ percent
+
+
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+
+ 5.2% Recargo Equivalencia Compras
+
+ percent
+
+
+
+
+
+
+
+
+
+
+ purchase
+
+
+
-
+
@@ -1528,366 +2110,11 @@
sale
-
-
+
+
-
-
- IVA 16% Intracomunitario. Bienes corrientes
- IVA 16% Intracomunitario. Bienes corrientes
-
- percent
-
- purchase
-
-
-
-
- IVA 16% Intracomunitario. Bienes corrientes (1)
-
- percent
-
-
-
-
-
-
-
-
- purchase
-
-
-
-
- IVA 16% Intracomunitario. Bienes corrientes (2)
-
- percent
-
-
-
-
-
-
-
-
-
-
- purchase
-
-
-
-
- IVA 18% Intracomunitario. Bienes corrientes
- IVA 18% Intracomunitario. Bienes corrientes
-
- percent
-
- purchase
-
-
-
-
- IVA 18% Intracomunitario. Bienes corrientes (1)
-
- percent
-
-
-
-
-
-
-
-
- purchase
-
-
-
-
- IVA 18% Intracomunitario. Bienes corrientes (2)
-
- percent
-
-
-
-
-
-
-
-
-
-
- purchase
-
-
-
-
-
- IVA 16% Intracomunitario. Bienes de inversión
- IVA 16% Intracomunitario. Bienes de inversión
-
- percent
-
- purchase
-
-
-
-
- IVA 16% Intracomunitario. Bienes de inversión (1)
-
- percent
-
-
-
-
-
-
-
-
- purchase
-
-
-
-
- IVA 16% Intracomunitario. Bienes de inversión (2)
-
- percent
-
-
-
-
-
-
-
-
-
- purchase
-
-
-
- IVA 18% Intracomunitario. Bienes de inversión
- IVA 18% Intracomunitario. Bienes de inversión
-
- percent
-
- purchase
-
-
-
-
- IVA 18% Intracomunitario. Bienes de inversión (1)
-
- percent
-
-
-
-
-
-
-
-
- purchase
-
-
-
-
- IVA 18% Intracomunitario. Bienes de inversión (2)
-
- percent
-
-
-
-
-
-
-
-
-
- purchase
-
-
-
-
- IVA 7% Intracomunitario. Bienes corrientes
- IVA 7% Intracomunitario. Bienes corrientes
-
- percent
-
- purchase
-
-
-
-
- IVA 7% Intracomunitario. Bienes corrientes (1)
-
- percent
-
-
-
-
-
-
-
-
- purchase
-
-
-
-
- IVA 7% Intracomunitario. Bienes corrientes (2)
-
- percent
-
-
-
-
-
-
-
-
-
- purchase
-
-
-
-
- IVA 7% Intracomunitario. Bienes de inversión
- IVA 7% Intracomunitario. Bienes de inversión
-
- percent
-
- purchase
-
-
-
-
- IVA 7% Intracomunitario. Bienes de inversión (1)
-
- percent
-
-
-
-
-
-
-
-
- purchase
-
-
-
-
- IVA 7% Intracomunitario. Bienes de inversión (2)
-
- percent
-
-
-
-
-
-
-
-
-
- purchase
-
-
-
-
- IVA 8% Intracomunitario. Bienes corrientes
- IVA 8% Intracomunitario. Bienes corrientes
-
- percent
-
- purchase
-
-
-
-
- IVA 8% Intracomunitario. Bienes corrientes (1)
-
- percent
-
-
-
-
-
-
-
-
- purchase
-
-
-
-
- IVA 8% Intracomunitario. Bienes corrientes (2)
-
- percent
-
-
-
-
-
-
-
-
-
- purchase
-
-
-
-
- IVA 8% Intracomunitario. Bienes de inversión
- IVA 8% Intracomunitario. Bienes de inversión
-
- percent
-
- purchase
-
-
-
-
- IVA 8% Intracomunitario. Bienes de inversión (1)
-
- percent
-
-
-
-
-
-
-
-
- purchase
-
-
-
-
- IVA 8% Intracomunitario. Bienes de inversión (2)
-
- percent
-
-
-
-
-
-
-
-
-
- purchase
-
-
-
+ IVA 4% Intracomunitario. Bienes corrientesIVA 4% Intracomunitario. Bienes corrientes
@@ -1902,8 +2129,8 @@
IVA 4% Intracomunitario. Bienes corrientes (1)percent
-
-
+
+
@@ -1918,8 +2145,8 @@
IVA 4% Intracomunitario. Bienes corrientes (2)percent
-
-
+
+
@@ -1945,8 +2172,8 @@
IVA 4% Intracomunitario. Bienes de inversión (1)percent
-
-
+
+
@@ -1961,8 +2188,8 @@
IVA 4% Intracomunitario. Bienes de inversión (2)percent
-
-
+
+
@@ -1972,7 +2199,538 @@
purchase
-
+
+
+
+ IVA 7% Intracomunitario. Bienes corrientes
+ IVA 7% Intracomunitario. Bienes corrientes
+
+ percent
+
+ purchase
+
+
+
+
+ IVA 7% Intracomunitario. Bienes corrientes (1)
+
+ percent
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+
+ IVA 7% Intracomunitario. Bienes corrientes (2)
+
+ percent
+
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+
+ IVA 7% Intracomunitario. Bienes de inversión
+ IVA 7% Intracomunitario. Bienes de inversión
+
+ percent
+
+ purchase
+
+
+
+
+ IVA 7% Intracomunitario. Bienes de inversión (1)
+
+ percent
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+
+ IVA 7% Intracomunitario. Bienes de inversión (2)
+
+ percent
+
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+
+ IVA 8% Intracomunitario. Bienes corrientes
+ IVA 8% Intracomunitario. Bienes corrientes
+
+ percent
+
+ purchase
+
+
+
+
+ IVA 8% Intracomunitario. Bienes corrientes (1)
+
+ percent
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+
+ IVA 8% Intracomunitario. Bienes corrientes (2)
+
+ percent
+
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+
+ IVA 8% Intracomunitario. Bienes de inversión
+ IVA 8% Intracomunitario. Bienes de inversión
+
+ percent
+
+ purchase
+
+
+
+
+ IVA 8% Intracomunitario. Bienes de inversión (1)
+
+ percent
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+
+ IVA 8% Intracomunitario. Bienes de inversión (2)
+
+ percent
+
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+
+ IVA 10% Intracomunitario. Bienes corrientes
+ IVA 10% Intracomunitario. Bienes corrientes
+
+ percent
+
+ purchase
+
+
+
+
+ IVA 10% Intracomunitario. Bienes corrientes (1)
+
+ percent
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+
+ IVA 10% Intracomunitario. Bienes corrientes (2)
+
+ percent
+
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+
+ IVA 10% Intracomunitario. Bienes de inversión
+ IVA 10% Intracomunitario. Bienes de inversión
+
+ percent
+
+ purchase
+
+
+
+
+ IVA 10% Intracomunitario. Bienes de inversión (1)
+
+ percent
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+
+ IVA 10% Intracomunitario. Bienes de inversión (2)
+
+ percent
+
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+
+ IVA 16% Intracomunitario. Bienes corrientes
+ IVA 16% Intracomunitario. Bienes corrientes
+
+ percent
+
+ purchase
+
+
+
+
+ IVA 16% Intracomunitario. Bienes corrientes (1)
+
+ percent
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+
+ IVA 16% Intracomunitario. Bienes corrientes (2)
+
+ percent
+
+
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+
+ IVA 16% Intracomunitario. Bienes de inversión
+ IVA 16% Intracomunitario. Bienes de inversión
+
+ percent
+
+ purchase
+
+
+
+
+ IVA 16% Intracomunitario. Bienes de inversión (1)
+
+ percent
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+
+ IVA 16% Intracomunitario. Bienes de inversión (2)
+
+ percent
+
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+
+ IVA 18% Intracomunitario. Bienes corrientes
+ IVA 18% Intracomunitario. Bienes corrientes
+
+ percent
+
+ purchase
+
+
+
+
+ IVA 18% Intracomunitario. Bienes corrientes (1)
+
+ percent
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+
+ IVA 18% Intracomunitario. Bienes corrientes (2)
+
+ percent
+
+
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+
+
+
+ IVA 18% Intracomunitario. Bienes de inversión
+ IVA 18% Intracomunitario. Bienes de inversión
+
+ percent
+
+ purchase
+
+
+
+
+ IVA 18% Intracomunitario. Bienes de inversión (1)
+
+ percent
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+
+ IVA 18% Intracomunitario. Bienes de inversión (2)
+
+ percent
+
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+
+ IVA 21% Intracomunitario. Bienes corrientes
+ IVA 21% Intracomunitario. Bienes corrientes
+
+ percent
+
+ purchase
+
+
+
+
+ IVA 21% Intracomunitario. Bienes corrientes (1)
+
+ percent
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+
+ IVA 21% Intracomunitario. Bienes corrientes (2)
+
+ percent
+
+
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+
+ IVA 21% Intracomunitario. Bienes de inversión
+ IVA 21% Intracomunitario. Bienes de inversión
+
+ percent
+
+ purchase
+
+
+
+
+ IVA 21% Intracomunitario. Bienes de inversión (1)
+
+ percent
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+
+ IVA 21% Intracomunitario. Bienes de inversión (2)
+
+ percent
+
+
+
+
+
+
+
+
+
+ purchase
+
+
+
-
+
-
+
IRPF Retenciones practicadas Base Imponible
@@ -1990,56 +2748,70 @@
1.0
-
+
IRPF Retenciones practicadas Base Imponible 1%B.IRPF11.0
-
+
IRPF Retenciones practicadas Base Imponible 2%B.IRPF21.0
-
+
IRPF Retenciones practicadas Base Imponible 7%B.IRPF71.0
-
+
+
+ IRPF Retenciones practicadas Base Imponible 9%
+ B.IRPF9
+
+ 1.0
+
+
IRPF Retenciones practicadas Base Imponible 15%B.IRPF151.0
-
+
IRPF Retenciones practicadas Base Imponible 18%B.IRPF181.0
-
+
IRPF Retenciones practicadas Base Imponible 19%B.IRPF191.0
-
+
+
+ IRPF Retenciones practicadas Base Imponible 20%
+ B.IRPF20
+
+ 1.0
+
+
IRPF Retenciones practicadas Base Imponible 21%B.IRPF211.0
-
+
IRPF Retenciones practicadas Total Cuota
@@ -2047,128 +2819,78 @@
1.0
-
+
IRPF Retenciones practicadas Cuota 1%IRPF11.0
-
+
IRPF Retenciones practicadas Cuota 2%IRPF21.0
-
+
IRPF Retenciones practicadas Cuota 7%IRPF71.0
-
+
+
+ IRPF Retenciones practicadas Cuota 9%
+ IRPF9
+
+ 1.0
+
+
IRPF Retenciones practicadas Cuota 15%IRPF151.0
-
+
IRPF Retenciones practicadas Cuota 18%IRPF181.0
-
+
IRPF Retenciones practicadas Cuota 19%IRPF191.0
-
+
+
+ IRPF Retenciones practicadas Cuota 20%
+ IRPF20
+
+ 1.0
+
+
IRPF Retenciones practicadas Cuota 21%IRPF211.0
-
-
-
- 475101
-
-
- other
- Hacienda Pública. Retenciones empresarios módulos 1%
-
-
-
-
- 475102
-
-
- other
- Hacienda Pública. Retenciones act. agrícolas, ganaderas, forestales 2%
-
-
-
-
- 475107
-
-
- other
- Hacienda Pública. Retenciones act. profesionales 7%
-
-
-
-
- 475115
-
-
- other
- Hacienda Pública. Retenciones act. profesionales 15%
-
-
-
-
- 475118
-
-
- other
- Hacienda Pública. Retenciones arrendamientos, cap. mobiliario 18%
-
-
-
-
- 475119
-
-
- other
- Hacienda Pública. Retenciones arrendamientos, cap. mobiliario 19%
-
-
-
-
- 475121
-
-
- other
- Hacienda Pública. Retenciones arrendamientos, cap. mobiliario 21%
-
-
-
+
Retenciones IRPF 1%percent
-
-
+
+
@@ -2179,14 +2901,14 @@
purchase
-
+
Retenciones IRPF 2%percent
-
-
+
+
@@ -2197,14 +2919,14 @@
purchase
-
+
Retenciones IRPF 7%percent
-
-
+
+
@@ -2215,14 +2937,32 @@
purchase
-
+
+
+
+ Retenciones IRPF 9%
+
+ percent
+
+
+
+
+
+
+
+
+
+
+ purchase
+
+
Retenciones IRPF 15%percent
-
-
+
+
@@ -2233,14 +2973,14 @@
purchase
-
+
Retenciones IRPF 18%percent
-
-
+
+
@@ -2251,14 +2991,14 @@
purchase
-
+
Retenciones IRPF 19%percent
-
-
+
+
@@ -2269,14 +3009,32 @@
purchase
-
+
+
+
+ Retenciones IRPF 20%
+
+ percent
+
+
+
+
+
+
+
+
+
+
+ purchase
+
+
Retenciones IRPF 21%percent
-
-
+
+
@@ -2287,9 +3045,9 @@
purchase
-
+
-
+
IRPF Retenciones a cuenta Base Imponible
@@ -2297,56 +3055,70 @@
1.0
-
+
IRPF Retenciones a cuenta Base Imponible 1%B.IRPF1 AC1.0
-
+
IRPF Retenciones a cuenta Base Imponible 2%B.IRPF2 AC1.0
-
+
IRPF Retenciones a cuenta Base Imponible 7%B.IRPF7 AC1.0
-
+
+
+ IRPF Retenciones a cuenta Base Imponible 9%
+ B.IRPF9 AC
+
+ 1.0
+
+
IRPF Retenciones a cuenta Base Imponible 15%B.IRPF15 AC1.0
-
+
IRPF Retenciones a cuenta Base Imponible 18%B.IRPF18 AC1.0
-
+
IRPF Retenciones a cuenta Base Imponible 19%B.IRPF19 AC1.0
-
+
+
+ IRPF Retenciones a cuenta Base Imponible 20%
+ B.IRPF20 AC
+
+ 1.0
+
+
IRPF Retenciones a cuenta Base Imponible 21%B.IRPF21 AC1.0
-
+
IRPF Retenciones a cuenta Total Cuota
@@ -2354,128 +3126,78 @@
1.0
-
+
IRPF Retenciones a cuenta Cuota 1%IRPF1 AC1.0
-
+
IRPF Retenciones a cuenta Cuota 2%IRPF2 AC1.0
-
+
IRPF Retenciones a cuenta Cuota 7%IRPF7 AC1.0
-
+
+
+ IRPF Retenciones a cuenta Cuota 9%
+ IRPF9 AC
+
+ 1.0
+
+
IRPF Retenciones a cuenta Cuota 15%IRPF15 AC1.0
-
+
IRPF Retenciones a cuenta Cuota 18%IRPF18 AC1.0
-
+
IRPF Retenciones a cuenta Cuota 19%IRPF19 AC1.0
-
+
+
+ IRPF Retenciones a cuenta Cuota 20%
+ IRPF20 AC
+
+ 1.0
+
+
IRPF Retenciones a cuenta Cuota 21%IRPF21 AC1.0
-
-
-
- 473001
-
-
- other
- Hacienda Pública. Retenciones a cuenta empresarios módulos 1%
-
-
-
-
- 473002
-
-
- other
- Hacienda Pública. Retenciones a cuenta act. agrícolas, ganaderas, forestales 2%
-
-
-
- 473007
-
-
- other
- Hacienda Pública. Retenciones a cuenta act. profesionales 7%
-
-
-
-
- 473015
-
-
- other
- Hacienda Pública. Retenciones a cuenta act. profesionales 15%
-
-
-
-
- 473018
-
-
- other
- Hacienda Pública. Retenciones a cuenta arrendamientos, cap. mobiliario 18%
-
-
-
-
- 473019
-
-
- other
- Hacienda Pública. Retenciones a cuenta arrendamientos, cap. mobiliario 19%
-
-
-
-
- 473021
-
-
- other
- Hacienda Pública. Retenciones a cuenta arrendamientos, cap. mobiliario 21%
-
-
-
Retenciones a cuenta IRPF 1%percent
-
-
+
+
@@ -2486,14 +3208,14 @@
sale
-
+
Retenciones a cuenta IRPF 2%percent
-
-
+
+
@@ -2504,14 +3226,14 @@
sale
-
+
Retenciones a cuenta IRPF 7%percent
-
-
+
+
@@ -2522,14 +3244,32 @@
sale
-
+
+
+
+ Retenciones a cuenta IRPF 9%
+
+ percent
+
+
+
+
+
+
+
+
+
+
+ sale
+
+
Retenciones a cuenta IRPF 15%percent
-
-
+
+
@@ -2540,14 +3280,14 @@
sale
-
+
Retenciones a cuenta IRPF 18%percent
-
-
+
+
@@ -2558,14 +3298,14 @@
sale
-
+
Retenciones a cuenta IRPF 19%percent
-
-
+
+
@@ -2576,14 +3316,32 @@
sale
-
+
+
+
+ Retenciones a cuenta IRPF 20%
+
+ percent
+
+
+
+
+
+
+
+
+
+
+ sale
+
+
Retenciones a cuenta IRPF 21%percent
-
-
+
+
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 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ IVA Devengado Base Imponible
+ --
+ 1.0
+
+
+
+
+
+ Base adquisiciones exentas
+
+
+ --
+ 1.0
+
+
+
+ Base ventas exentas
+ --
+
+
+ 1.0
+
+
+
+
+
+ IVA Soportado exento (operaciones corrientes)
+
+ percent
+
+
+
+
+
+
+ purchase
+
+
+
+
+
+ IVA Exento
+
+ percent
+
+
+
+
+
+
+ sale
+
+
+
+
+
+
+
+ Régimen general IVA Devengado. Base Imponible 4%
+ [01]
+
+ 1.0
+
+
+
+ Régimen general IVA Devengado. Base Imponible 7%
+ [04]
+
+ 1.0
+
+
+ Régimen general IVA Devengado. Base Imponible 8%
+ [04]
+
+ 1.0
+
+
+
+ Régimen general IVA Devengado. Base Imponible 10%
+ [04]
+
+ 1.0
+
+
+
+ Régimen general IVA Devengado. Base Imponible 16%
+ [07]
+
+ 1.0
+
+
+ Régimen general IVA Devengado. Base Imponible 18%
+ [07]
+
+ 1.0
+
+
+
+ Régimen general IVA Devengado. Base Imponible 21%
+ [07]
+
+ 1.0
+
+
+
+
+
+
+ Recargo Equivalencia Base Imponible 0.5%
+ [10]
+
+ 1.0
+
+
+
+ Recargo Equivalencia Base Imponible 1%
+ [13]
+
+ 1.0
+
+
+
+ Recargo Equivalencia Base Imponible 1.4%
+ [13]
+
+ 1.0
+
+
+
+ Recargo Equivalencia Base Imponible 4%
+ [16]
+
+ 1.0
+
+
+
+ Recargo Equivalencia Base Imponible 5.2%
+ [16]
+
+ 1.0
+
+
+
+
+
+
+ Adquisiciones intracomunitarias. Base Imponible
+ [19]
+
+ 1.0
+
+
+
+
+
+
+
+
+
+
+ IVA Cuota total devengada
+ [21]
+ 1.0
+
+
+
+
+ Régimen general IVA Devengado. Cuota 4%
+ [03]
+
+ 1.0
+
+
+
+ Régimen general IVA Devengado. Cuota 7%
+ [06]
+
+ 1.0
+
+
+
+ Régimen general IVA Devengado. Cuota 8%
+ [06]
+
+ 1.0
+
+
+
+ Régimen general IVA Devengado. Cuota 10%
+ [06]
+
+ 1.0
+
+
+
+ Régimen general IVA Devengado. Cuota 16%
+ [09]
+
+ 1.0
+
+
+
+ Régimen general IVA Devengado. Cuota 18%
+ [09]
+
+ 1.0
+
+
+
+ Régimen general IVA Devengado. Cuota 21%
+ [09]
+
+ 1.0
+
+
+
+
+
+
+ Recargo Equivalencia. Cuota 0.5%
+ [12]
+
+ 1.0
+
+
+
+ Recargo Equivalencia. Cuota 1%
+ [15]
+
+ 1.0
+
+
+
+ Recargo Equivalencia. Cuota 1.4%
+ [15]
+
+ 1.0
+
+
+
+ Recargo Equivalencia. Cuota 4%
+ [18]
+
+ 1.0
+
+
+
+ Recargo Equivalencia. Cuota 5.2%
+ [18]
+
+ 1.0
+
+
+
+
+
+
+ Adquisiciones intracomunitarias. Cuota
+ [20]
+
+ 1.0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ IVA Deducible Base Imponible
+ --
+ 1.0
+
+
+
+
+
+ Base operaciones interiores corrientes
+ [22]
+
+ 1.0
+
+
+ Base operaciones interiores corrientes (16%)
+ --
+
+ 1.0
+
+
+ Base operaciones interiores corrientes (18%)
+ --
+
+ 1.0
+
+
+
+ Base operaciones interiores corrientes (7%)
+ --
+
+ 1.0
+
+
+ Base operaciones interiores corrientes (8%)
+ --
+
+ 1.0
+
+
+ Base operaciones interiores corrientes (4%)
+ --
+
+ 1.0
+
+
+
+ Base operaciones interiores corrientes (10%)
+ --
+
+ 1.0
+
+
+
+ Base operaciones interiores corrientes (21%)
+ --
+
+ 1.0
+
+
+
+
+ Base operaciones interiores bienes inversión
+ [24]
+
+ 1.0
+
+
+ Base operaciones interiores bienes inversión (16%)
+ --
+
+ 1.0
+
+
+
+ Base operaciones interiores bienes inversión (18%)
+ --
+
+ 1.0
+
+
+
+ Base operaciones interiores bienes inversión (7%)
+ --
+
+ 1.0
+
+
+
+ Base operaciones interiores bienes inversión (8%)
+ --
+
+ 1.0
+
+
+
+ Base operaciones interiores bienes inversión (4%)
+ --
+
+ 1.0
+
+
+
+ Base operaciones interiores bienes inversión (10%)
+ --
+
+ 1.0
+
+
+
+ Base operaciones interiores bienes inversión (21%)
+ --
+
+ 1.0
+
+
+
+
+
+ Base importaciones bienes corrientes
+ [26]
+
+ 1.0
+
+
+ Base importaciones bienes corrientes (16%)
+ --
+
+ 1.0
+
+
+ Base importaciones bienes corrientes (18%)
+ --
+
+ 1.0
+
+
+
+ Base importaciones bienes corrientes (7%)
+ --
+
+ 1.0
+
+
+ Base importaciones bienes corrientes (8%)
+ --
+
+ 1.0
+
+
+ Base importaciones bienes corrientes (4%)
+ --
+
+ 1.0
+
+
+
+ Base importaciones bienes corrientes (10%)
+ --
+
+ 1.0
+
+
+ Base importaciones bienes corrientes (21%)
+ --
+
+ 1.0
+
+
+
+
+ Base importaciones bienes inversión
+ [28]
+
+ 1.0
+
+
+ Base importaciones bienes inversión (16%)
+ --
+
+ 1.0
+
+
+ Base importaciones bienes inversión (18%)
+ --
+
+ 1.0
+
+
+
+ Base importaciones bienes inversión (7%)
+ --
+
+ 1.0
+
+
+ Base importaciones bienes inversión (8%)
+ --
+
+ 1.0
+
+
+ Base importaciones bienes inversión (4%)
+ --
+
+ 1.0
+
+
+ Base importaciones bienes inversión (10%)
+ --
+
+ 1.0
+
+
+ Base importaciones bienes inversión (21%)
+ --
+
+ 1.0
+
+
+
+
+ Base adquisiciones intracomunitarias bienes corrientes
+ [30]
+
+ 1.0
+
+
+ Base adquisiciones intracomunitarias bienes corrientes (16%)
+ --
+
+ 1.0
+
+
+ Base adquisiciones intracomunitarias bienes corrientes (18%)
+ --
+
+ 1.0
+
+
+
+ Base adquisiciones intracomunitarias bienes corrientes (7%)
+ --
+
+ 1.0
+
+
+ Base adquisiciones intracomunitarias bienes corrientes (8%)
+ --
+
+ 1.0
+
+
+ Base adquisiciones intracomunitarias bienes corrientes (4%)
+ --
+
+ 1.0
+
+
+ Base adquisiciones intracomunitarias bienes corrientes (10%)
+ --
+
+ 1.0
+
+
+ Base adquisiciones intracomunitarias bienes corrientes (21%)
+ --
+
+ 1.0
+
+
+
+
+ Base adquisiciones intracomunitarias bienes inversión
+ [32]
+
+ 1.0
+
+
+ Base adquisiciones intracomunitarias bienes inversión (16%)
+ --
+
+ 1.0
+
+
+ Base adquisiciones intracomunitarias bienes inversión (18%)
+ --
+
+ 1.0
+
+
+
+ Base adquisiciones intracomunitarias bienes inversión (7%)
+ --
+
+ 1.0
+
+
+ Base adquisiciones intracomunitarias bienes inversión (8%)
+ --
+
+ 1.0
+
+
+ Base adquisiciones intracomunitarias bienes inversión (4%)
+ --
+
+ 1.0
+
+
+ Base adquisiciones intracomunitarias bienes inversión (10%)
+ --
+
+ 1.0
+
+
+ Base adquisiciones intracomunitarias bienes inversión (21%)
+ --
+
+ 1.0
+
+
+
+
+ Recargo Equivalencia Ded. Base Imponible 0.5%
+ --
+
+ 1.0
+
+
+
+ Recargo Equivalencia Ded. Base Imponible 1%
+ --
+
+ 1.0
+
+
+
+ Recargo Equivalencia Ded. Base Imponible 1.4%
+ --
+
+ 1.0
+
+
+
+ Recargo Equivalencia Ded. Base Imponible 4%
+ --
+
+ 1.0
+
+
+
+ Recargo Equivalencia Ded. Base Imponible 5.2%
+ --
+
+ 1.0
+
+
+
+
+
+
+
+ IVA deducible (Cuota)- Total a deducir [Mod.303]
+ [37]
+
+ 1.0
+
+
+
+
+ Cuotas soportadas operaciones interiores corrientes
+ [23]
+
+ 1.0
+
+
+ Cuotas soportadas operaciones interiores corrientes (16%)
+ --
+
+ 1.0
+
+
+ Cuotas soportadas operaciones interiores corrientes (18%)
+ --
+
+ 1.0
+
+
+
+ Cuotas soportadas operaciones interiores corrientes (7%)
+ --
+
+ 1.0
+
+
+ Cuotas soportadas operaciones interiores corrientes (8%)
+ --
+
+ 1.0
+
+
+ Cuotas soportadas operaciones interiores corrientes (10%)
+ --
+
+ 1.0
+
+
+ Cuotas soportadas operaciones interiores corrientes (4%)
+ --
+
+ 1.0
+
+
+ Cuotas soportadas operaciones interiores corrientes (21%)
+ --
+
+ 1.0
+
+
+
+
+ Cuotas soportadas operaciones interiores bienes inversión
+ [25]
+
+ 1.0
+
+
+ Cuotas soportadas operaciones interiores bienes inversión (16%)
+ --
+
+ 1.0
+
+
+ Cuotas soportadas operaciones interiores bienes inversión (18%)
+ --
+
+ 1.0
+
+
+
+ Cuotas soportadas operaciones interiores bienes inversión (7%)
+ --
+
+ 1.0
+
+
+ Cuotas soportadas operaciones interiores bienes inversión (8%)
+ --
+
+ 1.0
+
+
+ Cuotas soportadas operaciones interiores bienes inversión (4%)
+ --
+
+ 1.0
+
+
+ Cuotas soportadas operaciones interiores bienes inversión (10%)
+ --
+
+ 1.0
+
+
+ Cuotas soportadas operaciones interiores bienes inversión (21%)
+ --
+
+ 1.0
+
+
+
+
+ Cuotas devengadas importaciones bienes corrientes
+ [27]
+
+ 1.0
+
+
+ Cuotas devengadas importaciones bienes corrientes (16%)
+ --
+
+ 1.0
+
+
+ Cuotas devengadas importaciones bienes corrientes (18%)
+ --
+
+ 1.0
+
+
+
+ Cuotas devengadas importaciones bienes corrientes (7%)
+ --
+
+ 1.0
+
+
+ Cuotas devengadas importaciones bienes corrientes (8%)
+ --
+
+ 1.0
+
+
+ Cuotas devengadas importaciones bienes corrientes (4%)
+ --
+
+ 1.0
+
+
+ Cuotas devengadas importaciones bienes corrientes (10%)
+ --
+
+ 1.0
+
+
+ Cuotas devengadas importaciones bienes corrientes (21%)
+ --
+
+ 1.0
+
+
+
+
+ Cuotas devengadas importaciones bienes inversión
+ [29]
+
+ 1.0
+
+
+ Cuotas devengadas importaciones bienes inversión (16%)
+ --
+
+ 1.0
+
+
+ Cuotas devengadas importaciones bienes inversión (18%)
+ --
+
+ 1.0
+
+
+
+ Cuotas devengadas importaciones bienes inversión (7%)
+ --
+
+ 1.0
+
+
+ Cuotas devengadas importaciones bienes inversión (8%)
+ --
+
+ 1.0
+
+
+ Cuotas devengadas importaciones bienes inversión (4%)
+ --
+
+ 1.0
+
+
+ Cuotas devengadas importaciones bienes inversión (10%)
+ --
+
+ 1.0
+
+
+ Cuotas devengadas importaciones bienes inversión (21%)
+ --
+
+ 1.0
+
+
+
+ En adquisiciones intracomunitarias bienes corrientes
+ [31]
+
+ 1.0
+
+
+ En adquisiciones intracomunitarias bienes corrientes (16%)
+ --
+
+ 1.0
+
+
+ En adquisiciones intracomunitarias bienes corrientes (18%)
+ --
+
+ 1.0
+
+
+
+ En adquisiciones intracomunitarias bienes corrientes (7%)
+ --
+
+ 1.0
+
+
+ En adquisiciones intracomunitarias bienes corrientes (8%)
+ --
+
+ 1.0
+
+
+ En adquisiciones intracomunitarias bienes corrientes (4%)
+ --
+
+ 1.0
+
+
+ En adquisiciones intracomunitarias bienes corrientes (10%)
+ --
+
+ 1.0
+
+
+ En adquisiciones intracomunitarias bienes corrientes (21%)
+ --
+
+ 1.0
+
+
+
+ En adquisiciones intracomunitarias bienes inversión
+ [33]
+
+ 1.0
+
+
+ En adquisiciones intracomunitarias bienes inversión (16%)
+ --
+
+ 1.0
+
+
+ En adquisiciones intracomunitarias bienes inversión (18%)
+ --
+
+ 1.0
+
+
+
+ En adquisiciones intracomunitarias bienes inversión (7%)
+ --
+
+ 1.0
+
+
+ En adquisiciones intracomunitarias bienes inversión (8%)
+ --
+
+ 1.0
+
+
+ En adquisiciones intracomunitarias bienes inversión (4%)
+ --
+
+ 1.0
+
+
+ En adquisiciones intracomunitarias bienes inversión (10%)
+ --
+
+ 1.0
+
+
+ En adquisiciones intracomunitarias bienes inversión (21%)
+ --
+
+ 1.0
+
+
+
+
+ Entregas Intracomunitarias
+ [42]
+
+ 1.0
+
+
+
+ Exportaciones y operaciones asimiladas
+ [43]
+
+ 1.0
+
+
+
+ Inversión del sujeto pasivo
+ [44]
+
+ 1.0
+
+
+
+
+ Recargo Equivalencia Ded. Cuota 0.5%
+ [12]
+
+ 1.0
+
+
+
+ Recargo Equivalencia Ded. Cuota 1%
+ [15]
+
+ 1.0
+
+
+
+ Recargo Equivalencia Ded. Cuota 1.4%
+ [15]
+
+ 1.0
+
+
+
+ Recargo Equivalencia Ded. Cuota 4%
+ [18]
+
+ 1.0
+
+
+
+ Recargo Equivalencia Ded. Cuota 5.2%
+ [18]
+
+ 1.0
+
+
+
+
+
+
+
+
+
+
+ 4% IVA Soportado (operaciones corrientes)
+
+ percent
+
+
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+
+ 4% IVA Soportado (bienes de inversión)
+
+ percent
+
+
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+
+ 7% IVA Soportado (operaciones corrientes)
+
+ percent
+
+
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+
+ 7% IVA Soportado (bienes de inversión)
+
+ percent
+
+
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+
+ 8% IVA Soportado (operaciones corrientes)
+
+ percent
+
+
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+
+ 8% IVA Soportado (bienes de inversión)
+
+ percent
+
+
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+
+ 10% IVA Soportado (operaciones corrientes)
+
+ percent
+
+
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+
+ 10% IVA Soportado (bienes de inversión)
+
+ percent
+
+
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+
+ 16% IVA Soportado (operaciones corrientes)
+
+ percent
+
+
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+
+ 16% IVA Soportado (bienes de inversión)
+
+ percent
+
+
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+
+ 18% IVA Soportado (operaciones corrientes)
+
+ percent
+
+
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+
+ 18% IVA Soportado (bienes de inversión)
+
+ percent
+
+
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+
+ 21% IVA Soportado (operaciones corrientes)
+
+ percent
+
+
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+
+
+ 21% IVA Soportado (bienes de inversión)
+
+ percent
+
+
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+
+
+
+ IVA 0% Importaciones bienes corrientes
+ IVA 0% Importaciones bienes corrientes
+
+ percent
+
+
+
+
+
+
+ purchase
+
+
+
+ IVA 0% Importaciones bienes de inversión
+ IVA 0% Importaciones bienes de inversión
+
+ percent
+
+
+
+
+
+
+ purchase
+
+
+
+
+ IVA 4% Importaciones bienes corrientes
+ IVA 4% Importaciones bienes corrientes
+
+ percent
+
+
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+ IVA 4% Importaciones bienes de inversión
+ IVA 4% Importaciones bienes de inversión
+
+ percent
+
+
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+
+ IVA 7% Importaciones bienes corrientes
+ IVA 7% Importaciones bienes corrientes
+
+ percent
+
+
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+ IVA 7% Importaciones bienes de inversión
+ IVA 7% Importaciones bienes de inversión
+
+ percent
+
+
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+
+ IVA 8% Importaciones bienes corrientes
+ IVA 8% Importaciones bienes corrientes
+
+ percent
+
+
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+ IVA 8% Importaciones bienes de inversión
+ IVA 8% Importaciones bienes de inversión
+
+ percent
+
+
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+
+ IVA 10% Importaciones bienes corrientes
+ IVA 10% Importaciones bienes corrientes
+
+ percent
+
+
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+ IVA 10% Importaciones bienes de inversión
+ IVA 10% Importaciones bienes de inversión
+
+ percent
+
+
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+
+ IVA 16% Importaciones bienes corrientes
+ IVA 16% Importaciones bienes corrientes
+
+ percent
+
+
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+ IVA 16% Importaciones bienes de inversión
+ IVA 16% Importaciones bienes de inversión
+
+ percent
+
+
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+
+ IVA 18% Importaciones bienes corrientes
+ IVA 18% Importaciones bienes corrientes
+
+ percent
+
+
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+ IVA 18% Importaciones bienes de inversión
+ IVA 18% Importaciones bienes de inversión
+
+ percent
+
+
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+
+ IVA 21% Importaciones bienes corrientes
+ IVA 21% Importaciones bienes corrientes
+
+ percent
+
+
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+ IVA 21% Importaciones bienes de inversión
+ IVA 21% Importaciones bienes de inversión
+
+ percent
+
+
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+
+
+
+ IVA 0% Exportaciones
+ IVA 0% Exportaciones
+
+ percent
+
+
+
+ sale
+
+
+
+
+
+ IVA 16% Inversión del sujeto pasivo
+ IVA 16% Inversión del sujeto pasivo
+
+ percent
+
+
+
+
+
+ purchase
+
+
+
+ IVA 16% Inversión del sujeto pasivo (1)
+
+
+ percent
+
+
+
+
+
+
+ purchase
+
+
+
+ IVA 16% Inversión del sujeto pasivo (2)
+
+
+ percent
+
+
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+ IVA 16% Inversión del sujeto pasivo (3)
+
+
+ percent
+
+
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+
+ IVA 18% Inversión del sujeto pasivo
+ IVA 18% Inversión del sujeto pasivo
+
+ percent
+
+
+
+
+
+ purchase
+
+
+
+ IVA 18% Inversión del sujeto pasivo (1)
+
+
+ percent
+
+
+
+
+
+
+ purchase
+
+
+
+ IVA 18% Inversión del sujeto pasivo (2)
+
+
+ percent
+
+
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+ IVA 18% Inversión del sujeto pasivo (3)
+
+
+ percent
+
+
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+
+ IVA 21% Inversión del sujeto pasivo
+ IVA 21% Inversión del sujeto pasivo
+
+ percent
+
+
+
+
+
+ purchase
+
+
+
+ IVA 21% Inversión del sujeto pasivo (1)
+
+
+ percent
+
+
+
+
+
+
+ purchase
+
+
+
+ IVA 21% Inversión del sujeto pasivo (2)
+
+
+ percent
+
+
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+ IVA 21% Inversión del sujeto pasivo (3)
+
+
+ percent
+
+
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+
+
+ IVA 4%
+
+ percent
+
+
+
+
+
+
+
+
+
+
+ sale
+
+
+
+
+ IVA 7%
+
+ percent
+
+
+
+
+
+
+
+
+
+
+ sale
+
+
+
+
+ IVA 8%
+
+ percent
+
+
+
+
+
+
+
+
+
+
+ sale
+
+
+
+
+ IVA 10%
+
+ percent
+
+
+
+
+
+
+
+
+
+
+ sale
+
+
+
+
+ IVA 16%
+
+ percent
+
+
+
+
+
+
+
+
+
+
+ sale
+
+
+
+
+ IVA 18%
+
+ percent
+
+
+
+
+
+
+
+
+
+
+ sale
+
+
+
+
+ IVA 21%
+
+ percent
+
+
+
+
+
+
+
+
+
+
+ sale
+
+
+
+
+
+
+
+ 0.50% Recargo Equivalencia
+
+ percent
+
+
+
+
+
+
+
+
+
+
+ sale
+
+
+
+
+ 1% Recargo Equivalencia
+
+ percent
+
+
+
+
+
+
+
+
+
+
+ sale
+
+
+
+
+ 1.4% Recargo Equivalencia
+
+ percent
+
+
+
+
+
+
+
+
+
+
+ sale
+
+
+
+
+ 4% Recargo Equivalencia
+
+ percent
+
+
+
+
+
+
+
+
+
+
+ sale
+
+
+
+
+ 5.2% Recargo Equivalencia
+
+ percent
+
+
+
+
+
+
+
+
+
+
+ sale
+
+
+
+
+ 0.50% Recargo Equivalencia Compras
+
+ percent
+
+
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+
+ 1% Recargo Equivalencia Compras
+
+ percent
+
+
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+
+ 1.4% Recargo Equivalencia Compras
+
+ percent
+
+
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+
+ 4% Recargo Equivalencia Compras
+
+ percent
+
+
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+
+ 5.2% Recargo Equivalencia Compras
+
+ percent
+
+
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+
+
+
+
+
+ IVA 0% Intracomunitario
+ IVA 0% Intracomunitario 0
+
+ percent
+
+
+
+
+ sale
+
+
+
+
+
+
+ IVA 16% Intracomunitario. Bienes corrientes
+ IVA 16% Intracomunitario. Bienes corrientes
+
+ percent
+
+ purchase
+
+
+
+
+ IVA 16% Intracomunitario. Bienes corrientes (1)
+
+ percent
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+
+ IVA 16% Intracomunitario. Bienes corrientes (2)
+
+ percent
+
+
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+
+ IVA 18% Intracomunitario. Bienes corrientes
+ IVA 18% Intracomunitario. Bienes corrientes
+
+ percent
+
+ purchase
+
+
+
+
+ IVA 18% Intracomunitario. Bienes corrientes (1)
+
+ percent
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+
+ IVA 18% Intracomunitario. Bienes corrientes (2)
+
+ percent
+
+
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+
+
+
+ IVA 16% Intracomunitario. Bienes de inversión
+ IVA 16% Intracomunitario. Bienes de inversión
+
+ percent
+
+ purchase
+
+
+
+
+ IVA 16% Intracomunitario. Bienes de inversión (1)
+
+ percent
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+
+ IVA 16% Intracomunitario. Bienes de inversión (2)
+
+ percent
+
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+
+ IVA 18% Intracomunitario. Bienes de inversión
+ IVA 18% Intracomunitario. Bienes de inversión
+
+ percent
+
+ purchase
+
+
+
+
+ IVA 18% Intracomunitario. Bienes de inversión (1)
+
+ percent
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+
+ IVA 18% Intracomunitario. Bienes de inversión (2)
+
+ percent
+
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+
+ IVA 7% Intracomunitario. Bienes corrientes
+ IVA 7% Intracomunitario. Bienes corrientes
+
+ percent
+
+ purchase
+
+
+
+
+ IVA 7% Intracomunitario. Bienes corrientes (1)
+
+ percent
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+
+ IVA 7% Intracomunitario. Bienes corrientes (2)
+
+ percent
+
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+
+ IVA 7% Intracomunitario. Bienes de inversión
+ IVA 7% Intracomunitario. Bienes de inversión
+
+ percent
+
+ purchase
+
+
+
+
+ IVA 7% Intracomunitario. Bienes de inversión (1)
+
+ percent
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+
+ IVA 7% Intracomunitario. Bienes de inversión (2)
+
+ percent
+
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+
+ IVA 8% Intracomunitario. Bienes corrientes
+ IVA 8% Intracomunitario. Bienes corrientes
+
+ percent
+
+ purchase
+
+
+
+
+ IVA 8% Intracomunitario. Bienes corrientes (1)
+
+ percent
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+
+ IVA 8% Intracomunitario. Bienes corrientes (2)
+
+ percent
+
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+
+ IVA 8% Intracomunitario. Bienes de inversión
+ IVA 8% Intracomunitario. Bienes de inversión
+
+ percent
+
+ purchase
+
+
+
+
+ IVA 8% Intracomunitario. Bienes de inversión (1)
+
+ percent
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+
+ IVA 8% Intracomunitario. Bienes de inversión (2)
+
+ percent
+
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+
+ IVA 4% Intracomunitario. Bienes corrientes
+ IVA 4% Intracomunitario. Bienes corrientes
+
+ percent
+
+ purchase
+
+
+
+
+ IVA 4% Intracomunitario. Bienes corrientes (1)
+
+ percent
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+
+ IVA 4% Intracomunitario. Bienes corrientes (2)
+
+ percent
+
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+
+ IVA 4% Intracomunitario. Bienes de inversión
+ IVA 4% Intracomunitario. Bienes de inversión
+
+ percent
+
+ purchase
+
+
+
+
+ IVA 4% Intracomunitario. Bienes de inversión (1)
+
+ percent
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+
+ IVA 4% Intracomunitario. Bienes de inversión (2)
+
+ percent
+
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+
+ IVA 10% Intracomunitario. Bienes corrientes
+ IVA 10% Intracomunitario. Bienes corrientes
+
+ percent
+
+ purchase
+
+
+
+
+ IVA 10% Intracomunitario. Bienes corrientes (1)
+
+ percent
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+
+ IVA 10% Intracomunitario. Bienes corrientes (2)
+
+ percent
+
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+
+ IVA 10% Intracomunitario. Bienes de inversión
+ IVA 10% Intracomunitario. Bienes de inversión
+
+ percent
+
+ purchase
+
+
+
+
+ IVA 10% Intracomunitario. Bienes de inversión (1)
+
+ percent
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+
+ IVA 10% Intracomunitario. Bienes de inversión (2)
+
+ percent
+
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+
+ IVA 21% Intracomunitario. Bienes corrientes
+ IVA 21% Intracomunitario. Bienes corrientes
+
+ percent
+
+ purchase
+
+
+
+
+ IVA 21% Intracomunitario. Bienes corrientes (1)
+
+ percent
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+
+ IVA 21% Intracomunitario. Bienes corrientes (2)
+
+ percent
+
+
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+
+ IVA 21% Intracomunitario. Bienes de inversión
+ IVA 21% Intracomunitario. Bienes de inversión
+
+ percent
+
+ purchase
+
+
+
+
+ IVA 21% Intracomunitario. Bienes de inversión (1)
+
+ percent
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+
+ IVA 21% Intracomunitario. Bienes de inversión (2)
+
+ percent
+
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+
+
+
+
+
+
+ IRPF Retenciones practicadas Base Imponible
+ B.IRPF
+ 1.0
+
+
+
+
+ IRPF Retenciones practicadas Base Imponible 1%
+ B.IRPF1
+
+ 1.0
+
+
+
+ IRPF Retenciones practicadas Base Imponible 2%
+ B.IRPF2
+
+ 1.0
+
+
+
+ IRPF Retenciones practicadas Base Imponible 7%
+ B.IRPF7
+
+ 1.0
+
+
+
+ IRPF Retenciones practicadas Base Imponible 9%
+ B.IRPF9
+
+ 1.0
+
+
+
+ IRPF Retenciones practicadas Base Imponible 15%
+ B.IRPF15
+
+ 1.0
+
+
+
+ IRPF Retenciones practicadas Base Imponible 18%
+ B.IRPF18
+
+ 1.0
+
+
+
+ IRPF Retenciones practicadas Base Imponible 19%
+ B.IRPF19
+
+ 1.0
+
+
+
+ IRPF Retenciones practicadas Base Imponible 20%
+ B.IRPF20
+
+ 1.0
+
+
+
+ IRPF Retenciones practicadas Base Imponible 21%
+ B.IRPF21
+
+ 1.0
+
+
+
+
+ IRPF Retenciones practicadas Total Cuota
+ IRPF
+
+ 1.0
+
+
+
+ IRPF Retenciones practicadas Cuota 1%
+ IRPF1
+
+ 1.0
+
+
+
+ IRPF Retenciones practicadas Cuota 2%
+ IRPF2
+
+ 1.0
+
+
+
+ IRPF Retenciones practicadas Cuota 7%
+ IRPF7
+
+ 1.0
+
+
+
+ IRPF Retenciones practicadas Cuota 9%
+ IRPF9
+
+ 1.0
+
+
+
+ IRPF Retenciones practicadas Cuota 15%
+ IRPF15
+
+ 1.0
+
+
+
+ IRPF Retenciones practicadas Cuota 18%
+ IRPF18
+
+ 1.0
+
+
+
+ IRPF Retenciones practicadas Cuota 19%
+ IRPF19
+
+ 1.0
+
+
+
+ IRPF Retenciones practicadas Cuota 20%
+ IRPF20
+
+ 1.0
+
+
+
+ IRPF Retenciones practicadas Cuota 21%
+ IRPF21
+
+ 1.0
+
+
+
+
+ 475101
+
+
+ other
+ Hacienda Pública. Retenciones empresarios módulos 1%
+
+
+
+
+ 475102
+
+
+ other
+ Hacienda Pública. Retenciones act. agrícolas, ganaderas, forestales 2%
+
+
+
+
+ 475107
+
+
+ other
+ Hacienda Pública. Retenciones act. profesionales 7%
+
+
+
+
+ 475109
+
+
+ other
+ Hacienda Pública. Retenciones act. profesionales 9%
+
+
+
+
+ 475115
+
+
+ other
+ Hacienda Pública. Retenciones act. profesionales 15%
+
+
+
+
+ 475118
+
+
+ other
+ Hacienda Pública. Retenciones arrendamientos, cap. mobiliario 18%
+
+
+
+
+ 475119
+
+
+ other
+ Hacienda Pública. Retenciones arrendamientos, cap. mobiliario 19%
+
+
+
+
+ 475120
+
+
+ other
+ Hacienda Pública. Retenciones arrendamientos, cap. mobiliario 20%
+
+
+
+
+ 475121
+
+
+ other
+ Hacienda Pública. Retenciones arrendamientos, cap. mobiliario 21%
+
+
+
+
+
+
+ Retenciones IRPF 1%
+
+ percent
+
+
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+
+ Retenciones IRPF 2%
+
+ percent
+
+
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+
+ Retenciones IRPF 7%
+
+ percent
+
+
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+
+ Retenciones IRPF 9%
+
+ percent
+
+
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+
+ Retenciones IRPF 15%
+
+ percent
+
+
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+
+ Retenciones IRPF 18%
+
+ percent
+
+
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+
+ Retenciones IRPF 19%
+
+ percent
+
+
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+
+ Retenciones IRPF 20%
+
+ percent
+
+
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+
+ Retenciones IRPF 21%
+
+ percent
+
+
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+
+
+
+ IRPF Retenciones a cuenta Base Imponible
+ B.IRPF AC
+ 1.0
+
+
+
+
+ IRPF Retenciones a cuenta Base Imponible 1%
+ B.IRPF1 AC
+
+ 1.0
+
+
+
+ IRPF Retenciones a cuenta Base Imponible 2%
+ B.IRPF2 AC
+
+ 1.0
+
+
+
+ IRPF Retenciones a cuenta Base Imponible 7%
+ B.IRPF7 AC
+
+ 1.0
+
+
+
+ IRPF Retenciones a cuenta Base Imponible 9%
+ B.IRPF9 AC
+
+ 1.0
+
+
+
+ IRPF Retenciones a cuenta Base Imponible 15%
+ B.IRPF15 AC
+
+ 1.0
+
+
+
+ IRPF Retenciones a cuenta Base Imponible 18%
+ B.IRPF18 AC
+
+ 1.0
+
+
+
+ IRPF Retenciones a cuenta Base Imponible 19%
+ B.IRPF19 AC
+
+ 1.0
+
+
+
+ IRPF Retenciones a cuenta Base Imponible 20%
+ B.IRPF20 AC
+
+ 1.0
+
+
+
+ IRPF Retenciones a cuenta Base Imponible 21%
+ B.IRPF21 AC
+
+ 1.0
+
+
+
+
+ IRPF Retenciones a cuenta Total Cuota
+ IRPF AC
+
+ 1.0
+
+
+
+ IRPF Retenciones a cuenta Cuota 1%
+ IRPF1 AC
+
+ 1.0
+
+
+
+ IRPF Retenciones a cuenta Cuota 2%
+ IRPF2 AC
+
+ 1.0
+
+
+
+ IRPF Retenciones a cuenta Cuota 7%
+ IRPF7 AC
+
+ 1.0
+
+
+
+ IRPF Retenciones a cuenta Cuota 9%
+ IRPF9 AC
+
+ 1.0
+
+
+
+ IRPF Retenciones a cuenta Cuota 15%
+ IRPF15 AC
+
+ 1.0
+
+
+
+ IRPF Retenciones a cuenta Cuota 18%
+ IRPF18 AC
+
+ 1.0
+
+
+
+ IRPF Retenciones a cuenta Cuota 19%
+ IRPF19 AC
+
+ 1.0
+
+
+
+ IRPF Retenciones a cuenta Cuota 20%
+ IRPF20 AC
+
+ 1.0
+
+
+
+ IRPF Retenciones a cuenta Cuota 21%
+ IRPF21 AC
+
+ 1.0
+
+
+
+
+ 473001
+
+
+ other
+ Hacienda Pública. Retenciones a cuenta empresarios módulos 1%
+
+
+
+
+ 473002
+
+
+ other
+ Hacienda Pública. Retenciones a cuenta act. agrícolas, ganaderas, forestales 2%
+
+
+
+
+ 473007
+
+
+ other
+ Hacienda Pública. Retenciones a cuenta act. profesionales 7%
+
+
+
+
+ 473009
+
+
+ other
+ Hacienda Pública. Retenciones a cuenta act. profesionales 9%
+
+
+
+
+ 473015
+
+
+ other
+ Hacienda Pública. Retenciones a cuenta act. profesionales 15%
+
+
+
+
+ 473018
+
+
+ other
+ Hacienda Pública. Retenciones a cuenta arrendamientos, cap. mobiliario 18%
+
+
+
+
+ 473019
+
+
+ other
+ Hacienda Pública. Retenciones a cuenta arrendamientos, cap. mobiliario 19%
+
+
+
+
+ 473020
+
+
+ other
+ Hacienda Pública. Retenciones a cuenta arrendamientos, cap. mobiliario 20%
+
+
+
+
+ 473021
+
+
+ other
+ Hacienda Pública. Retenciones a cuenta arrendamientos, cap. mobiliario 21%
+
+
+
+
+
+
+ Retenciones a cuenta IRPF 1%
+
+ percent
+
+
+
+
+
+
+
+
+
+
+ sale
+
+
+
+
+ Retenciones a cuenta IRPF 2%
+
+ percent
+
+
+
+
+
+
+
+
+
+
+ sale
+
+
+
+
+ Retenciones a cuenta IRPF 7%
+
+ percent
+
+
+
+
+
+
+
+
+
+
+ sale
+
+
+
+
+ Retenciones a cuenta IRPF 9%
+
+ percent
+
+
+
+
+
+
+
+
+
+
+ sale
+
+
+
+
+ Retenciones a cuenta IRPF 15%
+
+ percent
+
+
+
+
+
+
+
+
+
+
+ sale
+
+
+
+
+ Retenciones a cuenta IRPF 18%
+
+ percent
+
+
+
+
+
+
+
+
+
+
+ sale
+
+
+
+
+ Retenciones a cuenta IRPF 19%
+
+ percent
+
+
+
+
+
+
+
+
+
+
+ sale
+
+
+
+
+ Retenciones a cuenta IRPF 20%
+
+ percent
+
+
+
+
+
+
+
+
+
+
+ sale
+
+
+
+
+ Retenciones a cuenta IRPF 21%
+
+ percent
+
+
+
+
+
+
+
+
+
+
+ sale
+
+
+
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 @@
-
+
-
+
+
-
-
-
+ 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
+
+ -->
+
+
-
-
+
+
-
+
@@ -48,44 +54,103 @@
1.0
-
-
-
+
+
+
+ Base adquisiciones exentas
+
+ --
+ 1.0
+
+
+
+ Base ventas exentas
+ --
+
+ 1.0
+
+
+
+
+
+ IVA Soportado exento (operaciones corrientes)
+
+ percent
+
+
+
+
+
+
+ purchase
+
+
+
+
+
+ IVA Exento
+
+ percent
+
+
+
+
+
+
+ sale
+
+
-
+
Régimen general IVA Devengado. Base Imponible 4%[01]1.0
-
+
Régimen general IVA Devengado. Base Imponible 7%[04]1.0
+
Régimen general IVA Devengado. Base Imponible 8%[04]1.0
-
+
+
+ Régimen general IVA Devengado. Base Imponible 10%
+ [04]
+
+ 1.0
+
+
Régimen general IVA Devengado. Base Imponible 16%[07]1.0
+
Régimen general IVA Devengado. Base Imponible 18%[07]1.0
-
+
+
+ Régimen general IVA Devengado. Base Imponible 21%
+ [07]
+
+ 1.0
+
+
-
+
Recargo Equivalencia Base Imponible 0.5%[10]1.0
-
+
Recargo Equivalencia Base Imponible 1%[13]1.0
-
+
+
+ Recargo Equivalencia Base Imponible 1.4%
+ [13]
+
+ 1.0
+
+
Recargo Equivalencia Base Imponible 4%[16]1.0
-
-
+
+
+ Recargo Equivalencia Base Imponible 5.2%
+ [16]
+
+ 1.0
+
+
-
+
Adquisiciones intracomunitarias. Base Imponible[19]1.0
-
+
-
-
+
+
-
-
+
+
IVA Cuota total devengada[21]1.0
-
+
Régimen general IVA Devengado. Cuota 4%[03]1.0
-
+
Régimen general IVA Devengado. Cuota 7%[06]1.0
-
+
Régimen general IVA Devengado. Cuota 8%[06]1.0
-
+
+
+ Régimen general IVA Devengado. Cuota 10%
+ [06]
+
+ 1.0
+
+
Régimen general IVA Devengado. Cuota 16%[09]
@@ -173,7 +258,14 @@
1.0
-
+
+
+ Régimen general IVA Devengado. Cuota 21%
+ [09]
+
+ 1.0
+
+
-
+
Recargo Equivalencia. Cuota 0.5%[12]1.0
-
+
Recargo Equivalencia. Cuota 1%[15]1.0
-
+
+
+ Recargo Equivalencia. Cuota 1.4%
+ [15]
+
+ 1.0
+
+
Recargo Equivalencia. Cuota 4%[18]1.0
-
-
+
+
+ Recargo Equivalencia. Cuota 5.2%
+ [18]
+
+ 1.0
+
+
+
-
+
Adquisiciones intracomunitarias. Cuota[20]1.0
-
-
-
-
-
+
+
+
+
+
-
-
+
+
@@ -230,7 +336,7 @@
1.0
-
+
Base operaciones interiores corrientes
@@ -238,19 +344,12 @@
1.0
-
- Base operaciones interiores corrientes (16%)
+
+ Base operaciones interiores corrientes (4%)--1.0
-
- Base operaciones interiores corrientes (18%)
- --
-
- 1.0
-
-
Base operaciones interiores corrientes (7%)--
@@ -263,13 +362,31 @@
1.0
-
- Base operaciones interiores corrientes (4%)
+
+ Base operaciones interiores corrientes (10%)--1.0
-
+
+ Base operaciones interiores corrientes (16%)
+ --
+
+ 1.0
+
+
+ Base operaciones interiores corrientes (18%)
+ --
+
+ 1.0
+
+
+ Base operaciones interiores corrientes (21%)
+ --
+
+ 1.0
+
+
Base operaciones interiores bienes inversión
@@ -277,48 +394,79 @@
1.0
-
- Base operaciones interiores bienes inversión (16%)
- --
-
- 1.0
-
-
-
- Base operaciones interiores bienes inversión (18%)
- --
-
- 1.0
-
-
-
- Base operaciones interiores bienes inversión (7%)
- --
-
- 1.0
-
-
-
- Base operaciones interiores bienes inversión (8%)
- --
-
- 1.0
-
-
Base operaciones interiores bienes inversión (4%)--1.0
-
-
+
+ Base operaciones interiores bienes inversión (7%)
+ --
+
+ 1.0
+
+
+ Base operaciones interiores bienes inversión (8%)
+ --
+
+ 1.0
+
+
+ Base operaciones interiores bienes inversión (10%)
+ --
+
+ 1.0
+
+
+ Base operaciones interiores bienes inversión (16%)
+ --
+
+ 1.0
+
+
+ Base operaciones interiores bienes inversión (18%)
+ --
+
+ 1.0
+
+
+ Base operaciones interiores bienes inversión (21%)
+ --
+
+ 1.0
+
+
Base importaciones bienes corrientes[26]1.0
+
+
+ Base importaciones bienes corrientes (4%)
+ --
+
+ 1.0
+
+
+ Base importaciones bienes corrientes (7%)
+ --
+
+ 1.0
+
+
+ Base importaciones bienes corrientes (8%)
+ --
+
+ 1.0
+
+
+ Base importaciones bienes corrientes (10%)
+ --
+
+ 1.0Base importaciones bienes corrientes (16%)
@@ -332,26 +480,13 @@
1.0
-
-
- Base importaciones bienes corrientes (7%)
+
+ Base importaciones bienes corrientes (21%)--1.0
-
- Base importaciones bienes corrientes (8%)
- --
-
- 1.0
-
-
- Base importaciones bienes corrientes (4%)
- --
-
- 1.0
-
-
+
Base importaciones bienes inversión
@@ -359,19 +494,12 @@
1.0
-
- Base importaciones bienes inversión (16%)
+
+ Base importaciones bienes inversión (4%)--1.0
-
- Base importaciones bienes inversión (18%)
- --
-
- 1.0
-
-
Base importaciones bienes inversión (7%)--
@@ -384,13 +512,30 @@
1.0
-
- Base importaciones bienes inversión (4%)
+
+ Base importaciones bienes inversión (10%)
+ --
+
+ 1.0
+
+
+ Base importaciones bienes inversión (16%)
+ --
+
+ 1.0
+
+
+ Base importaciones bienes inversión (18%)
+ --
+
+ 1.0
+
+
+ Base importaciones bienes inversión (21%)--1.0
-
Base adquisiciones intracomunitarias bienes corrientes
@@ -398,19 +543,12 @@
1.0
-
- Base adquisiciones intracomunitarias bienes corrientes (16%)
+
+ Base adquisiciones intracomunitarias bienes corrientes (4%)--1.0
-
- Base adquisiciones intracomunitarias bienes corrientes (18%)
- --
-
- 1.0
-
-
Base adquisiciones intracomunitarias bienes corrientes (7%)--
@@ -423,13 +561,30 @@
1.0
-
- Base adquisiciones intracomunitarias bienes corrientes (4%)
+
+ Base adquisiciones intracomunitarias bienes corrientes (10%)
+ --
+
+ 1.0
+
+
+ Base adquisiciones intracomunitarias bienes corrientes (16%)
+ --
+
+ 1.0
+
+
+ Base adquisiciones intracomunitarias bienes corrientes (18%)
+ --
+
+ 1.0
+
+
+ Base adquisiciones intracomunitarias bienes corrientes (21%)--1.0
-
Base adquisiciones intracomunitarias bienes inversión
@@ -437,6 +592,30 @@
1.0
+
+ Base adquisiciones intracomunitarias bienes inversión (4%)
+ --
+
+ 1.0
+
+
+ Base adquisiciones intracomunitarias bienes inversión (7%)
+ --
+
+ 1.0
+
+
+ Base adquisiciones intracomunitarias bienes inversión (8%)
+ --
+
+ 1.0
+
+
+ Base adquisiciones intracomunitarias bienes inversión (10%)
+ --
+
+ 1.0
+ Base adquisiciones intracomunitarias bienes inversión (16%)--
@@ -449,31 +628,53 @@
1.0
-
-
- Base adquisiciones intracomunitarias bienes inversión (7%)
- --
-
- 1.0
-
-
- Base adquisiciones intracomunitarias bienes inversión (8%)
- --
-
- 1.0
-
-
- Base adquisiciones intracomunitarias bienes inversión (4%)
+
+ Base adquisiciones intracomunitarias bienes inversión (21%)--1.0
-
-
+
+
+ Recargo Equivalencia Ded. Base Imponible 0.5%
+ --
+
+ 1.0
+
+
+
+ Recargo Equivalencia Ded. Base Imponible 1%
+ --
+
+ 1.0
+
+
+
+ Recargo Equivalencia Ded. Base Imponible 1.4%
+ --
+
+ 1.0
+
+
+
+ Recargo Equivalencia Ded. Base Imponible 4%
+ --
+
+ 1.0
+
+
+
+ Recargo Equivalencia Ded. Base Imponible 5.2%
+ --
+
+ 1.0
+
+
+
-
+
IVA deducible (Cuota)- Total a deducir [Mod.303][37]
@@ -488,19 +689,12 @@
1.0
-
- Cuotas soportadas operaciones interiores corrientes (16%)
+
+ Cuotas soportadas operaciones interiores corrientes (4%)--1.0
-
- Cuotas soportadas operaciones interiores corrientes (18%)
- --
-
- 1.0
-
-
Cuotas soportadas operaciones interiores corrientes (7%)--
@@ -513,13 +707,30 @@
1.0
-
- Cuotas soportadas operaciones interiores corrientes (4%)
+
+ Cuotas soportadas operaciones interiores corrientes (10%)
+ --
+
+ 1.0
+
+
+ Cuotas soportadas operaciones interiores corrientes (16%)
+ --
+
+ 1.0
+
+
+ Cuotas soportadas operaciones interiores corrientes (18%)
+ --
+
+ 1.0
+
+
+ Cuotas soportadas operaciones interiores corrientes (21%)--1.0
-
Cuotas soportadas operaciones interiores bienes inversión
@@ -527,19 +738,12 @@
1.0
-
- Cuotas soportadas operaciones interiores bienes inversión (16%)
+
+ Cuotas soportadas operaciones interiores bienes inversión (4%)--1.0
-
- Cuotas soportadas operaciones interiores bienes inversión (18%)
- --
-
- 1.0
-
-
Cuotas soportadas operaciones interiores bienes inversión (7%)--
@@ -552,13 +756,30 @@
1.0
-
- Cuotas soportadas operaciones interiores bienes inversión (4%)
+
+ Cuotas soportadas operaciones interiores bienes inversión (10%)
+ --
+
+ 1.0
+
+
+ Cuotas soportadas operaciones interiores bienes inversión (16%)
+ --
+
+ 1.0
+
+
+ Cuotas soportadas operaciones interiores bienes inversión (18%)
+ --
+
+ 1.0
+
+
+ Cuotas soportadas operaciones interiores bienes inversión (21%)--1.0
-
Cuotas devengadas importaciones bienes corrientes
@@ -566,19 +787,12 @@
1.0
-
- Cuotas devengadas importaciones bienes corrientes (16%)
+
+ Cuotas devengadas importaciones bienes corrientes (4%)--1.0
-
- Cuotas devengadas importaciones bienes corrientes (18%)
- --
-
- 1.0
-
-
Cuotas devengadas importaciones bienes corrientes (7%)--
@@ -591,13 +805,30 @@
1.0
-
- Cuotas devengadas importaciones bienes corrientes (4%)
+
+ Cuotas devengadas importaciones bienes corrientes (10%)
+ --
+
+ 1.0
+
+
+ Cuotas devengadas importaciones bienes corrientes (16%)
+ --
+
+ 1.0
+
+
+ Cuotas devengadas importaciones bienes corrientes (18%)
+ --
+
+ 1.0
+
+
+ Cuotas devengadas importaciones bienes corrientes (21%)--1.0
-
Cuotas devengadas importaciones bienes inversión
@@ -605,19 +836,12 @@
1.0
-
- Cuotas devengadas importaciones bienes inversión (16%)
+
+ Cuotas devengadas importaciones bienes inversión (4%)--1.0
-
- Cuotas devengadas importaciones bienes inversión (18%)
- --
-
- 1.0
-
-
Cuotas devengadas importaciones bienes inversión (7%)--
@@ -630,13 +854,30 @@
1.0
-
- Cuotas devengadas importaciones bienes inversión (4%)
+
+ Cuotas devengadas importaciones bienes inversión (10%)
+ --
+
+ 1.0
+
+
+ Cuotas devengadas importaciones bienes inversión (16%)
+ --
+
+ 1.0
+
+
+ Cuotas devengadas importaciones bienes inversión (18%)
+ --
+
+ 1.0
+
+
+ Cuotas devengadas importaciones bienes inversión (21%)--1.0
-
En adquisiciones intracomunitarias bienes corrientes
@@ -644,19 +885,12 @@
1.0
-
- En adquisiciones intracomunitarias bienes corrientes (16%)
+
+ En adquisiciones intracomunitarias bienes corrientes (4%)--1.0
-
- En adquisiciones intracomunitarias bienes corrientes (18%)
- --
-
- 1.0
-
-
En adquisiciones intracomunitarias bienes corrientes (7%)--
@@ -669,13 +903,30 @@
1.0
-
- En adquisiciones intracomunitarias bienes corrientes (4%)
+
+ En adquisiciones intracomunitarias bienes corrientes (10%)
+ --
+
+ 1.0
+
+
+ En adquisiciones intracomunitarias bienes corrientes (16%)
+ --
+
+ 1.0
+
+
+ En adquisiciones intracomunitarias bienes corrientes (18%)
+ --
+
+ 1.0
+
+
+ En adquisiciones intracomunitarias bienes corrientes (21%)--1.0
-
En adquisiciones intracomunitarias bienes inversión
@@ -683,19 +934,12 @@
1.0
-
- En adquisiciones intracomunitarias bienes inversión (16%)
+
+ En adquisiciones intracomunitarias bienes inversión (4%)--1.0
-
- En adquisiciones intracomunitarias bienes inversión (18%)
- --
-
- 1.0
-
-
En adquisiciones intracomunitarias bienes inversión (7%)--
@@ -708,13 +952,30 @@
1.0
-
- En adquisiciones intracomunitarias bienes inversión (4%)
+
+ En adquisiciones intracomunitarias bienes inversión (10%)
+ --
+
+ 1.0
+
+
+ En adquisiciones intracomunitarias bienes inversión (16%)
+ --
+
+ 1.0
+
+
+ En adquisiciones intracomunitarias bienes inversión (18%)
+ --
+
+ 1.0
+
+
+ En adquisiciones intracomunitarias bienes inversión (21%)--1.0
-
Entregas Intracomunitarias
@@ -737,109 +998,42 @@
1.0
-
-
-
+
+
+ Recargo Equivalencia Ded. Cuota 0.5%
+ [12]
+
+ 1.0
+
-
- 472004
-
-
- other
- Hacienda Pública. IVA soportado 4%
-
+
+ Recargo Equivalencia Ded. Cuota 1%
+ [15]
+
+ 1.0
-
-
- 472007
-
-
- other
- Hacienda Pública. IVA soportado 7%
-
+
+
+ Recargo Equivalencia Ded. Cuota 1.4%
+ [15]
+
+ 1.0
-
-
- 472008
-
-
- other
- Hacienda Pública. IVA soportado 8%
-
+
+
+ Recargo Equivalencia Ded. Cuota 4%
+ [18]
+
+ 1.0
-
-
- 472016
-
-
- other
- Hacienda Pública. IVA soportado 16%
-
+
+
+ Recargo Equivalencia Ded. Cuota 5.2%
+ [18]
+
+ 1.0
-
-
- 472018
-
-
- other
- Hacienda Pública. IVA soportado 18%
-
-
-
-
- 477004
-
-
- other
- Hacienda Pública. IVA repercutido 4%
-
-
-
-
- 477007
-
-
- other
- Hacienda Pública. IVA repercutido 7%
-
-
-
- 477008
-
-
- other
- Hacienda Pública. IVA repercutido 8%
-
-
-
-
- 477016
-
-
- other
- Hacienda Pública. IVA repercutido 16%
-
-
-
-
- 477018
-
-
- other
- Hacienda Pública. IVA repercutido 18%
-
-
-
-
- 475001
-
-
- payable
- Hacienda acreedora IVA
-
-
-
-
+
@@ -851,8 +1045,8 @@
4% IVA Soportado (operaciones corrientes)percent
-
-
+
+
@@ -863,14 +1057,14 @@
purchase
-
+
4% IVA Soportado (bienes de inversión)percent
-
-
+
+
@@ -881,14 +1075,14 @@
purchase
-
+
7% IVA Soportado (operaciones corrientes)percent
-
-
+
+
@@ -899,14 +1093,14 @@
purchase
-
+
7% IVA Soportado (bienes de inversión)percent
-
-
+
+
@@ -917,14 +1111,14 @@
purchase
-
+
8% IVA Soportado (operaciones corrientes)percent
-
-
+
+
@@ -935,14 +1129,14 @@
purchase
-
+
8% IVA Soportado (bienes de inversión)percent
-
-
+
+
@@ -953,14 +1147,50 @@
purchase
-
+
+
+
+ 10% IVA Soportado (operaciones corrientes)
+
+ percent
+
+
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+
+ 10% IVA Soportado (bienes de inversión)
+
+ percent
+
+
+
+
+
+
+
+
+
+
+ purchase
+
+
16% IVA Soportado (operaciones corrientes)percent
-
-
+
+
@@ -971,14 +1201,14 @@
purchase
-
+
16% IVA Soportado (bienes de inversión)percent
-
-
+
+
@@ -989,14 +1219,14 @@
purchase
-
+
18% IVA Soportado (operaciones corrientes)percent
-
-
+
+
@@ -1006,15 +1236,16 @@
purchase
+
-
+
18% IVA Soportado (bienes de inversión)percent
-
-
+
+
@@ -1025,7 +1256,44 @@
purchase
-
+
+
+
+ 21% IVA Soportado (operaciones corrientes)
+
+ percent
+
+
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+
+
+ 21% IVA Soportado (bienes de inversión)
+
+ percent
+
+
+
+
+
+
+
+
+
+
+ purchase
+
+
@@ -1056,15 +1324,15 @@
purchase
-
+
IVA 4% Importaciones bienes corrientesIVA 4% Importaciones bienes corrientespercent
-
-
+
+
@@ -1081,8 +1349,8 @@
IVA 4% Importaciones bienes de inversiónpercent
-
-
+
+
@@ -1093,15 +1361,15 @@
purchase
-
+
IVA 7% Importaciones bienes corrientesIVA 7% Importaciones bienes corrientespercent
-
-
+
+
@@ -1118,8 +1386,8 @@
IVA 7% Importaciones bienes de inversiónpercent
-
-
+
+
@@ -1130,15 +1398,15 @@
purchase
-
+
IVA 8% Importaciones bienes corrientesIVA 8% Importaciones bienes corrientespercent
-
-
+
+
@@ -1155,8 +1423,8 @@
IVA 8% Importaciones bienes de inversiónpercent
-
-
+
+
@@ -1167,15 +1435,52 @@
purchase
-
+
+
+
+ IVA 10% Importaciones bienes corrientes
+ IVA 10% Importaciones bienes corrientes
+
+ percent
+
+
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+ IVA 10% Importaciones bienes de inversión
+ IVA 10% Importaciones bienes de inversión
+
+ percent
+
+
+
+
+
+
+
+
+
+
+ purchase
+
+
IVA 16% Importaciones bienes corrientesIVA 16% Importaciones bienes corrientespercent
-
-
+
+
@@ -1192,8 +1497,8 @@
IVA 16% Importaciones bienes de inversiónpercent
-
-
+
+
@@ -1204,15 +1509,15 @@
purchase
-
+
IVA 18% Importaciones bienes corrientesIVA 18% Importaciones bienes corrientespercent
-
-
+
+
@@ -1229,8 +1534,8 @@
IVA 18% Importaciones bienes de inversiónpercent
-
-
+
+
@@ -1241,7 +1546,42 @@
purchase
-
+
+
+ IVA 21% Importaciones bienes corrientes
+ IVA 21% Importaciones bienes corrientes
+
+ percent
+
+
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+ IVA 21% Importaciones bienes de inversión
+ IVA 21% Importaciones bienes de inversión
+
+ percent
+
+
+
+
+
+
+
+
+
+
+ purchase
+
@@ -1255,7 +1595,7 @@
sale
-
+
@@ -1290,16 +1630,16 @@
percent
-
-
+
+
-
+
-
+ purchase
@@ -1308,8 +1648,8 @@
percent
-
-
+
+
@@ -1320,7 +1660,7 @@
purchase
-
+
IVA 18% Inversión del sujeto pasivo
@@ -1354,16 +1694,16 @@
percent
-
-
+
+
-
+
-
+ purchase
@@ -1372,8 +1712,8 @@
percent
-
-
+
+
@@ -1384,15 +1724,79 @@
purchase
-
+
+
+ IVA 21% Inversión del sujeto pasivo
+ IVA 21% Inversión del sujeto pasivo
+
+ percent
+
+
+
+
+
+ purchase
+
+
+
+ IVA 21% Inversión del sujeto pasivo (1)
+
+
+ percent
+
+
+
+
+
+
+ purchase
+
+
+
+ IVA 21% Inversión del sujeto pasivo (2)
+
+
+ percent
+
+
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+ IVA 21% Inversión del sujeto pasivo (3)
+
+
+ percent
+
+
+
+
+
+
+
+
+
+
+ purchase
+
+
+
IVA 4%percent
-
-
+
+
@@ -1403,14 +1807,14 @@
sale
-
+
IVA 7%percent
-
-
+
+
@@ -1421,14 +1825,14 @@
sale
-
+
IVA 8%percent
-
-
+
+
@@ -1439,14 +1843,32 @@
sale
-
+
+
+
+ IVA 10%
+
+ percent
+
+
+
+
+
+
+
+
+
+
+ sale
+
+
IVA 16%percent
-
-
+
+
@@ -1457,14 +1879,14 @@
sale
-
+
IVA 18%percent
-
-
+
+
@@ -1474,17 +1896,36 @@
sale
+
-
-
+
+
+
+ IVA 21%
+
+ percent
+
+
+
+
+
+
+
+
+
+
+ sale
+
+
+
- 0.50% Recargo Equivalencia
+ 0.50% Recargo Equivalencia Ventaspercent
-
-
+
+
@@ -1495,14 +1936,14 @@
sale
-
+
- 1% Recargo Equivalencia
+ 1% Recargo Equivalencia Ventaspercent
-
-
+
+
@@ -1513,14 +1954,32 @@
sale
-
+
+
+
+ 1.4% Recargo Equivalencia Ventas
+
+ percent
+
+
+
+
+
+
+
+
+
+
+ sale
+
+
- 4% Recargo Equivalencia
+ 4% Recargo Equivalencia Ventaspercent
-
-
+
+
@@ -1531,10 +1990,117 @@
sale
-
-
+
+
+
+ 5.2% Recargo Equivalencia Ventas
+
+ percent
+
+
+
+
+
+
+
+
+
+
+ sale
+
+
+
+ 0.50% Recargo Equivalencia Compras
+
+ percent
+
+
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+
+ 1% Recargo Equivalencia Compras
+
+ percent
+
+
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+
+ 1.4% Recargo Equivalencia Compras
+
+ percent
+
+
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+
+ 4% Recargo Equivalencia Compras
+
+ percent
+
+
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+
+ 5.2% Recargo Equivalencia Compras
+
+ percent
+
+
+
+
+
+
+
+
+
+
+ purchase
+
+
+
-
+
@@ -1548,365 +2114,9 @@
sale
-
-
+
+
-
-
- IVA 16% Intracomunitario. Bienes corrientes
- IVA 16% Intracomunitario. Bienes corrientes
-
- percent
-
- purchase
-
-
-
-
- IVA 16% Intracomunitario. Bienes corrientes (1)
-
- percent
-
-
-
-
-
-
-
-
- purchase
-
-
-
-
- IVA 16% Intracomunitario. Bienes corrientes (2)
-
- percent
-
-
-
-
-
-
-
-
-
-
- purchase
-
-
-
-
- IVA 18% Intracomunitario. Bienes corrientes
- IVA 18% Intracomunitario. Bienes corrientes
-
- percent
-
- purchase
-
-
-
-
- IVA 18% Intracomunitario. Bienes corrientes (1)
-
- percent
-
-
-
-
-
-
-
-
- purchase
-
-
-
-
- IVA 18% Intracomunitario. Bienes corrientes (2)
-
- percent
-
-
-
-
-
-
-
-
-
-
- purchase
-
-
-
-
-
-
- IVA 16% Intracomunitario. Bienes de inversión
- IVA 16% Intracomunitario. Bienes de inversión
-
- percent
-
- purchase
-
-
-
-
- IVA 16% Intracomunitario. Bienes de inversión (1)
-
- percent
-
-
-
-
-
-
-
-
- purchase
-
-
-
-
- IVA 16% Intracomunitario. Bienes de inversión (2)
-
- percent
-
-
-
-
-
-
-
-
-
- purchase
-
-
-
-
- IVA 18% Intracomunitario. Bienes de inversión
- IVA 18% Intracomunitario. Bienes de inversión
-
- percent
-
- purchase
-
-
-
-
- IVA 18% Intracomunitario. Bienes de inversión (1)
-
- percent
-
-
-
-
-
-
-
-
- purchase
-
-
-
-
- IVA 18% Intracomunitario. Bienes de inversión (2)
-
- percent
-
-
-
-
-
-
-
-
-
- purchase
-
-
-
-
- IVA 7% Intracomunitario. Bienes corrientes
- IVA 7% Intracomunitario. Bienes corrientes
-
- percent
-
- purchase
-
-
-
-
- IVA 7% Intracomunitario. Bienes corrientes (1)
-
- percent
-
-
-
-
-
-
-
-
- purchase
-
-
-
-
- IVA 7% Intracomunitario. Bienes corrientes (2)
-
- percent
-
-
-
-
-
-
-
-
-
- purchase
-
-
-
-
- IVA 7% Intracomunitario. Bienes de inversión
- IVA 7% Intracomunitario. Bienes de inversión
-
- percent
-
- purchase
-
-
-
-
- IVA 7% Intracomunitario. Bienes de inversión (1)
-
- percent
-
-
-
-
-
-
-
-
- purchase
-
-
-
-
- IVA 7% Intracomunitario. Bienes de inversión (2)
-
- percent
-
-
-
-
-
-
-
-
-
- purchase
-
-
-
-
- IVA 8% Intracomunitario. Bienes corrientes
- IVA 8% Intracomunitario. Bienes corrientes
-
- percent
-
- purchase
-
-
-
-
- IVA 8% Intracomunitario. Bienes corrientes (1)
-
- percent
-
-
-
-
-
-
-
-
- purchase
-
-
-
-
- IVA 8% Intracomunitario. Bienes corrientes (2)
-
- percent
-
-
-
-
-
-
-
-
-
- purchase
-
-
-
-
- IVA 8% Intracomunitario. Bienes de inversión
- IVA 8% Intracomunitario. Bienes de inversión
-
- percent
-
- purchase
-
-
-
-
- IVA 8% Intracomunitario. Bienes de inversión (1)
-
- percent
-
-
-
-
-
-
-
-
- purchase
-
-
-
-
- IVA 8% Intracomunitario. Bienes de inversión (2)
-
- percent
-
-
-
-
-
-
-
-
-
- purchase
-
@@ -1923,8 +2133,8 @@
IVA 4% Intracomunitario. Bienes corrientes (1)percent
-
-
+
+
@@ -1939,8 +2149,8 @@
IVA 4% Intracomunitario. Bienes corrientes (2)percent
-
-
+
+
@@ -1966,8 +2176,8 @@
IVA 4% Intracomunitario. Bienes de inversión (1)percent
-
-
+
+
@@ -1982,8 +2192,8 @@
IVA 4% Intracomunitario. Bienes de inversión (2)percent
-
-
+
+
@@ -1993,7 +2203,539 @@
purchase
-
+
+
+ IVA 7% Intracomunitario. Bienes corrientes
+ IVA 7% Intracomunitario. Bienes corrientes
+
+ percent
+
+ purchase
+
+
+
+
+ IVA 7% Intracomunitario. Bienes corrientes (1)
+
+ percent
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+
+ IVA 7% Intracomunitario. Bienes corrientes (2)
+
+ percent
+
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+
+ IVA 7% Intracomunitario. Bienes de inversión
+ IVA 7% Intracomunitario. Bienes de inversión
+
+ percent
+
+ purchase
+
+
+
+
+
+ IVA 7% Intracomunitario. Bienes de inversión (1)
+
+ percent
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+
+
+ IVA 7% Intracomunitario. Bienes de inversión (2)
+
+ percent
+
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+
+ IVA 8% Intracomunitario. Bienes corrientes
+ IVA 8% Intracomunitario. Bienes corrientes
+
+ percent
+
+ purchase
+
+
+
+
+ IVA 8% Intracomunitario. Bienes corrientes (1)
+
+ percent
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+
+ IVA 8% Intracomunitario. Bienes corrientes (2)
+
+ percent
+
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+
+ IVA 8% Intracomunitario. Bienes de inversión
+ IVA 8% Intracomunitario. Bienes de inversión
+
+ percent
+
+ purchase
+
+
+
+
+ IVA 8% Intracomunitario. Bienes de inversión (1)
+
+ percent
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+
+ IVA 8% Intracomunitario. Bienes de inversión (2)
+
+ percent
+
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+
+ IVA 10% Intracomunitario. Bienes corrientes
+ IVA 10% Intracomunitario. Bienes corrientes
+
+ percent
+
+ purchase
+
+
+
+
+ IVA 10% Intracomunitario. Bienes corrientes (1)
+
+ percent
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+
+ IVA 10% Intracomunitario. Bienes corrientes (2)
+
+ percent
+
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+
+ IVA 10% Intracomunitario. Bienes de inversión
+ IVA 10% Intracomunitario. Bienes de inversión
+
+ percent
+
+ purchase
+
+
+
+
+ IVA 10% Intracomunitario. Bienes de inversión (1)
+
+ percent
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+
+ IVA 10% Intracomunitario. Bienes de inversión (2)
+
+ percent
+
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+
+ IVA 16% Intracomunitario. Bienes corrientes
+ IVA 16% Intracomunitario. Bienes corrientes
+
+ percent
+
+ purchase
+
+
+
+
+ IVA 16% Intracomunitario. Bienes corrientes (1)
+
+ percent
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+
+ IVA 16% Intracomunitario. Bienes corrientes (2)
+
+ percent
+
+
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+
+ IVA 16% Intracomunitario. Bienes de inversión
+ IVA 16% Intracomunitario. Bienes de inversión
+
+ percent
+
+ purchase
+
+
+
+
+ IVA 16% Intracomunitario. Bienes de inversión (1)
+
+ percent
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+
+ IVA 16% Intracomunitario. Bienes de inversión (2)
+
+ percent
+
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+
+ IVA 18% Intracomunitario. Bienes corrientes
+ IVA 18% Intracomunitario. Bienes corrientes
+
+ percent
+
+ purchase
+
+
+
+
+ IVA 18% Intracomunitario. Bienes corrientes (1)
+
+ percent
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+
+ IVA 18% Intracomunitario. Bienes corrientes (2)
+
+ percent
+
+
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+
+
+
+ IVA 18% Intracomunitario. Bienes de inversión
+ IVA 18% Intracomunitario. Bienes de inversión
+
+ percent
+
+ purchase
+
+
+
+
+ IVA 18% Intracomunitario. Bienes de inversión (1)
+
+ percent
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+
+ IVA 18% Intracomunitario. Bienes de inversión (2)
+
+ percent
+
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+
+
+ IVA 21% Intracomunitario. Bienes corrientes
+ IVA 21% Intracomunitario. Bienes corrientes
+
+ percent
+
+ purchase
+
+
+
+
+ IVA 21% Intracomunitario. Bienes corrientes (1)
+
+ percent
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+
+ IVA 21% Intracomunitario. Bienes corrientes (2)
+
+ percent
+
+
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+
+ IVA 21% Intracomunitario. Bienes de inversión
+ IVA 21% Intracomunitario. Bienes de inversión
+
+ percent
+
+ purchase
+
+
+
+
+ IVA 21% Intracomunitario. Bienes de inversión (1)
+
+ percent
+
+
+
+
+
+
+
+
+ purchase
+
+
+
+
+ IVA 21% Intracomunitario. Bienes de inversión (2)
+
+ percent
+
+
+
+
+
+
+
+
+
+ purchase
+
+
-
+
-
+
IRPF Retenciones practicadas Base Imponible
@@ -2011,56 +2753,70 @@
1.0
-
+
IRPF Retenciones practicadas Base Imponible 1%B.IRPF11.0
-
+
IRPF Retenciones practicadas Base Imponible 2%B.IRPF21.0
-
+
IRPF Retenciones practicadas Base Imponible 7%B.IRPF71.0
-
+
+
+ IRPF Retenciones practicadas Base Imponible 9%
+ B.IRPF9
+
+ 1.0
+
+
IRPF Retenciones practicadas Base Imponible 15%B.IRPF151.0
-
+
IRPF Retenciones practicadas Base Imponible 18%B.IRPF181.0
-
+
IRPF Retenciones practicadas Base Imponible 19%B.IRPF191.0
-
+
+
+ IRPF Retenciones practicadas Base Imponible 20%
+ B.IRPF20
+
+ 1.0
+
+
IRPF Retenciones practicadas Base Imponible 21%B.IRPF211.0
-
+
IRPF Retenciones practicadas Total Cuota
@@ -2068,56 +2824,70 @@
1.0
-
+
IRPF Retenciones practicadas Cuota 1%IRPF11.0
-
+
IRPF Retenciones practicadas Cuota 2%IRPF21.0
-
+
IRPF Retenciones practicadas Cuota 7%IRPF71.0
-
+
+
+ IRPF Retenciones practicadas Cuota 9%
+ IRPF9
+
+ 1.0
+
+
IRPF Retenciones practicadas Cuota 15%IRPF151.0
-
+
IRPF Retenciones practicadas Cuota 18%IRPF181.0
-
+
IRPF Retenciones practicadas Cuota 19%IRPF191.0
-
+
+
+ IRPF Retenciones practicadas Cuota 20%
+ IRPF20
+
+ 1.0
+
+
IRPF Retenciones practicadas Cuota 21%IRPF211.0
-
+
475101
@@ -2127,7 +2897,7 @@
Hacienda Pública. Retenciones empresarios módulos 1%
-
+
475102
@@ -2136,7 +2906,7 @@
Hacienda Pública. Retenciones act. agrícolas, ganaderas, forestales 2%
-
+
475107
@@ -2145,7 +2915,16 @@
Hacienda Pública. Retenciones act. profesionales 7%
-
+
+
+ 475109
+
+
+ other
+ Hacienda Pública. Retenciones act. profesionales 9%
+
+
+
475115
@@ -2154,7 +2933,7 @@
Hacienda Pública. Retenciones act. profesionales 15%
-
+
475118
@@ -2163,7 +2942,7 @@
Hacienda Pública. Retenciones arrendamientos, cap. mobiliario 18%
-
+
475119
@@ -2172,7 +2951,16 @@
Hacienda Pública. Retenciones arrendamientos, cap. mobiliario 19%
-
+
+
+ 475120
+
+
+ other
+ Hacienda Pública. Retenciones arrendamientos, cap. mobiliario 20%
+
+
+
475121
@@ -2181,7 +2969,7 @@
Hacienda Pública. Retenciones arrendamientos, cap. mobiliario 21%
-
+
@@ -2200,7 +2988,7 @@
purchase
-
+
Retenciones IRPF 2%
@@ -2218,7 +3006,7 @@
purchase
-
+
Retenciones IRPF 7%
@@ -2236,7 +3024,25 @@
purchase
-
+
+
+
+ Retenciones IRPF 9%
+
+ percent
+
+
+
+
+
+
+
+
+
+
+ purchase
+
+
Retenciones IRPF 15%
@@ -2254,7 +3060,7 @@
purchase
-
+
Retenciones IRPF 18%
@@ -2272,7 +3078,7 @@
purchase
-
+
Retenciones IRPF 19%
@@ -2291,6 +3097,24 @@
purchase
+
+
+ Retenciones IRPF 20%
+
+ percent
+
+
+
+
+
+
+
+
+
+
+ purchase
+
+
Retenciones IRPF 21%
@@ -2308,9 +3132,9 @@
purchase
-
+
-
+
IRPF Retenciones a cuenta Base Imponible
@@ -2318,56 +3142,70 @@
1.0
-
+
IRPF Retenciones a cuenta Base Imponible 1%B.IRPF1 AC1.0
-
+
IRPF Retenciones a cuenta Base Imponible 2%B.IRPF2 AC1.0
-
+
IRPF Retenciones a cuenta Base Imponible 7%B.IRPF7 AC1.0
-
+
+
+ IRPF Retenciones a cuenta Base Imponible 9%
+ B.IRPF9 AC
+
+ 1.0
+
+
IRPF Retenciones a cuenta Base Imponible 15%B.IRPF15 AC1.0
-
+
IRPF Retenciones a cuenta Base Imponible 18%B.IRPF18 AC1.0
-
+
IRPF Retenciones a cuenta Base Imponible 19%B.IRPF19 AC1.0
-
+
+
+ IRPF Retenciones a cuenta Base Imponible 20%
+ B.IRPF20 AC
+
+ 1.0
+
+
IRPF Retenciones a cuenta Base Imponible 21%B.IRPF21 AC1.0
-
+
IRPF Retenciones a cuenta Total Cuota
@@ -2375,56 +3213,70 @@
1.0
-
+
IRPF Retenciones a cuenta Cuota 1%IRPF1 AC1.0
-
+
IRPF Retenciones a cuenta Cuota 2%IRPF2 AC1.0
-
+
IRPF Retenciones a cuenta Cuota 7%IRPF7 AC1.0
-
+
+
+ IRPF Retenciones a cuenta Cuota 9%
+ IRPF9 AC
+
+ 1.0
+
+
IRPF Retenciones a cuenta Cuota 15%IRPF15 AC1.0
-
+
IRPF Retenciones a cuenta Cuota 18%IRPF18 AC1.0
-
+
IRPF Retenciones a cuenta Cuota 19%IRPF19 AC1.0
-
+
+
+ IRPF Retenciones a cuenta Cuota 20%
+ IRPF20 AC
+
+ 1.0
+
+
IRPF Retenciones a cuenta Cuota 21%IRPF21 AC1.0
-
+
473001
@@ -2434,7 +3286,7 @@
Hacienda Pública. Retenciones a cuenta empresarios módulos 1%
-
+
473002
@@ -2443,7 +3295,7 @@
Hacienda Pública. Retenciones a cuenta act. agrícolas, ganaderas, forestales 2%
-
+
473007
@@ -2452,7 +3304,16 @@
Hacienda Pública. Retenciones a cuenta act. profesionales 7%
-
+
+
+ 473009
+
+
+ other
+ Hacienda Pública. Retenciones a cuenta act. profesionales 9%
+
+
+
473015
@@ -2461,7 +3322,7 @@
Hacienda Pública. Retenciones a cuenta act. profesionales 15%
-
+
473018
@@ -2470,7 +3331,7 @@
Hacienda Pública. Retenciones a cuenta arrendamientos, cap. mobiliario 18%
-
+
473019
@@ -2479,7 +3340,16 @@
Hacienda Pública. Retenciones a cuenta arrendamientos, cap. mobiliario 19%
-
+
+
+ 473020
+
+
+ other
+ Hacienda Pública. Retenciones a cuenta arrendamientos, cap. mobiliario 20%
+
+
+
473021
@@ -2488,7 +3358,7 @@
Hacienda Pública. Retenciones a cuenta arrendamientos, cap. mobiliario 21%
-
+
@@ -2507,7 +3377,7 @@
sale
-
+
Retenciones a cuenta IRPF 2%
@@ -2525,7 +3395,7 @@
sale
-
+
Retenciones a cuenta IRPF 7%
@@ -2543,7 +3413,25 @@
sale
-
+
+
+
+ Retenciones a cuenta IRPF 9%
+
+ percent
+
+
+
+
+
+
+
+
+
+
+ sale
+
+
Retenciones a cuenta IRPF 15%
@@ -2561,7 +3449,7 @@
sale
-
+
Retenciones a cuenta IRPF 18%
@@ -2579,7 +3467,7 @@
sale
-
+
Retenciones a cuenta IRPF 19%
@@ -2597,7 +3485,25 @@
sale
-
+
+
+
+ Retenciones a cuenta IRPF 20%
+
+ percent
+
+
+
+
+
+
+
+
+
+
+ sale
+
+
Retenciones a cuenta IRPF 21%
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 @@
2a
- Leveringen/diensten waarbij de heffing van omzetbelasting naar u is verlegd (BTW)
+ Heffing van omzetbelasting is naar u verlegd (BTW)
@@ -4052,7 +4052,7 @@
2a
- Leveringen/diensten waarbij de heffing van omzetbelasting naar u is verlegd (omzet)
+ Heffing van omzetbelasting is naar u verlegd (omzet)
@@ -4260,7 +4260,7 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge
- purchase
+ sale15
@@ -4279,9 +4279,9 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge
- 99
+ 98
- BTW af te dragen verlegd (inkopen1)
+ BTW te vorderen verlegd (inkopen1)percent
@@ -4304,54 +4304,8 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge
+
-
- purchase
-
-
- 15
-
- BTW te vorderen verlegd (inkopen)
- 21% BTW verlegd
-
- percent
-
-
-
-
-
-
- purchase
-
-
-
- 99
-
- BTW te vorderen verlegd (inkopen1)
-
- percent
-
-
-
-
-
-
-
- purchase
-
-
- 99
-
- BTW te vorderen verlegd (inkopen2)
-
- percent
-
-
-
-
-
-
- purchase
@@ -4402,6 +4356,7 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge
+ 20Inkopen import binnen EU hoog21% BTW import binnen EU
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 @@
+
+
+
+
+
+
+
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 @@
Binnenland
+
+ BTW verlegd
+
+ EU landen
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/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 .
+#
+##############################################################################
+
+
+# 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 .
+#
+##############################################################################
+
+{
+ "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 @@
+
+
+
+
+
+
+
+ 1. TÀI SẢN NGẮN HẠN
+ current_asset
+ balance
+ asset
+
+
+
+ 1. TÀI SẢN NGẮN HẠN - REC
+ current_asset
+ unreconciled
+ asset
+
+
+
+ 2. TÀI SẢN DÀI HẠN
+ long_term_asset
+ balance
+ asset
+
+
+
+ 3. NỢ PHẢI TRẢ
+ liability
+ unreconciled
+ liability
+
+
+
+ 4. VỐN CHỦ SỞ HỮU
+ equity
+ balance
+ asset
+
+
+
+ 5. DOANH THU
+ income
+ none
+ income
+
+
+
+ 6. CHI PHÍ SẢN XUẤT, KINH DOANH
+ expense
+ none
+ expense
+
+
+
+ 7. THU NHẬP KHÁC
+ other_income
+ none
+ income
+
+
+
+ 8. CHI PHÍ KHÁC
+ other_expense
+ none
+ expense
+
+
+
+ 9. XÁC ĐỊNH KẾT QUẢ KINH DOANH
+ evaluation
+ none
+
+
+
+ X. TÀI KHOẢN NGOÀI BẢNG
+ other
+ none
+
+
+
+ CHỈ XEM
+ view
+ none
+
+
+
+
+
+
+
+ 0
+ Hệ thống tài khoản kế toán Việt Nam
+ view
+
+
+
+
+
+ 1
+ TÀI SẢN NGẮN HẠN
+ view
+
+
+
+
+
+ 111
+
+ view
+
+
+ Tiền mặt
+
+
+ 1111
+
+ liquidity
+
+
+ Tiền Việt Nam
+
+
+ 1112
+
+ other
+
+
+ Ngoại tệ
+
+
+ 1113
+
+ other
+
+
+ Vàng bạc, kim khí quý, đá quý
+
+
+
+ 112
+
+ view
+
+
+ Tiền gửi ngân hàng
+
+
+ 1121
+
+ liquidity
+
+
+ Tiền Việt Nam
+
+
+ 1122
+
+ other
+
+
+ Ngoại tệ
+
+
+ 1123
+
+ other
+
+
+ Vàng bạc, kim khí quý, đá quý
+
+
+
+ 113
+
+ view
+
+
+ Tiền đang chuyển
+
+
+ 1131
+
+ other
+
+
+ Tiền Việt Nam
+
+
+ 1132
+
+ other
+
+
+ Ngoại tệ
+
+
+
+ 121
+
+ view
+
+
+ Đầu tư tài chính ngắn hạn
+
+
+ 1211
+
+ other
+
+
+ Cổ phiếu
+
+
+ 1212
+
+ other
+
+
+ Trái phiếu, Tín phiếu, Kỳ phiếu
+
+
+
+ 128
+
+ view
+
+
+ Đầu tư ngắn hạn khác
+
+
+ 1281
+
+ other
+
+
+ Tiền gửi có kỳ hạn
+
+
+ 1282
+
+ other
+
+
+ Đầu tư ngắn hạn khác
+
+
+
+ 129
+
+ other
+
+
+ Dự phòng giảm giá đầu tư ngắn hạn
+
+
+
+ 131
+
+ receivable
+
+
+ Phải thu của khách hàng
+
+
+
+ 133
+
+ view
+
+
+ Thuế GTGT được khấu trừ
+
+
+ 1331
+
+ other
+
+
+ Thuế GTGT được khấu trừ của hàng hóa, dịch vụ
+
+
+
+ 1332
+
+ other
+
+
+ Thuế GTGT được khấu trừ của TSCĐ
+
+
+
+ 136
+
+ view
+
+
+ Phải thu nội bộ
+
+
+ 1361
+
+ other
+
+
+ Vốn kinh doanh ở đơn vị trực thuộc
+
+
+ 1368
+
+ other
+
+
+ Phải thu nội bộ khác
+
+
+
+ 138
+
+ view
+
+
+ Phải thu khác
+
+
+ 1381
+
+ other
+
+
+ Tài sản thiếu chờ xử lý
+
+
+ 1385
+
+ other
+
+
+ Phải thu về cổ phần hóa
+
+
+ 1388
+
+ other
+
+
+ Phải thu khác
+
+
+
+ 139
+
+ other
+
+
+ Dự phòng phải thu khó đòi
+
+
+
+ 141
+
+ other
+
+
+ Tạm ứng
+
+
+
+ 142
+
+ other
+
+
+ Chi phí trả trước ngắn hạn
+
+
+
+ 144
+
+ other
+
+
+ Cầm cố, ký cược, ký quỹ ngắn hạn
+
+
+
+ 151
+
+ other
+
+
+ Hàng hóa mua đang đi trên đường
+
+
+
+ 152
+
+ other
+
+
+ Nguyên liệu, vật liệu
+
+
+
+ 153
+
+ other
+
+
+ Công cụ, dụng cụ
+
+
+
+ 154
+
+ other
+
+
+ Chi phí sản xuất kinh doanh dở dang
+
+
+
+ 155
+
+ other
+
+
+ Thành phẩm
+
+
+
+ 156
+
+ view
+
+
+ Hàng hóa
+
+
+ 1561
+
+ other
+
+
+ Giá mua hàng hóa
+
+
+ 1562
+
+ other
+
+
+ Chi phí thu mua hàng hóa
+
+
+ 1567
+
+ other
+
+
+ Hàng hóa bất động sản
+
+
+
+ 157
+
+ other
+
+
+ Hàng gửi đi bán
+
+
+
+ 158
+
+ other
+
+
+ Hàng hóa kho bảo thuế
+
+
+
+ 159
+
+ other
+
+
+ Dự phòng giảm giá hàng tồn kho
+
+
+
+ 161
+
+ view
+
+
+ Chi sự nghiệp
+
+
+ 1611
+
+ other
+
+
+ Chi sự nghiệp năm trước
+
+
+ 1612
+
+ other
+
+
+ Chi sự nghiệp năm nay
+
+
+
+
+ 2
+ TÀI SẢN DÀI HẠN
+ view
+
+
+
+
+
+ 211
+
+ view
+
+
+ Tài sản cố định hữu hình
+
+
+ 2111
+
+ other
+
+
+ Nhà cửa, vật kiến trúc
+
+
+ 2112
+
+ other
+
+
+ Máy móc, thiết bị
+
+
+ 2113
+
+ other
+
+
+ Phương tiện vận tải truyền dẫn
+
+
+ 2114
+
+ other
+
+
+ Thiết bị, dụng cụ quản lý
+
+
+ 2115
+
+ other
+
+
+ Cây lâu năm, súc vật làm việc và cho sản phẩm
+
+
+
+ 2118
+
+ other
+
+
+ Tài sản cố định khác
+
+
+
+ 212
+
+ other
+
+
+ Tài sản cố định thuê tài chính
+
+
+
+ 213
+
+ view
+
+
+ Tài sản cố định vô hình
+
+
+ 2131
+
+ other
+
+
+ Quyền sử dụng đất
+
+
+ 2132
+
+ other
+
+
+ Quyền phát hành
+
+
+ 2133
+
+ other
+
+
+ Bản quyền, bằng sáng chế
+
+
+ 2134
+
+ other
+
+
+ Nhãn hiệu hàng hóa
+
+
+ 2135
+
+ other
+
+
+ Phần mềm máy tính
+
+
+ 2136
+
+ other
+
+
+ Giấy phép và giấy phép nhượng quyền
+
+
+ 2138
+
+ other
+
+
+ Tài sản cố định vô hình khác
+
+
+
+ 214
+
+ view
+
+
+ Hao mòn TSCĐ
+
+
+ 2141
+
+ other
+
+
+ Hao mòn TSCĐ cố định hữu hình
+
+
+ 2142
+
+ other
+
+
+ Hao mòn TSCĐ thuê tài chính
+
+
+ 2143
+
+ other
+
+
+ Hao mòn TSCĐ vô hình
+
+
+ 2147
+
+ other
+
+
+ Hao mòn bất động sản đầu tư
+
+
+
+ 217
+
+ other
+
+
+ Bất động sản đầu tư
+
+
+
+ 221
+
+ other
+
+
+ Đầu tư vào công ty con
+
+
+
+ 222
+
+ other
+
+
+ Vốn góp liên doanh
+
+
+
+ 223
+
+ other
+
+
+ Đầu tư vào công ty liên kết
+
+
+
+ 228
+
+ view
+
+
+ Đầu tư dài hạn khác
+
+
+ 2281
+
+ other
+
+
+ Cổ phiếu
+
+
+ 2282
+
+ other
+
+
+ Trái phiếu
+
+
+ 2288
+
+ other
+
+
+ Đầu tư dài hạn khác
+
+
+
+ 229
+
+ other
+
+
+ Dự phòng giảm giá đầu tư dài hạn
+
+
+
+ 241
+
+ view
+
+
+ Xây dựng cơ bản dở dang
+
+
+ 2411
+
+ other
+
+
+ Mua sắm TSCĐ
+
+
+ 2412
+
+ other
+
+
+ Xây dựng cơ bản
+
+
+ 2413
+
+ other
+
+
+ Sửa chữa lớn TSCĐ
+
+
+
+ 242
+
+ other
+
+
+ Chi phí trả trước dài hạn
+
+
+
+ 243
+
+ other
+
+
+ Tài sản thuế thu nhập hoãn lại
+
+
+
+ 244
+
+ other
+
+
+ Ký quỹ, ký cược dài hạn
+
+
+
+
+ 3
+ NỢ PHẢI TRẢ
+ view
+
+
+
+
+
+ 311
+
+ other
+
+
+ Vay ngắn hạn
+
+
+
+ 315
+
+ other
+
+
+ Nợ dài hạn đến hạn trả
+
+
+
+ 331
+
+ payable
+
+
+ Phải trả người bán
+
+
+
+ 333
+
+ view
+
+
+ Thuế và các khoản phải nộp Nhà nước
+
+
+ 3331
+
+ view
+
+
+ Thuế GTGT phải nộp
+
+
+ 33311
+
+ other
+
+
+ Thuế GTGT đầu ra
+
+
+ 33312
+
+ other
+
+
+ Thuế GTGT hàng nhập khẩu
+
+
+ 3332
+
+ other
+
+
+ Thuế tiêu thụ đặc biệt
+
+
+ 3333
+
+ other
+
+
+ Thuế xuất, nhập khẩu
+
+
+ 3334
+
+ other
+
+
+ Thuế thu nhập doanh nghiệp
+
+
+ 3335
+
+ other
+
+
+ Thuế thu nhập cá nhân
+
+
+ 3336
+
+ other
+
+
+ Thuế tài nguyên
+
+
+ 3337
+
+ other
+
+
+ Thuế nhà đất, tiền thuê đất
+
+
+ 3338
+
+ other
+
+
+ Các loại thuế khác
+
+
+ 3339
+
+ other
+
+
+ Phí, lệ phí và các khoản phải nộp khác
+
+
+
+ 334
+
+ view
+
+
+ Phải trả người lao động
+
+
+ 3341
+
+ other
+
+
+ Phải trả công nhân viên
+
+
+ 3342
+
+ other
+
+
+ Phải trả người lao động khác
+
+
+
+ 335
+
+ other
+
+
+ Chi phí phải trả
+
+
+
+ 336
+
+ other
+
+
+ Phải trả nội bộ
+
+
+
+ 337
+
+ other
+
+
+ Thanh toán theo tiến độ kế hoạch hợp đồng xây dựng
+
+
+
+
+ 338
+
+ view
+
+
+ Phải trả, phải nộp khác
+
+
+ 3381
+
+ other
+
+
+ Tài sản thừa chờ giải quyết
+
+
+ 3382
+
+ other
+
+
+ Kinh phí công đoàn
+
+
+ 3383
+
+ other
+
+
+ Bảo hiểm xã hội
+
+
+ 3384
+
+ other
+
+
+ Bảo hiểm y tế
+
+
+ 3385
+
+ other
+
+
+ Phải trả về cổ phần hóa
+
+
+ 3386
+
+ other
+
+
+ Nhận ký quỹ, ký cược ngắn hạn
+
+
+ 3387
+
+ other
+
+
+ Doanh thu chưa thực hiện
+
+
+ 3388
+
+ other
+
+
+ Phải trả, phải nộp khác
+
+
+
+ 341
+
+ other
+
+
+ Vay dài hạn
+
+
+
+ 342
+
+ other
+
+
+ Nợ dài hạn
+
+
+
+ 343
+
+ view
+
+
+ Trái phiếu phát hành
+
+
+ 3431
+
+ other
+
+
+ Mệnh giá trái phiếu
+
+
+ 3432
+
+ other
+
+
+ Chiết khấu trái phiếu
+
+
+ 3434
+
+ other
+
+
+ Phụ trội trái phiếu
+
+
+
+ 344
+
+ other
+
+
+ Nhận ký quỹ, ký cược dài hạn
+
+
+
+ 347
+
+ other
+
+
+ Thuế thu nhập hoãn lại phải trả
+
+
+
+ 351
+
+ other
+
+
+ Quỹ dự phòng trợ cấp mất việc làm
+
+
+
+ 352
+
+ other
+
+
+ Dự phòng phải trả
+
+
+
+
+ 4
+ VỐN CHỦ SỞ HỮU
+ view
+
+
+
+
+
+ 411
+
+ view
+
+
+ Nguồn vốn kinh doanh
+
+
+ 4111
+
+ other
+
+
+ Vốn đầu tư chủ sỡ hữu
+
+
+ 4112
+
+ other
+
+
+ Thặng dư vốn cổ phần
+
+
+ 4118
+
+ other
+
+
+ Vốn khác
+
+
+
+ 412
+
+ other
+
+
+ Chênh lệch đánh giá lại tài sản
+
+
+
+ 413
+
+ view
+
+
+ Chênh lệnh tỉ giá hối đoái
+
+
+ 4131
+
+ other
+
+
+ Chênh lệnh tỉ giá hối đoái đánh giá lại cuối năm
+ tài chính
+
+
+ 4132
+
+ other
+
+
+ Chênh lệnh tỉ giá hối đoái trong giai đoạn đầu tư
+ XDCB
+
+
+
+ 414
+
+ other
+
+
+ Quỹ đầu tư phát triển
+
+
+
+ 415
+
+ other
+
+
+ Quỹ dự phòng tài chính
+
+
+
+ 418
+
+ other
+
+
+ Các quỹ khác thuộc vốn chủ sở hữu
+
+
+
+ 419
+
+ other
+
+
+ Cổ phiếu quỹ
+
+
+
+ 421
+
+ view
+
+
+ Lợi nhuận chưa phân phối
+
+
+ 4211
+
+ other
+
+
+ Lợi nhuận chưa phân phối năm trước
+
+
+ 4212
+
+ other
+
+
+ Lợi nhuận chưa phân phối năm nay
+
+
+
+ 431
+
+ view
+
+
+ Quỹ khen thưởng phúc lợi
+
+
+ 4311
+
+ other
+
+
+ Quỹ khen thưởng
+
+
+ 4312
+
+ other
+
+
+ Quỹ phúc lợi
+
+
+ 4313
+
+ other
+
+
+ Quỹ phúc lợi đã hình thành TSCĐ
+
+
+
+ 441
+
+ other
+
+
+ Ngồn vố đầu tư xây dựng cơ bản
+
+
+
+ 461
+
+ view
+
+
+ Nguồn kinh phí sự nghiệp
+
+
+ 4611
+
+ other
+
+
+ Nguồn kinh phí sự nghiệp năm trước
+
+
+ 4612
+
+ other
+
+
+ Nguồn kinh phí sự nghiệp năm nay
+
+
+
+ 466
+
+ other
+
+
+ Nguồn kinh phí đã hình thành TSCĐ
+
+
+
+
+ 5
+ DOANH THU
+ view
+
+
+
+
+
+ 511
+
+ view
+
+
+ Doanh thu bán hàng và cung cấp dịch vụ
+
+
+ 5111
+
+ other
+
+
+ Doanh thu bán hàng hóa
+
+
+ 5112
+
+ other
+
+
+ Doanh thu bán các thành phẩm
+
+
+ 5113
+
+ other
+
+
+ Doanh thu cung cấp dịch vụ
+
+
+ 5114
+
+ other
+
+
+ Doanh thu trợ cấp, trợ giá
+
+
+ 5117
+
+ other
+
+
+ Doanh thu kinh doanh bất động sản đầu tư
+
+
+
+ 512
+
+ view
+
+
+ Doanh thu bán hàng nội bộ
+
+
+ 5121
+
+ other
+
+
+ Doanh thu bán hàng hóa
+
+
+ 5122
+
+ other
+
+
+ Doanh thu bán các thành phẩm
+
+
+ 5123
+
+ other
+
+
+ Doanh thu cung cấp dịch vụ
+
+
+
+ 515
+
+ other
+
+
+ Doanh thu hoạt động tài chính khác
+
+
+
+ 521
+
+ other
+
+
+ Chiết khấu thương mại
+
+
+
+ 531
+
+ other
+
+
+ Hàng bán bị trả lại
+
+
+
+ 532
+
+ other
+
+
+ Giảm giá hàng bán
+
+
+
+
+ 6
+ CHI PHÍ SẢN XUẤT, KINH DOANH
+ view
+
+
+
+
+
+ 611
+
+ view
+
+
+ Mua hàng
+
+
+ 6111
+
+ other
+
+
+ Mua nguyên liệu, vật liệu
+
+
+ 6112
+
+ other
+
+
+ Mua hàng hóa
+
+
+
+ 621
+
+ other
+
+
+ Chi phí nguyên liệu, vật liệu trực tiếp
+
+
+
+ 622
+
+ other
+
+
+ Chi phí nhân công trực tiếp
+
+
+
+ 623
+
+ view
+
+
+ Chi phí sử dụng máy thi công
+
+
+ 6231
+
+ other
+
+
+ Chi phí nhân công
+
+
+ 6232
+
+ other
+
+
+ Chi phí vật liệu
+
+
+ 6233
+
+ other
+
+
+ Chi phí dụng cụ sản xuất
+
+
+ 6234
+
+ other
+
+
+ Chi phí khấu hao máy thi công
+
+
+ 6237
+
+ other
+
+
+ Chi phí dịch vụ mua ngoài
+
+
+ 6238
+
+ other
+
+
+ Chi phí bằng tiền khác
+
+
+
+ 627
+
+ view
+
+
+ Chi phí sản xuất chung
+
+
+ 6271
+
+ other
+
+
+ Chi phí nhân viên phân xưởng
+
+
+ 6272
+
+ other
+
+
+ Chi phí vật liệu
+
+
+ 6273
+
+ other
+
+
+ Chi phí dụng cụ sản xuất
+
+
+ 6274
+
+ other
+
+
+ Chi phí khấu hao TSCĐ
+
+
+ 6277
+
+ other
+
+
+ Chi phí dịch vụ mua ngoài
+
+
+ 6278
+
+ other
+
+
+ Chi phí bằng tiền khác
+
+
+
+ 631
+
+ other
+
+
+ Giá thành sản xuất
+
+
+
+ 632
+
+ other
+
+
+ Giá vốn hàng bán
+
+
+
+ 635
+
+ other
+
+
+ Chi phí tài chính
+
+
+
+ 641
+
+ view
+
+
+ Chi phí bán hàng
+
+
+ 6411
+
+ other
+
+
+ Chi phí nhân viên
+
+
+ 6412
+
+ other
+
+
+ Chi phí vật liệu, bao bì
+
+
+ 6413
+
+ other
+
+
+ Chi phí dụng cụ, đồ dùng
+
+
+ 6414
+
+ other
+
+
+ Chi phí khấu hao TSCĐ
+
+
+ 6415
+
+ other
+
+
+ Chi phí bảo hành
+
+
+ 6417
+
+ other
+
+
+ Chi phí dịch vụ mua ngoài
+
+
+ 6418
+
+ other
+
+
+ Chi phí bằng tiền khác
+
+
+
+ 642
+
+ view
+
+
+ Chi phí quản lý doanh nghiệp
+
+
+ 6421
+
+ other
+
+
+ Chi phí nhân viên quản lý
+
+
+ 6422
+
+ other
+
+
+ Chi phí vật liệu quản lý
+
+
+ 6423
+
+ other
+
+
+ Chi phí đồ dùng văn phòng
+
+
+ 6424
+
+ other
+
+
+ Chi phí khấu hao tài sản cố định
+
+
+ 6425
+
+ other
+
+
+ Thuế, phí và lệ phí
+
+
+ 6426
+
+ other
+
+
+ Chi phí dự phòng
+
+
+ 6427
+
+ other
+
+
+ Chi phí dịch vụ mua ngoài
+
+
+ 6428
+
+ other
+
+
+ Chi phí bằng tiền khác
+
+
+
+
+ 7
+ THU NHẬP KHÁC
+ view
+
+
+
+
+
+ 711
+
+ other
+
+
+ Thu nhập khác
+
+
+
+
+ 8
+ CHI PHÍ KHÁC
+ view
+
+
+
+
+
+ 811
+
+ other
+
+
+ Chi phí khác
+
+
+
+ 821
+
+ view
+
+
+ Chi phí thuế thu nhập doanh nghiệp
+
+
+ 8211
+
+ other
+
+
+ Chi phí thuế TNDN hiện hành
+
+
+ 8212
+
+ other
+
+
+ Chi phí thuế TNDN hoãn lại
+
+
+
+
+ 9
+ XÁC ĐỊNH KẾT QUẢ KINH DOANH
+ view
+
+
+
+
+
+ 911
+
+ other
+
+
+ Xác định kết quả kinh doanh
+
+
+
+
+ X10
+ TÀI KHOẢN NGOÀI BẢNG
+ view
+
+
+
+
+
+ 001
+
+ other
+
+
+ Tài sản thuê ngoài
+
+
+
+ 002
+
+ other
+
+
+ Vật tư, hàng hóa nhận giữ hộ, nhận gia công
+
+
+
+ 003
+
+ other
+
+
+ Hàng hóa nhận bán hộ, nhận ký gửi, ký cược
+
+
+
+ 004
+
+ other
+
+
+ Nợ khó đòi đã xử lý
+
+
+
+ 007
+
+ other
+
+
+ Ngoại tệ các loại
+
+
+
+ 008
+
+ other
+
+
+ Dự toán chi sự nghiệp, dự án
+
+
+
+ OBA
+
+ other
+
+
+ Opening Balance Account
+
+
+
+
+ VN - Chart of Accounts
+ 0
+
+
+
+
+
+
+
+
+
+
+
+
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 @@
+
+
+
+
+
+
+
+
+
+ Thuế GTGT được khấu trừ 10%
+
+ percent
+
+
+ purchase
+
+
+
+
+
+
+
+ Thuế GTGT được khấu trừ 5%
+
+ percent
+
+
+ purchase
+
+
+
+
+
+
+
+ Thuế GTGT được khấu trừ 0%
+
+ percent
+
+
+ purchase
+
+
+
+
+
+
+
+
+
+ Thuế GTGT phải nộp 10%
+
+ percent
+
+
+ sale
+
+
+
+
+
+
+
+ Thuế GTGT phải nộp 5%
+
+ percent
+
+
+ sale
+
+
+
+
+
+
+
+ Thuế GTGT phải nộp 0%
+
+ percent
+
+
+ sale
+
+
+
+
+
+
+
+
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 @@
+
+
+
+
+
+
+
+ Tờ khai thuế GTGT
+ MAIN
+
+
+
+ HHDV mua vào
+
+ IN
+
+
+
+ HHDV bán ra
+
+ OUT
+
+
+
+
+ Giá trị HHDV mua vào
+
+ IN_BASE
+
+
+
+ Giá trị HHDV mua vào chịu thuế 0%
+
+ IN_BASE_00
+
+
+
+ Giá trị HHDV mua vào chịu thuế 5%
+
+ IN_BASE_05
+
+
+
+ Giá trị HHDV mua vào chịu thuế 10%
+
+ IN_BASE_10
+
+
+
+ Giá trị HHDV bán ra
+
+ OUT_BASE
+
+
+
+ Giá trị HHDV bán ra chịu thuế 0%
+
+ OUT_BASE_00
+
+
+
+ Giá trị HHDV bán ra chịu thuế 5%
+
+ OUT_BASE_05
+
+
+
+ Giá trị HHDV bán ra chịu thuế 10%
+
+ OUT_BASE_10
+
+
+
+
+ Thuế GTGT HHDV mua vào
+
+ IN_BALANCE
+
+
+
+ Thuế GTGT HHDV mua vào chịu thuế 0%
+
+ IN_BALANCE_00
+
+
+
+ Thuế GTGT HHDV mua vào chịu thuế 5%
+
+ IN_BALANCE_05
+
+
+
+ Thuế GTGT HHDV mua vào chịu thuế 10%
+
+ IN_BALANCE_10
+
+
+
+ Thuế GTGT HHDV bán ra
+
+ OUT_BALANCE
+
+
+
+ Thuế GTGT HHDV bán ra chịu thuế 0%
+
+ OUT_BALANCE_00
+
+
+
+ Thuế GTGT HHDV bán ra chịu thuế 5%
+
+ OUT_BALANCE_05
+
+
+
+ Thuế GTGT HHDV bán ra chịu thuế 10%
+
+ OUT_BALANCE_10
+
+
+
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 @@
+
+
+
+
+
+ open
+
+
+
+
\ 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/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 "%s" % (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 = "%s" % (website_url, user.company_id.name)
else:
- company = user.name
- signature_company = _('Sent by %(company)s using %(openerp)s.') % {
+ company = user.company_id.name
+ sent_by = _('Sent by %(company)s using %(openerp)s.')
+ signature_company = '%s' % (sent_by % {
'company': company,
'openerp': "OpenERP"
- }
+ })
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..95fbac478d6 100644
--- a/addons/mail/mail_mail.py
+++ b/addons/mail/mail_mail.py
@@ -202,8 +202,10 @@ 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):
diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index defc12a2f73..0b6a4aebd18 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -236,6 +236,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 +248,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 +747,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_thread.py b/addons/mail/mail_thread.py
index 5ddf412e66b..5edc2f436d5 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 _
@@ -459,7 +459,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 +1200,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..80dac297175 100644
--- a/addons/mail/mail_thread_view.xml
+++ b/addons/mail/mail_thread_view.xml
@@ -8,6 +8,7 @@
{
'default_model': 'res.users',
'default_res_id': uid,
+ 'needaction_menu_ref': ['mail.mail_tomefeeds', 'mail.mail_starfeeds']
}{
'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']
}mail.wall{
'default_model': 'res.users',
- 'default_res_id': uid
+ 'default_res_id': uid,
+ 'needaction_menu_ref': ['mail.mail_tomefeeds', 'mail.mail_starfeeds', 'mail.mail_inboxfeeds']
}
diff --git a/addons/mail/tests/test_mail_features.py b/addons/mail/tests/test_mail_features.py
index 7eea66b3b90..e1bef837010 100644
--- a/addons/mail/tests/test_mail_features.py
+++ b/addons/mail/tests/test_mail_features.py
@@ -116,18 +116,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 +183,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])
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 == ' ': # when deleting the message, cleditor keeps a
# 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/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 @@
+
+ New
+
+
+
+
Today1
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/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/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_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..e7026986ea4 100644
--- a/addons/portal/__init__.py
+++ b/addons/portal/__init__.py
@@ -21,6 +21,7 @@
import portal
import mail_mail
+import mail_message
import wizard
import acquirer
diff --git a/addons/portal/mail_mail.py b/addons/portal/mail_mail.py
index bc982671bfe..967822c7d60 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 _
@@ -35,21 +34,14 @@ class mail_mail(osv.Model):
:param partner: browse_record of the specific recipient partner
:return: the resulting body_html
"""
+ 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 = _("""Access your messages and documents through our Customer Portal""") % 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 = _("""Access this document directly in OpenERP""") % 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 _("""Access your messages and documents through our Customer Portal""") % signup_url
else:
return super(mail_mail, self).send_get_mail_body_footer(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 ().
+#
+# 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 .
+#
+##############################################################################
+
+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/tests/test_portal.py b/addons/portal/tests/test_portal.py
index 07becf5cdd9..e96cbc263f6 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,28 @@ 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_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_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 @@
HR - Employess Kanbanhr.employee
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Tel:
+
Mobile:
+
+
+
+
+
+
+
+
+
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 @@
- Project/Task: employees: public, portal, employee or following or assigned
+ Project/Task: employees: public, portal, employee or (followers and following)['|',
- ('user_id', '=', user.id),
- '|',
- ('project_id.privacy_visibility', 'in', ['public', 'portal', 'employees']),
- '&',
- ('project_id.privacy_visibility', '=', 'followers'),
- ('message_follower_ids', 'in', [user.partner_id.id]),
+ ('project_id.privacy_visibility', 'in', ['public', 'portal', 'employees']),
+ '&',
+ ('project_id.privacy_visibility', '=', 'followers'),
+ ('message_follower_ids', 'in', [user.partner_id.id]),
]
- Project/Task: portal users: public or portal and following
+ Project/Task: portal users: public or (portal and colleagues following) or (followers and following)
- ['|',
- ('project_id.privacy_visibility', '=', 'public'),
+ ['|', '|',
+ ('project_id.privacy_visibility', 'in', ['public']),
'&',
- ('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]),
+ '&',
+ ('project_id.privacy_visibility', '=', 'followers'),
+ ('message_follower_ids', 'in', [user.partner_id.id]),
]
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 @@
- Project/Issue: portal users: public or portal and following
+ Project/Issue: portal users: public or (portal and colleagues following) or (followers and following)
- ['|',
- ('project_id.privacy_visibility', '=', 'public'),
+ ['|', '|',
+ ('project_id.privacy_visibility', 'in', ['public']),
'&',
- ('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]),
+ '&',
+ ('project_id.privacy_visibility', '=', 'followers'),
+ ('message_follower_ids', 'in', [user.partner_id.id]),
]
- Project/Issue: employees: public, portal, employee or following or assigned
+ Project/Issue: employees: public, portal, employee or (followers and following)['|',
- ('user_id', '=', user.id),
- '|',
- ('project_id.privacy_visibility', 'in', ['public', 'portal', 'employees']),
- '&',
- ('project_id.privacy_visibility', '=', 'followers'),
- ('message_follower_ids', 'in', [user.partner_id.id]),
+ ('project_id.privacy_visibility', 'in', ['public', 'portal', 'employees']),
+ '&',
+ ('project_id.privacy_visibility', '=', 'followers'),
+ ('message_follower_ids', 'in', [user.partner_id.id]),
]
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 @@
- Project/Phase: portal users: public or portal and following
+ Project/Phase: portal users: public or (portal and colleagues following) or (followers and following)
- ['|',
- ('project_id.privacy_visibility', '=', 'public'),
- '&',
- ('project_id.privacy_visibility', 'in', ['portal', 'followers']),
- '|',
- ('message_follower_ids','in', [user.partner_id.id]),
- ('user_id', '=', user.id),
- ]
+ [('project_id.privacy_visibility', 'in', ['public', 'portal'])]
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/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 @@
-
+
diff --git a/addons/project/project.py b/addons/project/project.py
index 8d7f09f8c4e..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
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 @@
E-Learning Integrationproject.task
- public
+ employees
@@ -76,6 +76,7 @@
Website Design Templatesproject.task
+ employees
@@ -89,6 +90,7 @@
Data Import/Export Pluginproject.task
+ followers
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 0d2c139ce86..eb042e5f0c7 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -52,7 +52,8 @@
kanban,tree,form,calendar,gantt,graph{
'search_default_project_id': [active_id],
- 'default_project_id': active_id,
+ 'default_project_id': active_id,
+ 'active_test': False,
}
diff --git a/addons/project/security/project_security.xml b/addons/project/security/project_security.xml
index 4bbaa9b788e..e674019443b 100644
--- a/addons/project/security/project_security.xml
+++ b/addons/project/security/project_security.xml
@@ -75,15 +75,13 @@
- Project/Task: employees: public or employee or following or assigned
+ Project/Task: employees: public or employee or (followers and following)['|',
- ('user_id', '=', user.id),
- '|',
- ('project_id.privacy_visibility', 'in', ['public', 'employees']),
- '&',
- ('project_id.privacy_visibility', '=', 'followers'),
- ('message_follower_ids', 'in', [user.partner_id.id]),
+ ('project_id.privacy_visibility', 'in', ['public', 'employees']),
+ '&',
+ ('project_id.privacy_visibility', '=', 'followers'),
+ ('message_follower_ids', 'in', [user.partner_id.id]),
]
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 @@
+
+
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index 517d335aa48..a008c670138 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -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 @@
- Project/Issue: employees: public or employee or following or assigned
+ Project/Issue: employees: public or employee or (followers and following)['|',
- '|',
- ('project_id.privacy_visibility', 'in', ['public', 'employees']),
- '&',
- ('project_id.privacy_visibility', '=', 'followers'),
- ('message_follower_ids', 'in', [user.id]),
- ('user_id', '=', user.id),
+ ('project_id.privacy_visibility', 'in', ['public', 'employees']),
+ '&',
+ ('project_id.privacy_visibility', '=', 'followers'),
+ ('message_follower_ids', 'in', [user.id]),
]
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_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_from0):
+ if (hour_fromtodo:
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/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 @@
Falsesale.group_delivery_invoice_address
-
+
+ Falsesale.group_delivery_invoice_address
-
- False
- sale.group_delivery_invoice_address
-
-
- False
- sale.group_delivery_invoice_address
-
-
- False
- sale.group_delivery_invoice_address
-
-
- False
- sale.group_delivery_invoice_address
-
-
+ Falsesale.group_delivery_invoice_address
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/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 @@
+
+ account.invoice.form.analytic.inherit
+ account.invoice
+
+
+
+
+
+
+
+
+
diff --git a/addons/sale_crm/sale_crm.py b/addons/sale_crm/sale_crm.py
index d0899729050..3172999c545 100644
--- a/addons/sale_crm/sale_crm.py
+++ b/addons/sale_crm/sale_crm.py
@@ -31,6 +31,12 @@ 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'
diff --git a/addons/sale_crm/sale_crm_view.xml b/addons/sale_crm/sale_crm_view.xml
index eab9d38bf10..31c0317969a 100644
--- a/addons/sale_crm/sale_crm_view.xml
+++ b/addons/sale_crm/sale_crm_view.xml
@@ -16,6 +16,11 @@
+
+
+ {'stage_type': 'opportunity', 'default_type': 'opportunity', 'default_user_id': uid, 'needaction_menu_ref': 'sale.menu_sale_quotations'}
+
+
sale.order.inheritsale.order
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 @@
-
-
+
+