-
diff --git a/addons/account/wizard/pos_box.py b/addons/account/wizard/pos_box.py
index 874a8e3b7c9..4b7e63585d8 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 _
@@ -23,7 +22,7 @@ class CashBox(osv.osv_memory):
records = self.pool[active_model].browse(cr, uid, active_ids, context=context)
- return self._run(cr, uid, ids, records, context=None)
+ return self._run(cr, uid, ids, records, context=context)
def _run(self, cr, uid, ids, records, context=None):
for box in self.browse(cr, uid, ids, context=context):
diff --git a/addons/account_analytic_analysis/account_analytic_analysis.py b/addons/account_analytic_analysis/account_analytic_analysis.py
index 33ab3be209c..e493f364a0e 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis.py
+++ b/addons/account_analytic_analysis/account_analytic_analysis.py
@@ -259,17 +259,14 @@ class account_analytic_account(osv.osv):
return res
if child_ids:
- cr.execute("SELECT account_analytic_line.account_id, COALESCE(SUM(amount), 0.0) \
- FROM account_analytic_line \
- JOIN account_analytic_journal \
- ON account_analytic_line.journal_id = account_analytic_journal.id \
- WHERE account_analytic_line.account_id IN %s \
- AND account_analytic_journal.type = 'sale' \
- GROUP BY account_analytic_line.account_id", (child_ids,))
- for account_id, sum in cr.fetchall():
- res[account_id] = round(sum,2)
+ #Search all invoice lines not in cancelled state that refer to this analytic account
+ inv_line_obj = self.pool.get("account.invoice.line")
+ inv_lines = inv_line_obj.search(cr, uid, ['&', ('account_analytic_id', 'in', child_ids), ('invoice_id.state', '!=', 'cancel')], context=context)
+ for line in inv_line_obj.browse(cr, uid, inv_lines, context=context):
+ res[line.account_analytic_id.id] += line.price_subtotal
for acc in self.browse(cr, uid, res.keys(), context=context):
res[acc.id] = res[acc.id] - (acc.timesheet_ca_invoiced or 0.0)
+
res_final = res
return res_final
@@ -481,7 +478,7 @@ class account_analytic_account(osv.osv):
'remaining_hours': fields.function(_remaining_hours_calc, type='float', string='Remaining Time',
help="Computed using the formula: Maximum Time - Total Worked Time"),
'remaining_hours_to_invoice': fields.function(_remaining_hours_to_invoice_calc, type='float', string='Remaining Time',
- help="Computed using the formula: Maximum Time - Total Invoiced Time"),
+ help="Computed using the formula: Expected on timesheets - Total invoiced on timesheets"),
'fix_price_to_invoice': fields.function(_fix_price_to_invoice_calc, type='float', string='Remaining Time',
help="Sum of quotations for this contract."),
'timesheet_ca_invoiced': fields.function(_timesheet_ca_invoiced_calc, type='float', string='Remaining Time',
@@ -633,6 +630,21 @@ class account_analytic_account(osv.osv):
pass
return result
+
+ def hr_to_invoice_timesheets(self, cr, uid, ids, context=None):
+ domain = [('invoice_id','=',False),('to_invoice','!=',False), ('journal_id.type', '=', 'general'), ('account_id', 'in', ids)]
+ names = [record.name for record in self.browse(cr, uid, ids, context=context)]
+ name = _('Timesheets to Invoice of %s') % ','.join(names)
+ return {
+ 'type': 'ir.actions.act_window',
+ 'name': name,
+ 'view_type': 'form',
+ 'view_mode': 'tree,form',
+ 'domain' : domain,
+ 'res_model': 'account.analytic.line',
+ 'nodestroy': True,
+ }
+
def _prepare_invoice(self, cr, uid, contract, context=None):
context = context or {}
diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index d31746e7e70..cd4be740815 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -98,8 +98,8 @@
\n" +" From this report, you can have an overview on all depreciation. " +"The\n" +" tool search can also be used to personalise your Assets reports " +"and\n" +" so, match this analysis to your needs;\n" +"
\n" +" " +msgstr "" + +#. module: account_asset +#: field:account.asset.asset,purchase_value:0 +msgid "Gross Value" +msgstr "" + +#. module: account_asset +#: field:account.asset.category,name:0 +msgid "Name" +msgstr "" + +#. module: account_asset +#: help:account.asset.category,open_asset:0 +msgid "" +"Check this if you want to automatically confirm the assets of this category " +"when created by invoices." +msgstr "" + +#. module: account_asset +#: field:asset.asset.report,name:0 +msgid "Year" +msgstr "" + +#. module: account_asset +#: model:ir.model,name:account_asset.model_account_asset_depreciation_line +msgid "Asset depreciation line" +msgstr "" + +#. module: account_asset +#: view:account.asset.category:0 +#: field:asset.asset.report,asset_category_id:0 +#: model:ir.model,name:account_asset.model_account_asset_category +msgid "Asset category" +msgstr "" + +#. module: account_asset +#: view:asset.asset.report:0 +#: field:asset.asset.report,depreciation_value:0 +msgid "Amount of Depreciation Lines" +msgstr "" + +#. module: account_asset +#: code:addons/account_asset/wizard/wizard_asset_compute.py:49 +#, python-format +msgid "Created Asset Moves" +msgstr "" + +#. module: account_asset +#: field:account.asset.depreciation.line,sequence:0 +msgid "Sequence" +msgstr "" + +#. module: account_asset +#: help:account.asset.category,method_period:0 +msgid "State here the time between 2 depreciations, in months" +msgstr "" + +#. module: account_asset +#: field:account.asset.history,date:0 +msgid "Date" +msgstr "" + +#. module: account_asset +#: field:account.asset.asset,method_number:0 +#: selection:account.asset.asset,method_time:0 +#: field:account.asset.category,method_number:0 +#: selection:account.asset.category,method_time:0 +#: field:account.asset.history,method_number:0 +#: selection:account.asset.history,method_time:0 +#: field:asset.modify,method_number:0 +msgid "Number of Depreciations" +msgstr "" + +#. module: account_asset +#: view:account.asset.asset:0 +msgid "Create Move" +msgstr "" + +#. module: account_asset +#: view:account.asset.asset:0 +msgid "Confirm Asset" +msgstr "" + +#. module: account_asset +#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_tree +#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_tree +msgid "Asset Hierarchy" +msgstr "" diff --git a/addons/account_asset/security/ir.model.access.csv b/addons/account_asset/security/ir.model.access.csv old mode 100755 new mode 100644 diff --git a/addons/account_asset/wizard/__init__.py b/addons/account_asset/wizard/__init__.py old mode 100755 new mode 100644 diff --git a/addons/account_asset/wizard/account_asset_change_duration.py b/addons/account_asset/wizard/account_asset_change_duration.py old mode 100755 new mode 100644 diff --git a/addons/account_asset/wizard/wizard_asset_compute.py b/addons/account_asset/wizard/wizard_asset_compute.py old mode 100755 new mode 100644 diff --git a/addons/account_cancel/i18n/th.po b/addons/account_cancel/i18n/th.po new file mode 100644 index 00000000000..eabcc0814dd --- /dev/null +++ b/addons/account_cancel/i18n/th.po @@ -0,0 +1,23 @@ +# Thai translation for openobject-addons +# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR\n" +" Click to create Accounting Test.\n" +"
\n" +" " +msgstr "" + +#. module: account_test +#: model:accounting.assert.test,desc:account_test.account_test_01 +msgid "Check the balance: Debit sum = Credit sum" +msgstr "Проверяет баланс: сумма дебита = сумма кредита" + +#. module: account_test +#: model:accounting.assert.test,desc:account_test.account_test_08 +msgid "Check that general accounts and partners on account moves are active" +msgstr "" + +#. module: account_test +#: model:accounting.assert.test,name:account_test.account_test_06_1 +msgid "Test 7: « View » account type" +msgstr "" + +#. module: account_test +#: view:accounting.assert.test:0 +msgid "Code Help" +msgstr "" 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/html/account_illu_01.png b/addons/account_voucher/html/account_illu_01.png new file mode 100644 index 00000000000..2e0dbf4aac2 Binary files /dev/null and b/addons/account_voucher/html/account_illu_01.png differ diff --git a/addons/account_voucher/html/account_sc_00.png b/addons/account_voucher/html/account_sc_00.png new file mode 100644 index 00000000000..63332b46575 Binary files /dev/null and b/addons/account_voucher/html/account_sc_00.png differ diff --git a/addons/account_voucher/html/account_sc_02.png b/addons/account_voucher/html/account_sc_02.png new file mode 100644 index 00000000000..709e444ba0d Binary files /dev/null and b/addons/account_voucher/html/account_sc_02.png differ diff --git a/addons/account_voucher/html/account_sc_03.png b/addons/account_voucher/html/account_sc_03.png new file mode 100644 index 00000000000..a3e3afc34c0 Binary files /dev/null and b/addons/account_voucher/html/account_sc_03.png differ diff --git a/addons/account_voucher/html/account_sc_04.png b/addons/account_voucher/html/account_sc_04.png new file mode 100644 index 00000000000..458c8280c26 Binary files /dev/null and b/addons/account_voucher/html/account_sc_04.png differ diff --git a/addons/account_voucher/html/account_sc_06.png b/addons/account_voucher/html/account_sc_06.png new file mode 100644 index 00000000000..9605506c6a5 Binary files /dev/null and b/addons/account_voucher/html/account_sc_06.png differ diff --git a/addons/account_voucher/html/bazile.png b/addons/account_voucher/html/bazile.png new file mode 100644 index 00000000000..30f37e70b4a Binary files /dev/null and b/addons/account_voucher/html/bazile.png differ diff --git a/addons/account_voucher/html/index.html b/addons/account_voucher/html/index.html new file mode 100644 index 00000000000..d59c110dde5 --- /dev/null +++ b/addons/account_voucher/html/index.html @@ -0,0 +1,140 @@ +
+
+Invoicing Made Easy
+Send professional invoices & get paid online
+
+
+
+
+ 
+
+
+
+
+
+
+
+
+ + Create and send professional looking invoices & get paid + online. It automatically integrates with other apps to bill + automatically based on your activities. +
+ +Send Invoices With No Effort
+
+
+
+
+ + Send invoices directly to your clients in just a click. The + invoice is automatically attached to the email as a PDF file. +
+
+ 
+
+
+ Get Paid Faster
+Electronic invoicing and automated follow-ups
+
+
+
+ 
+
+
+
+
+ +Get paid online with paypal or other payment processing service. Get rid of +the stress of having to constantly remind your debtors. Simply set-up and +automate follow-ups to get paid quickly. +
+
+
+Connect Your Bank Accounts
+
+
+ +Import your bank statements and reconcile them in just a few clicks. Prepare +payment orders based on your supplier invoices and payment terms. +
+
+ 
+
+
+
+
+
+Analyse Your Sales & Costs
+
+ 
+
+
+
+
+ +Get direct access to key information with dynamic and customizable dashboards. +Analyse your invoicing by product, customer, salesperson, etc. +
+
+
+Integration With Other Apps
+
+
+ +Bill automatically based on sales orders, delivery orders, contracts or on time and +material. Define recurrencies to produce recurring invoice automatically. +
+
+ 
+
+
+
+
+
+
+ Many companies already enjoy it
+Hear what they have to say !
+
+
+
+ 
+
+
+ + OpenERP allowed us to automate sending 10.000 invoices per month. ++ +
+
+ Director of Bazile Telecom.
+
+
+
+
+ 
+
+
+ + We have found invoicing module of OpenERP to be user + friendly and highly customizable. ++ +
+
+ Director of Navyug Infosolutions Pvt. Ltd.
+
+
+
+
+
+ Note: If you do not expect this, you can safely ignore this email.
" msgstr "" +"\n" +"Был запрошен сброс пароля для аккаунта OpenERP связанного с этим адресом " +"эл.почты
\n" +"\n" +"Вы можете сменить пароль, проследовав по ссылке.
\n" +"\n" +"Примечание: если вы не запрашивали сброс пароля, просто проигнорируйте " +"данное письмо
" #. module: auth_signup #. openerp-web #: code:addons/auth_signup/static/src/js/auth_signup.js:111 #, python-format msgid "Please enter a name." -msgstr "" +msgstr "Пожалуйста, введите имя" #. module: auth_signup #: model:ir.model,name:auth_signup.model_res_users msgid "Users" -msgstr "" +msgstr "Пользователи" #. module: auth_signup #: field:res.partner,signup_url:0 @@ -146,7 +155,7 @@ msgstr "Пожалуйста, введите имя пользователя." #. module: auth_signup #: selection:res.users,state:0 msgid "Active" -msgstr "" +msgstr "Активен" #. module: auth_signup #: code:addons/auth_signup/res_users.py:269 @@ -155,39 +164,41 @@ msgid "" "Cannot send email: no outgoing email server configured.\n" "You can configure it under Settings/General Settings." msgstr "" +"Невозможно отправить email: не настроены сервера исходящей почты.\n" +"Вы можете настроить их в меню Настройки/Общие настройки" #. module: auth_signup #. openerp-web #: code:addons/auth_signup/static/src/xml/auth_signup.xml:12 #, python-format msgid "Username" -msgstr "" +msgstr "Имя пользователя" #. module: auth_signup #. openerp-web #: code:addons/auth_signup/static/src/xml/auth_signup.xml:8 #, python-format msgid "Name" -msgstr "" +msgstr "Имя" #. module: auth_signup #. openerp-web #: code:addons/auth_signup/static/src/js/auth_signup.js:170 #, python-format msgid "Please enter a username or email address." -msgstr "" +msgstr "Пожалуйста, введите имя пользователя или адрес эл. почты." #. module: auth_signup #: selection:res.users,state:0 msgid "Resetting Password" -msgstr "" +msgstr "Переустановка пароля" #. module: auth_signup #. openerp-web #: code:addons/auth_signup/static/src/xml/auth_signup.xml:13 #, python-format msgid "Username (Email)" -msgstr "" +msgstr "Имя пользователя (Email)" #. module: auth_signup #: field:res.partner,signup_expiration:0 @@ -198,13 +209,15 @@ msgstr "" #: help:base.config.settings,auth_signup_reset_password:0 msgid "This allows users to trigger a password reset from the Login page." msgstr "" +"Это позволяет пользователям запросить сброс пароля со страницы входа в " +"систему." #. module: auth_signup #. openerp-web #: code:addons/auth_signup/static/src/xml/auth_signup.xml:22 #, python-format msgid "Log in" -msgstr "" +msgstr "Вход" #. module: auth_signup #: field:res.partner,signup_valid:0 @@ -222,7 +235,7 @@ msgstr "" #: code:addons/auth_signup/static/src/js/auth_signup.js:170 #, python-format msgid "Login" -msgstr "" +msgstr "Вход" #. module: auth_signup #. openerp-web @@ -236,7 +249,7 @@ msgstr "" #: code:addons/auth_signup/static/src/js/auth_signup.js:120 #, python-format msgid "Passwords do not match; please retype them." -msgstr "" +msgstr "Пароли не совпадают; пожалуйста, введите их заново." #. module: auth_signup #. openerp-web @@ -244,7 +257,7 @@ msgstr "" #: code:addons/auth_signup/static/src/js/auth_signup.js:167 #, python-format msgid "No database selected !" -msgstr "" +msgstr "Не выбрана база данных!" #. module: auth_signup #: view:res.users:0 @@ -254,14 +267,14 @@ msgstr "" #. module: auth_signup #: field:base.config.settings,auth_signup_reset_password:0 msgid "Enable password reset from Login page" -msgstr "" +msgstr "Включить сброс пароля со страницы входа" #. module: auth_signup #. openerp-web #: code:addons/auth_signup/static/src/xml/auth_signup.xml:27 #, python-format msgid "Back to Login" -msgstr "" +msgstr "Вернуться к странице входа" #. module: auth_signup #. openerp-web @@ -273,7 +286,7 @@ msgstr "" #. module: auth_signup #: model:ir.model,name:auth_signup.model_res_partner msgid "Partner" -msgstr "" +msgstr "Партнер" #. module: auth_signup #: field:res.partner,signup_token:0 diff --git a/addons/auth_signup/res_users.py b/addons/auth_signup/res_users.py index f4a985280ac..891837f8813 100644 --- a/addons/auth_signup/res_users.py +++ b/addons/auth_signup/res_users.py @@ -23,6 +23,7 @@ import random from urllib import urlencode from urlparse import urljoin +from openerp.addons.base.ir.ir_mail_server import MailDeliveryException from openerp.osv import osv, fields from openerp.tools.misc import DEFAULT_SERVER_DATETIME_FORMAT from openerp.tools.safe_eval import safe_eval @@ -55,19 +56,22 @@ class res_partner(osv.Model): def _get_signup_url_for_action(self, cr, uid, ids, action='login', view_type=None, menu_id=None, res_id=None, model=None, context=None): """ generate a signup url for the given partner ids and action, possibly overriding the url state components (menu_id, id, view_type) """ + if context is None: + context= {} res = dict.fromkeys(ids, False) base_url = self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url') for partner in self.browse(cr, uid, ids, context): # when required, make sure the partner has a valid signup token - if context and context.get('signup_valid') and not partner.user_ids: + if context.get('signup_valid') and not partner.user_ids: self.signup_prepare(cr, uid, [partner.id], context=context) partner.refresh() # the parameters to encode for the query and fragment part of url query = {'db': cr.dbname} - fragment = {'action': action, 'type': partner.signup_type} + signup_type = context.get('signup_force_type_in_url', partner.signup_type or '') + fragment = {'action': action, 'type': signup_type} - if partner.signup_token: + if partner.signup_token and signup_type: fragment['token'] = partner.signup_token elif partner.user_ids: fragment['db'] = cr.dbname @@ -103,6 +107,9 @@ class res_partner(osv.Model): def action_signup_prepare(self, cr, uid, ids, context=None): return self.signup_prepare(cr, uid, ids, context=context) + def signup_cancel(self, cr, uid, ids, context=None): + return self.write(cr, uid, ids, {'signup_token': False, 'signup_type': False, 'signup_expiration': False}, context=context) + def signup_prepare(self, cr, uid, ids, signup_type="signup", expiration=False, context=None): """ generate a new token for the partners with the given validity, if necessary :param expiration: the expiration datetime of the token (string, optional) @@ -202,7 +209,7 @@ class res_users(osv.Model): }) if partner.company_id: values['company_id'] = partner.company_id.id - values['company_ids'] = [(6,0,[partner.company_id.id])] + values['company_ids'] = [(6, 0, [partner.company_id.id])] self._signup_create_user(cr, uid, values, context=context) else: # no token, sign up an external user @@ -259,25 +266,26 @@ class res_users(osv.Model): pass if not bool(template): template = self.pool.get('ir.model.data').get_object(cr, uid, 'auth_signup', 'reset_password_email') - mail_obj = self.pool.get('mail.mail') assert template._name == 'email.template' for user in self.browse(cr, uid, ids, context): if not user.email: raise osv.except_osv(_("Cannot send email: user has no email address."), user.name) - mail_id = self.pool.get('email.template').send_mail(cr, uid, template.id, user.id, True, context=context) - mail_state = mail_obj.read(cr, uid, mail_id, ['state'], context=context) - - if mail_state and mail_state['state'] == 'exception': - raise self.pool.get('res.config.settings').get_config_warning(cr, _("Cannot send email: no outgoing email server configured.\nYou can configure it under %(menu:base_setup.menu_general_configuration)s."), context) - else: - return True + try: + self.pool.get('email.template').send_mail(cr, uid, template.id, user.id, force_send=True, raise_exception=True, context=context) + except Exception: + raise def create(self, cr, uid, values, context=None): + if context is None: + context = {} # overridden to automatically invite user to sign up user_id = super(res_users, self).create(cr, uid, values, context=context) user = self.browse(cr, uid, user_id, context=context) - if context and context.get('reset_password') and user.email: - ctx = dict(context, create_user=True) - self.action_reset_password(cr, uid, [user.id], context=ctx) + if user.email and not context.get('no_reset_password'): + context.update({'create_user': True}) + try: + self.action_reset_password(cr, uid, [user.id], context=context) + except MailDeliveryException: + self.pool.get('res.partner').signup_cancel(cr, uid, [user.partner_id.id], context=context) return user_id diff --git a/addons/auth_signup/res_users_view.xml b/addons/auth_signup/res_users_view.xml index 28f66eb101d..60c419db737 100644 --- a/addons/auth_signup/res_users_view.xml +++ b/addons/auth_signup/res_users_view.xml @@ -31,9 +31,11 @@
-
-
+
- Select a filter or a timer as condition.
An action rule is checked when you create or modify the "Related Document Model". The precondition filter is checked right before the modification while the postcondition filter is checked after the modification. A precondition filter will therefore not work during a creation.
- To create a new filter:
- - Go to your "Related Document Model" page and set the filter parameters in the "Search" view (Example of filter based on Leads/Opportunities: Creation Date "is equal to" 01/01/2012)
- - In this same "Search" view, select the menu "Save Current Filter", enter the name (Ex: Create the 01/01/2012) and add the option "Share with all users"
+
+ Select when the action must be run, and add filters and/or timing conditions.
+
+ In order to create a new filter:
+
-
+
- Go to your "Related Document Model" page and set the filter parameters in the "Search" view (Example of filter based on Leads/Opportunities: Creation Date "is equal to" 01/01/2012) +
- In this same "Search" view, select the menu "Save Current Filter", enter the name (Ex: Create the 01/01/2012) and add the option "Share with all users" +
-
diff --git a/addons/mail/tests/test_mail_features.py b/addons/mail/tests/test_mail_features.py
index 7eea66b3b90..46f4555349d 100644
--- a/addons/mail/tests/test_mail_features.py
+++ b/addons/mail/tests/test_mail_features.py
@@ -19,12 +19,15 @@
#
##############################################################################
+from openerp.addons.mail.mail_mail import mail_mail
+from openerp.addons.mail.mail_thread import mail_thread
from openerp.addons.mail.tests.test_mail_base import TestMailBase
+from openerp.tools import mute_logger
from openerp.tools.mail import html_sanitize
class test_mail(TestMailBase):
-
+
def test_000_alias_setup(self):
""" Test basic mail.alias setup works, before trying to use them for routing """
cr, uid = self.cr, self.uid
@@ -43,7 +46,6 @@ class test_mail(TestMailBase):
self.user_barty = self.res_users.browse(cr, uid, self.user_barty_id)
self.assertEquals(self.user_barty.alias_name, 'b4r+_-_r3wl-', 'Disallowed chars should be replaced by hyphens')
-
def test_00_followers_function_field(self):
""" Tests designed for the many2many function field 'follower_ids'.
We will test to perform writes using the many2many commands 0, 3, 4,
@@ -116,18 +118,66 @@ class test_mail(TestMailBase):
# CASE1: test subscriptions with subtypes
# ----------------------------------------
- # Do: Subscribe Raoul three times (niak niak) through message_subscribe_users
+ # Do: subscribe Raoul, should have default subtypes
+ group_pigs.message_subscribe_users([user_raoul.id])
+ group_pigs.refresh()
+ # Test: 2 followers (Admin and Raoul)
+ follower_ids = [follower.id for follower in group_pigs.message_follower_ids]
+ self.assertEqual(set(follower_ids), set([user_raoul.partner_id.id, user_admin.partner_id.id]),
+ 'message_subscribe: Admin and Raoul should be the only 2 Pigs fans')
+ # Raoul follows default subtypes
+ fol_ids = self.mail_followers.search(cr, uid, [
+ ('res_model', '=', 'mail.group'),
+ ('res_id', '=', self.group_pigs_id),
+ ('partner_id', '=', user_raoul.partner_id.id)
+ ])
+ fol_obj = self.mail_followers.browse(cr, uid, fol_ids)[0]
+ fol_subtype_ids = set([subtype.id for subtype in fol_obj.subtype_ids])
+ self.assertEqual(set(fol_subtype_ids), set(default_group_subtypes),
+ 'message_subscribe: Raoul subscription subtypes are incorrect, should be all default ones')
+
+ # Do: subscribe Raoul with specified new subtypes
+ group_pigs.message_subscribe_users([user_raoul.id], subtype_ids=[mt_mg_nodef])
+ # Test: 2 followers (Admin and Raoul)
+ follower_ids = [follower.id for follower in group_pigs.message_follower_ids]
+ self.assertEqual(set(follower_ids), set([user_raoul.partner_id.id, user_admin.partner_id.id]),
+ 'message_subscribe: Admin and Raoul should be the only 2 Pigs fans')
+ # Test: 2 lines in mail.followers (no duplicate for Raoul)
+ fol_ids = self.mail_followers.search(cr, uid, [
+ ('res_model', '=', 'mail.group'),
+ ('res_id', '=', self.group_pigs_id),
+ ])
+ self.assertEqual(len(fol_ids), 2,
+ 'message_subscribe: subscribing an already-existing follower should not create new entries in mail.followers')
+ # Test: Raoul follows only specified subtypes
+ fol_ids = self.mail_followers.search(cr, uid, [
+ ('res_model', '=', 'mail.group'),
+ ('res_id', '=', self.group_pigs_id),
+ ('partner_id', '=', user_raoul.partner_id.id)
+ ])
+ fol_obj = self.mail_followers.browse(cr, uid, fol_ids)[0]
+ fol_subtype_ids = set([subtype.id for subtype in fol_obj.subtype_ids])
+ self.assertEqual(set(fol_subtype_ids), set([mt_mg_nodef]),
+ 'message_subscribe: Raoul subscription subtypes are incorrect, should be only specified')
+
+ # Do: Subscribe Raoul without specified subtypes: should not erase existing subscription subtypes
group_pigs.message_subscribe_users([user_raoul.id, user_raoul.id])
group_pigs.message_subscribe_users([user_raoul.id])
group_pigs.refresh()
# Test: 2 followers (Admin and Raoul)
follower_ids = [follower.id for follower in group_pigs.message_follower_ids]
- self.assertEqual(set(follower_ids), set([user_raoul.partner_id.id, user_admin.partner_id.id]), 'Admin and Raoul should be the only 2 Pigs fans')
+ self.assertEqual(set(follower_ids), set([user_raoul.partner_id.id, user_admin.partner_id.id]),
+ 'message_subscribe: Admin and Raoul should be the only 2 Pigs fans')
# Test: Raoul follows default subtypes
- fol_ids = self.mail_followers.search(cr, uid, [('res_model', '=', 'mail.group'), ('res_id', '=', self.group_pigs_id), ('partner_id', '=', user_raoul.partner_id.id)])
+ fol_ids = self.mail_followers.search(cr, uid, [
+ ('res_model', '=', 'mail.group'),
+ ('res_id', '=', self.group_pigs_id),
+ ('partner_id', '=', user_raoul.partner_id.id)
+ ])
fol_obj = self.mail_followers.browse(cr, uid, fol_ids)[0]
fol_subtype_ids = set([subtype.id for subtype in fol_obj.subtype_ids])
- self.assertEqual(set(fol_subtype_ids), set(default_group_subtypes), 'subscription subtypes are incorrect')
+ self.assertEqual(set(fol_subtype_ids), set([mt_mg_nodef]),
+ 'message_subscribe: Raoul subscription subtypes are incorrect, should be only specified')
# Do: Unsubscribe Raoul twice through message_unsubscribe_users
group_pigs.message_unsubscribe_users([user_raoul.id, user_raoul.id])
@@ -135,6 +185,13 @@ class test_mail(TestMailBase):
# Test: 1 follower (Admin)
follower_ids = [follower.id for follower in group_pigs.message_follower_ids]
self.assertEqual(follower_ids, [user_admin.partner_id.id], 'Admin must be the only Pigs fan')
+ # Test: 1 lines in mail.followers (no duplicate for Raoul)
+ fol_ids = self.mail_followers.search(cr, uid, [
+ ('res_model', '=', 'mail.group'),
+ ('res_id', '=', self.group_pigs_id)
+ ])
+ self.assertEqual(len(fol_ids), 1,
+ 'message_subscribe: group should have only 1 entry in mail.follower for 1 follower')
# Do: subscribe Admin with subtype_ids
group_pigs.message_subscribe_users([uid], [mt_mg_nodef, mt_all_nodef])
@@ -171,6 +228,64 @@ class test_mail(TestMailBase):
self.assertNotIn('First answer, should not be displayed', result, 'Old answer should not be in quote.')
self.assertNotIn('My answer I am propagating', result, 'Thread header content should be in quote.')
+ def test_11_notification_url(self):
+ """ Tests designed to test the URL added in notification emails. """
+ cr, uid, group_pigs = self.cr, self.uid, self.group_pigs
+
+ # Partner data
+ partner_raoul = self.res_partner.browse(cr, uid, self.partner_raoul_id)
+ partner_bert_id = self.res_partner.create(cr, uid, {'name': 'bert'})
+ partner_bert = self.res_partner.browse(cr, uid, partner_bert_id)
+ # Mail data
+ mail_mail_id = self.mail_mail.create(cr, uid, {'state': 'exception'})
+ mail = self.mail_mail.browse(cr, uid, mail_mail_id)
+
+ # Test: link for nobody -> None
+ url = mail_mail._get_partner_access_link(self.mail_mail, cr, uid, mail)
+ self.assertEqual(url, None,
+ 'notification email: mails not send to a specific partner should not have any URL')
+
+ # Test: link for partner -> None
+ url = mail_mail._get_partner_access_link(self.mail_mail, cr, uid, mail, partner=partner_bert)
+ self.assertEqual(url, None,
+ 'notification email: mails send to a not-user partner should not have any URL')
+
+ # Test: link for user -> signin
+ url = mail_mail._get_partner_access_link(self.mail_mail, cr, uid, mail, partner=partner_raoul)
+ self.assertIn('action=mail.action_mail_redirect', url,
+ 'notification email: link should contain the redirect action')
+ self.assertIn('login=%s' % partner_raoul.user_ids[0].login, url,
+ 'notification email: link should contain the user login')
+
+ @mute_logger('openerp.addons.mail.mail_thread', 'openerp.osv.orm')
+ def test_12_inbox_redirection(self):
+ """ Tests designed to test the inbox redirection of emails notification URLs. """
+ cr, uid, user_admin, group_pigs = self.cr, self.uid, self.user_admin, self.group_pigs
+ model, act_id = self.ir_model_data.get_object_reference(cr, uid, 'mail', 'action_mail_inbox_feeds')
+ # Data: post a message on pigs
+ msg_id = self.group_pigs.message_post(body='My body', partner_ids=[self.partner_bert_id], type='comment', subtype='mail.mt_comment')
+
+ # No specific parameters -> should redirect to Inbox
+ action = mail_thread.message_redirect_action(self.mail_thread, cr, self.user_raoul_id, {'params': {}})
+ self.assertEqual(action.get('type'), 'ir.actions.client',
+ 'URL redirection: action without parameters should redirect to client action Inbox')
+ self.assertEqual(action.get('id'), act_id,
+ 'URL redirection: action without parameters should redirect to client action Inbox')
+
+ # Bert has read access to Pigs -> should redirect to form view of Pigs
+ action = mail_thread.message_redirect_action(self.mail_thread, cr, self.user_raoul_id, {'params': {'message_id': msg_id}})
+ self.assertEqual(action.get('type'), 'ir.actions.act_window',
+ 'URL redirection: action with message_id for read-accredited user should redirect to Pigs')
+ self.assertEqual(action.get('res_id'), group_pigs.id,
+ 'URL redirection: action with message_id for read-accredited user should redirect to Pigs')
+
+ # Bert has no read access to Pigs -> should redirect to Inbox
+ action = mail_thread.message_redirect_action(self.mail_thread, cr, self.user_bert_id, {'params': {'message_id': msg_id}})
+ self.assertEqual(action.get('type'), 'ir.actions.client',
+ 'URL redirection: action without parameters should redirect to client action Inbox')
+ self.assertEqual(action.get('id'), act_id,
+ 'URL redirection: action without parameters should redirect to client action Inbox')
+
def test_20_message_post(self):
""" Tests designed for message_post. """
cr, uid, user_raoul, group_pigs = self.cr, self.uid, self.user_raoul, self.group_pigs
@@ -364,8 +479,8 @@ class test_mail(TestMailBase):
'message_post: notification email sent to more than one email address instead of a precise partner')
self.assertIn(sent_email['email_to'][0], test_emailto,
'message_post: notification email email_to incorrect')
- self.assertEqual(sent_email['reply_to'], '"Followers of Pigs"
+
Applicant multi company rule
- ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]
diff --git a/addons/hr_timesheet/__openerp__.py b/addons/hr_timesheet/__openerp__.py
index bff25e8e55d..fa14c45f84a 100644
--- a/addons/hr_timesheet/__openerp__.py
+++ b/addons/hr_timesheet/__openerp__.py
@@ -21,7 +21,7 @@
{
- 'name': 'Timesheets',
+ 'name': 'Time Tracking',
'version': '1.0',
'category': 'Human Resources',
'sequence': 23,
diff --git a/addons/hr_timesheet/hr_timesheet.py b/addons/hr_timesheet/hr_timesheet.py
index 22dfb7b9552..f49ad05f7a9 100644
--- a/addons/hr_timesheet/hr_timesheet.py
+++ b/addons/hr_timesheet/hr_timesheet.py
@@ -37,8 +37,11 @@ class hr_employee(osv.osv):
def _getAnalyticJournal(self, cr, uid, context=None):
md = self.pool.get('ir.model.data')
try:
- result = md.get_object_reference(cr, uid, 'hr_timesheet', 'analytic_journal')
- return result[1]
+ dummy, res_id = md.get_object_reference(cr, uid, 'hr_timesheet', 'analytic_journal')
+ #search on id found in result to check if current user has read access right
+ check_right = self.pool.get('account.analytic.journal').search(cr, uid, [('id', '=', res_id)], context=context)
+ if check_right:
+ return res_id
except ValueError:
pass
return False
@@ -46,8 +49,11 @@ class hr_employee(osv.osv):
def _getEmployeeProduct(self, cr, uid, context=None):
md = self.pool.get('ir.model.data')
try:
- result = md.get_object_reference(cr, uid, 'product', 'product_product_consultant')
- return result[1]
+ dummy, res_id = md.get_object_reference(cr, uid, 'product', 'product_product_consultant')
+ #search on id found in result to check if current user has read access right
+ check_right = self.pool.get('product.template').search(cr, uid, [('id', '=', res_id)], context=context)
+ if check_right:
+ return res_id
except ValueError:
pass
return False
diff --git a/addons/hr_timesheet/hr_timesheet_demo.xml b/addons/hr_timesheet/hr_timesheet_demo.xml
index b6773dbbdd6..2abea3ada67 100644
--- a/addons/hr_timesheet/hr_timesheet_demo.xml
+++ b/addons/hr_timesheet/hr_timesheet_demo.xml
@@ -34,7 +34,7 @@
Manager HR Analytic Timesheet
- [(1,'=',1)]
Employee HR Analytic Timesheet
- [('user_id', '=', user.id)]
diff --git a/addons/hr_timesheet_invoice/test/test_hr_timesheet_invoice.yml b/addons/hr_timesheet_invoice/test/test_hr_timesheet_invoice.yml
index 0896cf7d517..05326bb19c1 100644
--- a/addons/hr_timesheet_invoice/test/test_hr_timesheet_invoice.yml
+++ b/addons/hr_timesheet_invoice/test/test_hr_timesheet_invoice.yml
@@ -102,17 +102,4 @@
assert aline.invoice_id, "Invoice created, but analytic line wasn't updated."
assert aline.invoice_id == invoice_id, "Invoice doesn't match the one at analytic line"
assert invoice_id.amount_untaxed == 187.5, "Invoice amount mismatch: %s" % invoice_id.amount_untaxed
- assert invoice_id.amount_tax == 50, "Invoice tax mismatch: %s" % invoice_id.amount_tax
--
- I create final invoice for this analytic account.
--
- !record {model: hr.timesheet.invoice.create.final, id: hr_timesheet_invoice_create_final_0}:
- date: 1
- name: 1
- price: 1
- time: 1
--
- I click on "Create Invoice" button to create Invoice and validate the invoice.
--
- !python {model: hr.timesheet.invoice.create.final}: |
- res = self.do_create(cr, uid, [ref("hr_timesheet_invoice_create_final_0")], {"active_ids": [ref("account.analytic_agrolait")]})
+ assert invoice_id.amount_tax == 50, "Invoice tax mismatch: %s" % invoice_id.amount_tax
\ No newline at end of file
diff --git a/addons/hr_timesheet_invoice/test/test_hr_timesheet_invoice_no_prod_tax.yml b/addons/hr_timesheet_invoice/test/test_hr_timesheet_invoice_no_prod_tax.yml
index d00963073f0..88675f3042f 100644
--- a/addons/hr_timesheet_invoice/test/test_hr_timesheet_invoice_no_prod_tax.yml
+++ b/addons/hr_timesheet_invoice/test/test_hr_timesheet_invoice_no_prod_tax.yml
@@ -101,17 +101,4 @@
assert aline.invoice_id, "Invoice created, but analytic line wasn't updated."
assert aline.invoice_id == invoice_id, "Invoice doesn't match the one at analytic line"
assert invoice_id.amount_untaxed == 187.5, "Invoice amount mismatch: %s" % invoice_id.amount_untaxed
- assert invoice_id.amount_tax == 40, "Invoice tax mismatch: %s" % invoice_id.amount_tax
--
- I create final invoice for this analytic account.
--
- !record {model: hr.timesheet.invoice.create.final, id: hr_timesheet_invoice_create_final_0}:
- date: 1
- name: 1
- price: 1
- time: 1
--
- I click on "Create Invoice" button to create Invoice and validate the invoice.
--
- !python {model: hr.timesheet.invoice.create.final}: |
- res = self.do_create(cr, uid, [ref("hr_timesheet_invoice_create_final_0")], {"active_ids": [ref("account.analytic_agrolait")]})
+ assert invoice_id.amount_tax == 40, "Invoice tax mismatch: %s" % invoice_id.amount_tax
\ No newline at end of file
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
index 156732ba33d..70f94a4f57e 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
@@ -289,7 +289,7 @@ class hr_timesheet_line(osv.osv):
return ts_line_ids
_columns = {
- 'sheet_id': fields.function(_sheet, string='Sheet',
+ 'sheet_id': fields.function(_sheet, string='Sheet', select="1",
type='many2one', relation='hr_timesheet_sheet.sheet', ondelete="cascade",
store={
'hr_timesheet_sheet.sheet': (_get_hr_timesheet_sheet, ['employee_id', 'date_from', 'date_to'], 10),
@@ -473,12 +473,8 @@ class hr_timesheet_sheet_sheet_day(osv.osv):
0.0 as total_attendance
from
hr_analytic_timesheet hrt
- left join (account_analytic_line l
- LEFT JOIN hr_timesheet_sheet_sheet s
- ON (s.date_to >= l.date
- AND s.date_from <= l.date
- AND s.user_id = l.user_id))
- on (l.id = hrt.line_id)
+ JOIN account_analytic_line l ON l.id = hrt.line_id
+ LEFT JOIN hr_timesheet_sheet_sheet s ON s.id = hrt.sheet_id
group by l.date::date, s.id
) union (
select
@@ -489,14 +485,8 @@ class hr_timesheet_sheet_sheet_day(osv.osv):
SUM(((EXTRACT(hour FROM a.name) * 60) + EXTRACT(minute FROM a.name)) * (CASE WHEN a.action = 'sign_in' THEN -1 ELSE 1 END)) as total_attendance
from
hr_attendance a
- LEFT JOIN (hr_timesheet_sheet_sheet s
- LEFT JOIN resource_resource r
- LEFT JOIN hr_employee e
- ON (e.resource_id = r.id)
- ON (s.user_id = r.user_id))
- ON (a.employee_id = e.id
- AND s.date_to >= date_trunc('day',a.name)
- AND s.date_from <= a.name)
+ LEFT JOIN hr_timesheet_sheet_sheet s
+ ON s.id = a.sheet_id
WHERE action in ('sign_in', 'sign_out')
group by a.name::date, s.id
)) AS foo
diff --git a/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml b/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml
index 628cc2097ae..7ebec9ab228 100644
--- a/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml
+++ b/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml
@@ -100,24 +100,24 @@
@@ -125,24 +125,24 @@
- Provincial Regime
+ Provincial Regime (PROV)
- Harmonized Provinces Regime (12%)
+ Harmonized Provinces Regime (12%) (BC)
- Harmonized Provinces Regime (13%)
+ Harmonized Provinces Regime (13%) (ON, NB, NL)
@@ -25,17 +25,17 @@
- Harmonized Provinces Regime (15%)
+ Harmonized Provinces Regime (15%) (NS)
- Non-Harmonized Provinces Regime
+ Non-Harmonized Provinces Regime (AB, MB, SK, PE, NT, NU, YT)
- International Regime
+ International Regime (INTL)
diff --git a/addons/l10n_ca/fiscal_templates_fr.xml b/addons/l10n_ca/fiscal_templates_fr.xml
index 3ba13d6642e..b01ab0985ea 100644
--- a/addons/l10n_ca/fiscal_templates_fr.xml
+++ b/addons/l10n_ca/fiscal_templates_fr.xml
@@ -5,7 +5,7 @@
- Régime Provincial
+ Régime Provincial (PROV)
@@ -30,12 +30,12 @@
- Régime Provinces Non-Harmonisées
+ Régime Provinces Non-Harmonisées (AB, MB, SK, PE, NT, NU, YT)
- Régime International
+ Régime International (INTL)
diff --git a/addons/l10n_ch/__init__.py b/addons/l10n_ch/__init__.py
index f0b006c2b32..12d42707679 100644
--- a/addons/l10n_ch/__init__.py
+++ b/addons/l10n_ch/__init__.py
@@ -1,8 +1,11 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# Author: Nicolas Bessi. Copyright Camptocamp SA
-# Donors: Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA
+# Financial contributors: Hasa SA, Open Net SA,
+# Prisme Solutions Informatique SA, Quod SA
+#
+# Translation contributors: brain-tec AG, Agile Business Group
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
diff --git a/addons/l10n_ch/__openerp__.py b/addons/l10n_ch/__openerp__.py
index e068c7365a1..8960224891d 100644
--- a/addons/l10n_ch/__openerp__.py
+++ b/addons/l10n_ch/__openerp__.py
@@ -1,8 +1,11 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# Author: Nicolas Bessi. Copyright Camptocamp SA
-# Donors: Hasa SA, Open Net SA and Prisme Solutions Informatique SA
+# Financial contributors: Hasa SA, Open Net SA,
+# Prisme Solutions Informatique SA, Quod SA
+#
+# Translation contributors: brain-tec AG, Agile Business Group
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
@@ -21,29 +24,29 @@
{'name': 'Switzerland - Accounting',
'description': """
-Swiss localization :
-====================
-**Multilang swiss STERCHI account chart and taxes**
- **Author:** Camptocamp SA
+ Swiss localization :
+ ====================
+ **Multilang swiss STERCHI account chart and taxes**
+ **Author:** Camptocamp SA
- **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA
+ **Financial contributors:** Prisme Solutions Informatique SA, Quod SA
- **Translators:** brain-tec AG, Agile Business Group
+ **Translation contributors:** brain-tec AG, Agile Business Group
-**This release will introduce major changes to l10n_ch.**
+ **This release will introduce major changes to l10n_ch.**
-Due to important refactoring needs and the Switzerland adoption of new international payment standard during 2013-2014. We have reorganised the swiss localization addons this way:
+ Due to important refactoring needs and the Switzerland adoption of new international payment standard during 2013-2014. We have reorganised the swiss localization addons this way:
-- **l10n_ch**: Multilang swiss STERCHI account chart and taxes (official addon)
-- **l10n_ch_base_bank**: Technical module that introduces a new and simplified version of bank type management
-- **l10n_ch_bank**: List of swiss banks
-- **l10n_ch_zip**: List of swiss postal zip
-- **l10n_ch_dta**: Support of dta payment protocol (will be deprecated end 2014)
-- **l10n_ch_payment_slip**: Support of ESR/BVR payment slip report and reconciliation. Report refactored with easy element positioning.
-- **l10n_ch_sepa**: Alpha implementation of PostFinance SEPA/PAIN support will be completed during 2013/2014
+ - **l10n_ch**: Multilang swiss STERCHI account chart and taxes (official addon)
+ - **l10n_ch_base_bank**: Technical module that introduces a new and simplified version of bank type management
+ - **l10n_ch_bank**: List of swiss banks
+ - **l10n_ch_zip**: List of swiss postal zip
+ - **l10n_ch_dta**: Support of dta payment protocol (will be deprecated end 2014)
+ - **l10n_ch_payment_slip**: Support of ESR/BVR payment slip report and reconciliation. Report refactored with easy element positioning.
+ - **l10n_ch_sepa**: Alpha implementation of PostFinance SEPA/PAIN support will be completed during 2013/2014
-The modules will be soon available on OpenERP swiss localization on launchpad:
-https://launchpad.net/openerp-swiss-localization
+ The modules will be soon available on OpenERP swiss localization on launchpad:
+ https://launchpad.net/openerp-swiss-localization
""",
'version': '7.0',
'author': 'Camptocamp',
diff --git a/addons/l10n_ch/account_wizard.py b/addons/l10n_ch/account_wizard.py
index e0a9e84b90a..4b985c09b76 100644
--- a/addons/l10n_ch/account_wizard.py
+++ b/addons/l10n_ch/account_wizard.py
@@ -1,8 +1,11 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# Author: Nicolas Bessi. Copyright Camptocamp SA
-# Donors: Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA
+# Financial contributors: Hasa SA, Open Net SA,
+# Prisme Solutions Informatique SA, Quod SA
+#
+# Translation contributors: brain-tec AG, Agile Business Group
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
diff --git a/addons/l10n_cl/__init__.py b/addons/l10n_cl/__init__.py
index 92da5dbf966..25e7e337165 100644
--- a/addons/l10n_cl/__init__.py
+++ b/addons/l10n_cl/__init__.py
@@ -23,7 +23,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#
##############################################################################
diff --git a/addons/l10n_cr/l10n_cr_base_data.xml b/addons/l10n_cr/l10n_cr_base_data.xml
index 2268ecb37ed..28674185a85 100644
--- a/addons/l10n_cr/l10n_cr_base_data.xml
+++ b/addons/l10n_cr/l10n_cr_base_data.xml
@@ -1,4 +1,3 @@
-
@@ -8,38 +7,38 @@
-->
SJ
- San José
- San José
+
A
Alajuela
-
H
Heredia
-
C
Cartago
-
P
Puntarenas
-
G
Guanacaste
-
L
- Limón
- Limón
+
@@ -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
- other
Anticipos de remuneraciones
@@ -4759,7 +4759,7 @@
465
- other
Remuneraciones pendientes de pago
@@ -4775,7 +4775,7 @@
466
- other
Remuneraciones mediante sistemas de aportación definida pendientes de pago
@@ -4805,8 +4805,8 @@
Hacienda Pública, deudora por IVA
-
- 4700
+
+ 470000
receivable
@@ -4869,6 +4869,14 @@
Hacienda Pública, IVA soportado
+
+ 472000
+ other
+ Hacienda Pública. IVA soportado
+
473
Hacienda Pública, retenciones y pagos a cuenta
+
+ 473000
+ other
+ Hacienda Pública, retenciones y pagos a cuenta
+
474
Hacienda Pública, acreedora por IVA
-
- 4750
+
+ 475000
payable
@@ -4965,8 +4981,8 @@
Hacienda Pública, acreedora por retenciones practicadas
-
- 4751
+
+ 475100
payable
@@ -5029,6 +5045,14 @@
Hacienda Pública, IVA repercutido
+
+ 477000
+ other
+ Hacienda Pública. IVA repercutido
+
479
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
+
+ Retención IRPF 21%
+
+
+
+ Retención IRPF 20%
+
+
Retención IRPF 19%
+
+ Retención IRPF 9%
+
+
Retención IRPF 7%
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
-
-
-
-
-
-
-
@@ -138,6 +185,12 @@
+
+
+
+
+
-
+
-
+
+
-
-
-
-
-
@@ -178,30 +226,71 @@
+
+
+
-
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -215,27 +304,87 @@
-
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
-
-
-
-
+
-
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -372,7 +667,310 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
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
+
+ Retención IRPF 21%
+
+
+
+ Retención IRPF 20%
+
+
Retención IRPF 19%
+
+ Retención IRPF 9%
+
+
Retención IRPF 7%
+
-
+
-
-
-
-
-
-
@@ -121,30 +130,69 @@
+
+
+
-
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -164,6 +212,12 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
-
-
-
-
-
-
-
@@ -246,6 +334,12 @@
+
+
+
+
+
+
-
+
-
+
-
-
-
-
-
-
@@ -294,7 +382,7 @@
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -395,9 +687,312 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
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
- 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
+
+
@@ -1036,15 +1314,15 @@
purchase
-
+
IVA 4% Importaciones bienes corrientes
IVA 4% Importaciones bienes corrientes
percent
- IVA 4% Importaciones bienes de inversión
percent
- purchase
-
+
IVA 7% Importaciones bienes corrientes
IVA 7% Importaciones bienes corrientes
percent
- IVA 7% Importaciones bienes de inversión
percent
- purchase
-
+
IVA 8% Importaciones bienes corrientes
IVA 8% Importaciones bienes corrientes
percent
- 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
- IVA 16% Importaciones bienes de inversión
percent
- purchase
-
+
IVA 18% Importaciones bienes corrientes
IVA 18% Importaciones bienes corrientes
percent
- 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
+
+
percent
- purchase
@@ -1287,8 +1640,8 @@
percent
- purchase
-
+
IVA 18% Inversión del sujeto pasivo
@@ -1333,16 +1686,16 @@
percent
- purchase
@@ -1351,8 +1704,8 @@
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
+ 0.50% Recargo Equivalencia Ventas
percent
- sale
-
+
1% Recargo Equivalencia
+ 1% Recargo Equivalencia Ventas
percent
- sale
-
+
+
+ 1.4% Recargo Equivalencia Ventas
+ percent
+ sale
+
+
4% Recargo Equivalencia
+ 4% Recargo Equivalencia Ventas
percent
- 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
+
+
+
-
+
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
@@ -1902,8 +2129,8 @@
IVA 4% Intracomunitario. Bienes corrientes (1)
percent
- IVA 4% Intracomunitario. Bienes corrientes (2)
percent
- IVA 4% Intracomunitario. Bienes de inversión (1)
percent
- IVA 4% 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 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.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
@@ -2047,128 +2819,78 @@
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%
-
-
-
- 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
- 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
@@ -2297,56 +3055,70 @@
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
@@ -2354,128 +3126,78 @@
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%
-
-
-
- 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
- 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
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 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.0
Base 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
- 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
+
+
@@ -1056,15 +1324,15 @@
purchase
-
+
IVA 4% Importaciones bienes corrientes
IVA 4% Importaciones bienes corrientes
percent
- IVA 4% Importaciones bienes de inversión
percent
- purchase
-
+
IVA 7% Importaciones bienes corrientes
IVA 7% Importaciones bienes corrientes
percent
- IVA 7% Importaciones bienes de inversión
percent
- purchase
-
+
IVA 8% Importaciones bienes corrientes
IVA 8% Importaciones bienes corrientes
percent
- 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
- IVA 16% Importaciones bienes de inversión
percent
- purchase
-
+
IVA 18% Importaciones bienes corrientes
IVA 18% Importaciones bienes corrientes
percent
- 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
+
@@ -1255,7 +1595,7 @@
sale
-
+
percent
- purchase
@@ -1308,8 +1648,8 @@
percent
- purchase
-
+
IVA 18% Inversión del sujeto pasivo
@@ -1354,16 +1694,16 @@
percent
- purchase
@@ -1372,8 +1712,8 @@
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
+ 0.50% Recargo Equivalencia Ventas
percent
- sale
-
+
1% Recargo Equivalencia
+ 1% Recargo Equivalencia Ventas
percent
- sale
-
+
+
+ 1.4% Recargo Equivalencia Ventas
+ percent
+ sale
+
+
4% Recargo Equivalencia
+ 4% Recargo Equivalencia Ventas
percent
- 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
+
+
+
-
+
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 (1)
percent
- IVA 4% Intracomunitario. Bienes corrientes (2)
percent
- IVA 4% Intracomunitario. Bienes de inversión (1)
percent
- IVA 4% 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 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.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
@@ -2068,56 +2824,70 @@
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
@@ -2127,7 +2897,7 @@
Hacienda Pública. Retenciones empresarios módulos 1%
-
+
475102
Hacienda Pública. Retenciones act. agrícolas, ganaderas, forestales 2%
-
+
475107
Hacienda Pública. Retenciones act. profesionales 7%
-
+
+
+ 475109
+ other
+ Hacienda Pública. Retenciones act. profesionales 9%
+
+
475115
Hacienda Pública. Retenciones act. profesionales 15%
-
+
475118
Hacienda Pública. Retenciones arrendamientos, cap. mobiliario 18%
-
+
475119
Hacienda Pública. Retenciones arrendamientos, cap. mobiliario 19%
-
+
+
+ 475120
+ other
+ Hacienda Pública. Retenciones arrendamientos, cap. mobiliario 20%
+
+
475121
Hacienda Pública. Retenciones arrendamientos, cap. mobiliario 21%
-
+
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 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
@@ -2375,56 +3213,70 @@
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
@@ -2434,7 +3286,7 @@
Hacienda Pública. Retenciones a cuenta empresarios módulos 1%
-
+
473002
Hacienda Pública. Retenciones a cuenta act. agrícolas, ganaderas, forestales 2%
-
+
473007
Hacienda Pública. Retenciones a cuenta act. profesionales 7%
-
+
+
+ 473009
+ other
+ Hacienda Pública. Retenciones a cuenta act. profesionales 9%
+
+
473015
Hacienda Pública. Retenciones a cuenta act. profesionales 15%
-
+
473018
Hacienda Pública. Retenciones a cuenta arrendamientos, cap. mobiliario 18%
-
+
473019
Hacienda Pública. Retenciones a cuenta arrendamientos, cap. mobiliario 19%
-
+
+
+ 473020
+ other
+ Hacienda Pública. Retenciones a cuenta arrendamientos, cap. mobiliario 20%
+
+
473021
Hacienda Pública. Retenciones a cuenta arrendamientos, cap. mobiliario 21%
-
+
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_it/__openerp__.py b/addons/l10n_it/__openerp__.py
index 00ba19e9c42..686fb5ff0d4 100644
--- a/addons/l10n_it/__openerp__.py
+++ b/addons/l10n_it/__openerp__.py
@@ -29,7 +29,7 @@
{
'name': 'Italy - Accounting',
- 'version': '0.1',
+ 'version': '0.2',
'depends': ['base_vat','account_chart','base_iban'],
'author': 'OpenERP Italian Community',
'description': """
diff --git a/addons/l10n_it/data/account.tax.code.template.csv b/addons/l10n_it/data/account.tax.code.template.csv
index d6d6667f43b..e5435945556 100644
--- a/addons/l10n_it/data/account.tax.code.template.csv
+++ b/addons/l10n_it/data/account.tax.code.template.csv
@@ -1,28 +1,37 @@
code,id,name,parent_id:id
,vat_code_chart_root,Tassazione,
IVC,template_ivacode_pagata,IVA a credito,vat_code_chart_root
-IVC0,template_ivacode_pagata_0,Esente IVA (credito),template_ivacode_pagata
+IVCN,template_ivacode_pagata_ind,IVA a credito indetraibile,vat_code_chart_root
+IVC0,template_ivacode_pagata_0,Fuori Campo IVA (credito),template_ivacode_pagata
IVCI,template_impcode_pagata,IVA a credito (imponibile),vat_code_chart_root
-IVC0I,template_impcode_pagata_0,Esente IVA a credito (imponibile),template_impcode_pagata
+IVC0I,template_impcode_pagata_0,Fuori Campo IVA (credito) (imponibile),template_impcode_pagata
+IVCart15,template_ivacode_pagata_art15,Escluso Art.15 (credito),template_ivacode_pagata
+IVCart15I,template_impcode_pagata_art15,Escluso Art.15. (credito) (imponibile),template_impcode_pagata
IVC10,template_ivacode_pagata_10,IVA a credito 10%,template_ivacode_pagata
IVC10I,template_impcode_pagata_10,IVA a credito 10% (imponibile),template_impcode_pagata
-IVC10ind,template_ivacode_pagata_10ind,IVA a credito 10% indetraibile,template_ivacode_pagata
+IVC10ind,template_ivacode_pagata_10ind,IVA a credito 10% indetraibile,template_ivacode_pagata_ind
IVC10Iind,template_impcode_pagata_10ind,IVA a credito 10% indetraibile (imponibile),template_impcode_pagata
-IVC20ind,template_ivacode_pagata_20ind,IVA a credito 20% indetraibile,template_ivacode_pagata
+IVC20ind,template_ivacode_pagata_20ind,IVA a credito 20% indetraibile,template_ivacode_pagata_ind
IVC20Iind,template_impcode_pagata_20ind,IVA a credito 20% indetraibile (imponibile),template_impcode_pagata
-IVC4ind,template_ivacode_pagata_4ind,IVA a credito 4% indetraibile,template_ivacode_pagata
+IVC4ind,template_ivacode_pagata_4ind,IVA a credito 4% indetraibile,template_ivacode_pagata_ind
IVC4Iind,template_impcode_pagata_4ind,IVA a credito 4% indetraibile (imponibile),template_impcode_pagata
IVC20det10,template_ivacode_pagata_20det10,IVA a credito 20% detraibile 10%,template_ivacode_pagata
+IVC20Ndet10,template_ivacode_pagata_20det10ind,IVA a credito 20% detraibile 10% (indetraibile),template_ivacode_pagata_ind
IVC20Idet10,template_impcode_pagata_20det10,IVA a credito 20% detraibile 10% (imponibile),template_impcode_pagata
IVC20det15,template_ivacode_pagata_20det15,IVA a credito 20% detraibile 15%,template_ivacode_pagata
+IVC20Ndet15,template_ivacode_pagata_20det15ind,IVA a credito 20% detraibile 15% (indetraibile),template_ivacode_pagata_ind
IVC20Idet15,template_impcode_pagata_20det15,IVA a credito 20% detraibile 15% (imponibile),template_impcode_pagata
IVC20det40,template_ivacode_pagata_20det40,IVA a credito 20% detraibile 40%,template_ivacode_pagata
+IVC20Ndet40,template_ivacode_pagata_20det40ind,IVA a credito 20% detraibile 40% (indetraibile),template_ivacode_pagata_ind
IVC20Idet40,template_impcode_pagata_20det40,IVA a credito 20% detraibile 40% (imponibile),template_impcode_pagata
IVC20det50,template_ivacode_pagata_20det50,IVA a credito 20% detraibile 50%,template_ivacode_pagata
+IVC20Ndet50,template_ivacode_pagata_20det50ind,IVA a credito 20% detraibile 50% (indetraibile),template_ivacode_pagata_ind
IVC20Idet50,template_impcode_pagata_20det50,IVA a credito 20% detraibile 50% (imponibile),template_impcode_pagata
IVC10det50,template_ivacode_pagata_10det50,IVA a credito 10% detraibile 50%,template_ivacode_pagata
+IVC10Ndet50,template_ivacode_pagata_10det50ind,IVA a credito 10% detraibile 50% (indetraibile),template_ivacode_pagata_ind
IVC10Idet50,template_impcode_pagata_10det50,IVA a credito 10% detraibile 50% (imponibile),template_impcode_pagata
IVC4det50,template_ivacode_pagata_4det50,IVA a credito 4% detraibile 50%,template_ivacode_pagata
+IVC4Ndet50,template_ivacode_pagata_4det50ind,IVA a credito 4% detraibile 50% (indetraibile),template_ivacode_pagata_ind
IVC4Idet50,template_impcode_pagata_4det50,IVA a credito 4% detraibile 50% (imponibile),template_impcode_pagata
IVC20,template_ivacode_pagata_20,IVA a credito 20%,template_ivacode_pagata
IVC20I,template_impcode_pagata_20,IVA a credito 20% (imponibile),template_impcode_pagata
@@ -35,9 +44,11 @@ IVC12I,template_impcode_pagata_12,IVA a credito 12% (imponibile),template_impco
IVC2,template_ivacode_pagata_2,IVA a credito 2%,template_ivacode_pagata
IVC2I,template_impcode_pagata_2,IVA a credito 2% (imponibile),template_impcode_pagata
IVD,template_ivacode_riscossa,IVA a debito,vat_code_chart_root
-IVD0,template_ivacode_riscossa_0,Esente IVA (debito),template_ivacode_riscossa
+IVD0,template_ivacode_riscossa_0,Fuori Campo IVA (debito),template_ivacode_riscossa
IVDI,template_impcode_riscossa,IVA a debito (imponibile),vat_code_chart_root
-IVD0I,template_impcode_riscossa_0,Esente IVA a debito (imponibile),template_impcode_riscossa
+IVD0I,template_impcode_riscossa_0,Fuori Campo IVA (debito) (imponibile),template_impcode_riscossa
+IVDart15,template_ivacode_riscossa_art15,Escluso Art.15 (debito),template_ivacode_riscossa
+IVDart15I,template_impcode_riscossa_art15,Escluso Art.15 (debito) (imponibile),template_impcode_riscossa
IVD10,template_ivacode_riscossa_10,IVA a debito 10%,template_ivacode_riscossa
IVD10I,template_impcode_riscossa_10,IVA a debito 10% (imponibile),template_impcode_riscossa
IVD20,template_ivacode_riscossa_20,IVA a debito 20%,template_ivacode_riscossa
@@ -50,13 +61,17 @@ IVD12,template_ivacode_riscossa_12,IVA a debito 12%,template_ivacode_riscossa
IVD12I,template_impcode_riscossa_12,IVA a debito 12% (imponibile),template_impcode_riscossa
IVD2,template_ivacode_riscossa_2,IVA a debito 2%,template_ivacode_riscossa
IVD2I,template_impcode_riscossa_2,IVA a debito 2% (imponibile),template_impcode_riscossa
-IVC21ind,template_ivacode_pagata_21ind,IVA a credito 21% indetraibile,template_ivacode_pagata
+IVC21ind,template_ivacode_pagata_21ind,IVA a credito 21% indetraibile,template_ivacode_pagata_ind
IVC21Iind,template_impcode_pagata_21ind,IVA a credito 21% indetraibile (imponibile),template_impcode_pagata
IVC21det10,template_ivacode_pagata_21det10,IVA a credito 21% detraibile 10%,template_ivacode_pagata
+IVC21Ndet10,template_ivacode_pagata_21det10ind,IVA a credito 21% detraibile 10% (indetraibile),template_ivacode_pagata_ind
IVC21Idet10,template_impcode_pagata_21det10,IVA a credito 21% detraibile 10% (imponibile),template_impcode_pagata
IVC21det15,template_ivacode_pagata_21det15,IVA a credito 21% detraibile 15%,template_ivacode_pagata
+IVC21Ndet15,template_ivacode_pagata_21det15ind,IVA a credito 21% detraibile 15% (indetraibile),template_ivacode_pagata_ind
IVC21Idet15,template_impcode_pagata_21det15,IVA a credito 21% detraibile 15% (imponibile),template_impcode_pagata
IVC21det40,template_ivacode_pagata_21det40,IVA a credito 21% detraibile 40%,template_ivacode_pagata
+IVC21Ndet40,template_ivacode_pagata_21det40ind,IVA a credito 21% detraibile 40% (indetraibile),template_ivacode_pagata_ind
IVC21Idet40,template_impcode_pagata_21det40,IVA a credito 21% detraibile 40% (imponibile),template_impcode_pagata
IVC21det50,template_ivacode_pagata_21det50,IVA a credito 21% detraibile 50%,template_ivacode_pagata
+IVC21Ndet50,template_ivacode_pagata_21det50ind,IVA a credito 21% detraibile 50% (indetraibile),template_ivacode_pagata_ind
IVC21Idet50,template_impcode_pagata_21det50,IVA a credito 21% detraibile 50% (imponibile),template_impcode_pagata
diff --git a/addons/l10n_it/data/account.tax.template.csv b/addons/l10n_it/data/account.tax.template.csv
index e003afd1a23..5654b32e5e9 100644
--- a/addons/l10n_it/data/account.tax.template.csv
+++ b/addons/l10n_it/data/account.tax.template.csv
@@ -1,71 +1,66 @@
id,description,chart_template_id:id,name,sequence,amount,parent_id:id,child_depend,type,account_collected_id:id,account_paid_id:id,type_tax_use,base_code_id:id,tax_code_id:id,ref_base_code_id:id,ref_tax_code_id:id,ref_base_sign,ref_tax_sign,price_include,base_sign,tax_sign
-21a,21a,l10n_it_chart_template_generic,Iva al 21% (debito),,0.21,,False,percent,2601,2601,sale,template_impcode_riscossa_21,template_ivacode_riscossa_21,template_impcode_riscossa_21,template_ivacode_riscossa_21,-1,-1,False,,
-21b,21b,l10n_it_chart_template_generic,Iva al 21% (credito),,0.21,,False,percent,1601,1601,purchase,template_impcode_pagata_21,template_ivacode_pagata_21,template_impcode_pagata_21,template_ivacode_pagata_21,,,False,-1,-1
-20a,20a,l10n_it_chart_template_generic,Iva al 20% (debito),,0.2,,False,percent,2601,2601,sale,template_impcode_riscossa_20,template_ivacode_riscossa_20,template_impcode_riscossa_20,template_ivacode_riscossa_20,-1,-1,False,,
-20b,20b,l10n_it_chart_template_generic,Iva al 20% (credito),,0.2,,False,percent,1601,1601,purchase,template_impcode_pagata_20,template_ivacode_pagata_20,template_impcode_pagata_20,template_ivacode_pagata_20,,,False,-1,-1
-10a,10a,l10n_it_chart_template_generic,Iva al 10% (debito),,0.1,,False,percent,2601,2601,sale,template_impcode_riscossa_10,template_ivacode_riscossa_10,template_impcode_riscossa_10,template_ivacode_riscossa_10,-1,-1,False,,
-10b,10b,l10n_it_chart_template_generic,Iva al 10% (credito),,0.1,,False,percent,1601,1601,purchase,template_impcode_pagata_10,template_ivacode_pagata_10,template_impcode_pagata_10,template_ivacode_pagata_10,,,False,-1,-1
-10AO,10AO,l10n_it_chart_template_generic,Iva al 10% indetraibile,,0.1,,True,percent,,,purchase,template_impcode_pagata_10ind,,template_impcode_pagata_10ind,,,,False,-1,-1
-10AOa,10AOa,l10n_it_chart_template_generic,Iva al 10% indetraibile (D),2,0,10AO,False,balance,1601,1601,purchase,,template_ivacode_pagata_10ind,,template_ivacode_pagata_10ind,,,False,,
-10AOb,10AOb,l10n_it_chart_template_generic,Iva al 10% indetraibile (I),1,1,10AO,False,percent,,,purchase,,,,,,,False,,
-12a,12a,l10n_it_chart_template_generic,Iva 12% (debito),,0.12,,False,percent,2601,2601,sale,template_impcode_riscossa_12,template_ivacode_riscossa_12,template_impcode_riscossa_12,template_ivacode_riscossa_12,-1,-1,False,,
-12b,12b,l10n_it_chart_template_generic,Iva 12% (credito),,0.12,,False,percent,1601,1601,purchase,template_impcode_pagata_12,template_ivacode_pagata_12,template_impcode_pagata_12,template_ivacode_pagata_12,,,False,-1,-1
-2010,2010,l10n_it_chart_template_generic,Iva al 20% detraibile 10%,,0.2,,True,percent,,,purchase,template_impcode_pagata_20det10,,template_impcode_pagata_20det10,,,,False,-1,-1
-2010a,2010a,l10n_it_chart_template_generic,Iva al 20% detraibile 10% (D),2,0,2010,False,balance,1601,1601,purchase,,template_ivacode_pagata_20det10,,template_ivacode_pagata_20det10,,,False,,
-2010b,2010b,l10n_it_chart_template_generic,Iva al 20% detraibile 10% (I),1,0.9,2010,False,percent,,,purchase,,,,,,,False,,
-2015,2015,l10n_it_chart_template_generic,Iva al 20% detraibile 15%,,0.2,,True,percent,,,purchase,template_impcode_pagata_20det15,,template_impcode_pagata_20det15,,,,False,-1,-1
-2015a,2015a,l10n_it_chart_template_generic,Iva al 20% detraibile 15% (D),2,0,2015,False,balance,1601,1601,purchase,,template_ivacode_pagata_20det15,,template_ivacode_pagata_20det15,,,False,,
-2015b,2015b,l10n_it_chart_template_generic,Iva al 20% detraibile 15% (I),1,0.85,2015,False,percent,,,purchase,,,,,,,False,,
-2040,2040,l10n_it_chart_template_generic,Iva al 20% detraibile 40%,,0.2,,True,percent,,,purchase,template_impcode_pagata_20det40,,template_impcode_pagata_20det40,,,,False,-1,-1
-2040a,2040a,l10n_it_chart_template_generic,Iva al 20% detraibile 40% (D),2,0,2040,False,balance,1601,1601,purchase,,template_ivacode_pagata_20det40,,template_ivacode_pagata_20det40,,,False,,
-2040b,2040b,l10n_it_chart_template_generic,Iva al 20% detraibile 40% (I),1,0.6,2040,False,percent,,,purchase,,,,,,,False,,
-20AO,20AO,l10n_it_chart_template_generic,Iva al 20% indetraibile,,0.2,,True,percent,,,purchase,template_impcode_pagata_20ind,,template_impcode_pagata_20ind,,,,False,-1,-1
-20AOa,20AOa,l10n_it_chart_template_generic,Iva al 20% indetraibile (D),2,0,20AO,False,balance,1601,1601,purchase,,template_ivacode_pagata_20ind,,template_ivacode_pagata_20ind,,,False,,
-20AOb,20AOb,l10n_it_chart_template_generic,Iva al 20% indetraibile (I),1,1,20AO,False,percent,,,purchase,,,,,,,False,,
-20I5,20I5,l10n_it_chart_template_generic,IVA al 20% detraibile al 50%,,0.2,,True,percent,,,purchase,template_impcode_pagata_20det50,,template_impcode_pagata_20det50,,,,False,-1,-1
-20I5b,20I5b,l10n_it_chart_template_generic,IVA al 20% detraibile al 50% (I),1,0.5,20I5,False,percent,,,purchase,,,,,,,False,,
-20I5a,20I5a,l10n_it_chart_template_generic,IVA al 20% detraibile al 50% (D),2,0,20I5,False,balance,1601,1601,purchase,,template_ivacode_pagata_20det50,,template_ivacode_pagata_20det50,,,False,,
-22a,22a,l10n_it_chart_template_generic,Iva 2% (debito),,0.02,,False,percent,2601,2601,sale,template_impcode_riscossa_2,template_ivacode_riscossa_2,template_impcode_riscossa_2,template_ivacode_riscossa_2,-1,-1,False,,
-22b,22b,l10n_it_chart_template_generic,Iva 2% (credito),,0.02,,False,percent,1601,1601,purchase,template_impcode_pagata_2,template_ivacode_pagata_2,template_impcode_pagata_2,template_ivacode_pagata_2,,,False,-1,-1
-4a,4a,l10n_it_chart_template_generic,Iva 4% (debito),,0.04,,False,percent,2601,2601,sale,template_impcode_riscossa_4,template_ivacode_riscossa_4,template_impcode_riscossa_4,template_ivacode_riscossa_4,-1,-1,False,,
-4b,4b,l10n_it_chart_template_generic,Iva 4% (credito),,0.04,,False,percent,1601,1601,purchase,template_impcode_pagata_4,template_ivacode_pagata_4,template_impcode_pagata_4,template_ivacode_pagata_4,,,False,-1,-1
-4AO,4AO,l10n_it_chart_template_generic,Iva al 4% indetraibile,,0.04,,True,percent,,,purchase,template_impcode_pagata_4ind,,template_impcode_pagata_4ind,,,,False,-1,-1
-4AOa,4AOa,l10n_it_chart_template_generic,Iva al 4% indetraibile (D),2,0,4AO,False,balance,1601,1601,purchase,,template_ivacode_pagata_4ind,,template_ivacode_pagata_4ind,,,False,,
-4AOb,4AOb,l10n_it_chart_template_generic,Iva al 4% indetraibile (I),1,1,4AO,False,percent,,,purchase,,,,,,,False,,
-10I5,10I5,l10n_it_chart_template_generic,IVA al 10% detraibile al 50%,,0.1,,True,percent,,,purchase,template_impcode_pagata_10det50,,template_impcode_pagata_10det50,,,,False,-1,-1
-10I5a,10I5a,l10n_it_chart_template_generic,IVA al 10% detraibile al 50% (D),2,0,10I5,False,balance,1601,1601,purchase,,template_ivacode_pagata_10det50,,template_ivacode_pagata_10det50,,,False,,
-10I5b,10I5b,l10n_it_chart_template_generic,IVA al 10% detraibile al 50% (I),1,0.5,10I5,False,percent,,,purchase,,,,,,,False,,
-4I5,4I5,l10n_it_chart_template_generic,IVA al 4% detraibile al 50%,,0.04,,True,percent,,,purchase,template_impcode_pagata_4det50,,template_impcode_pagata_4det50,,,,False,-1,-1
-4I5a,4I5a,l10n_it_chart_template_generic,IVA al 4% detraibile al 50% (D),2,0,4I5,False,balance,1601,1601,purchase,,template_ivacode_pagata_4det50,,template_ivacode_pagata_4det50,,,False,,
-4I5b,4I5b,l10n_it_chart_template_generic,IVA al 4% detraibile al 50% (I),1,0.5,4I5,False,percent,,,purchase,,,,,,,False,,
-00a,00a,l10n_it_chart_template_generic,Esente IVA (debito),,0,,False,percent,2601,2601,sale,template_impcode_riscossa_0,template_ivacode_riscossa_0,template_impcode_riscossa_0,template_ivacode_riscossa_0,-1,-1,False,,
-00b,00b,l10n_it_chart_template_generic,Esente IVA (credito),,0,,False,percent,1601,1601,purchase,template_impcode_pagata_0,template_ivacode_pagata_0,template_impcode_pagata_0,template_ivacode_pagata_0,,,False,-1,-1
-21a INC,21a INC,l10n_it_chart_template_generic,Iva al 21% (debito) INC,,0.21,,False,percent,l10n_it.2601,l10n_it.2601,sale,l10n_it.template_impcode_riscossa_21,l10n_it.template_ivacode_riscossa_21,l10n_it.template_impcode_riscossa_21,l10n_it.template_ivacode_riscossa_21,-1,-1,True,,
-21b INC,21b INC,l10n_it_chart_template_generic,Iva al 21% (credito) INC,,0.21,,False,percent,1601,1601,purchase,template_impcode_pagata_21,template_ivacode_pagata_21,template_impcode_pagata_21,template_ivacode_pagata_21,,,True,-1,-1
-20a INC,20a INC,l10n_it_chart_template_generic,Iva al 20% (debito) INC,,0.2,,False,percent,l10n_it.2601,l10n_it.2601,sale,l10n_it.template_impcode_riscossa_20,l10n_it.template_ivacode_riscossa_20,l10n_it.template_impcode_riscossa_20,l10n_it.template_ivacode_riscossa_20,-1,-1,True,,
-20b INC,20b INC,l10n_it_chart_template_generic,Iva al 20% (credito) INC,,0.2,,False,percent,1601,1601,purchase,template_impcode_pagata_20,template_ivacode_pagata_20,template_impcode_pagata_20,template_ivacode_pagata_20,,,True,-1,-1
-10a INC,10a INC,l10n_it_chart_template_generic,Iva al 10% (debito) INC,,0.1,,False,percent,l10n_it.2601,l10n_it.2601,sale,l10n_it.template_impcode_riscossa_10,l10n_it.template_ivacode_riscossa_10,l10n_it.template_impcode_riscossa_10,l10n_it.template_ivacode_riscossa_10,-1,-1,True,,
-10b INC,10b INC,l10n_it_chart_template_generic,Iva al 10% (credito) INC,,0.1,,False,percent,1601,1601,purchase,template_impcode_pagata_10,template_ivacode_pagata_10,template_impcode_pagata_10,template_ivacode_pagata_10,,,True,-1,-1
-12a INC,12a INC,l10n_it_chart_template_generic,Iva 12% (debito) INC,,0.12,,False,percent,l10n_it.2601,l10n_it.2601,sale,l10n_it.template_impcode_riscossa_12,l10n_it.template_ivacode_riscossa_12,l10n_it.template_impcode_riscossa_12,l10n_it.template_ivacode_riscossa_12,-1,-1,True,,
-12b INC,12b INC,l10n_it_chart_template_generic,Iva 12% (credito) INC,,0.12,,False,percent,1601,1601,purchase,template_impcode_pagata_12,template_ivacode_pagata_12,template_impcode_pagata_12,template_ivacode_pagata_12,,,True,-1,-1
-22a INC,22a INC,l10n_it_chart_template_generic,Iva 2% (debito) INC,,0.02,,False,percent,l10n_it.2601,l10n_it.2601,sale,l10n_it.template_impcode_riscossa_2,l10n_it.template_ivacode_riscossa_2,l10n_it.template_impcode_riscossa_2,l10n_it.template_ivacode_riscossa_2,-1,-1,True,,
-22b INC,22b INC,l10n_it_chart_template_generic,Iva 2% (credito) INC,,0.02,,False,percent,1601,1601,purchase,template_impcode_pagata_2,template_ivacode_pagata_2,template_impcode_pagata_2,template_ivacode_pagata_2,,,True,-1,-1
-4a INC,4a INC,l10n_it_chart_template_generic,Iva 4% (debito) INC,,0.04,,False,percent,l10n_it.2601,l10n_it.2601,sale,l10n_it.template_impcode_riscossa_4,l10n_it.template_ivacode_riscossa_4,l10n_it.template_impcode_riscossa_4,l10n_it.template_ivacode_riscossa_4,-1,-1,True,,
-4b INC,4b INC,l10n_it_chart_template_generic,Iva 4% (credito) INC,,0.04,,False,percent,1601,1601,purchase,template_impcode_pagata_4,template_ivacode_pagata_4,template_impcode_pagata_4,template_ivacode_pagata_4,,,True,-1,-1
-00a INC,00a INC,l10n_it_chart_template_generic,Esente IVA (debito) INC,,0,,False,percent,l10n_it.2601,l10n_it.2601,sale,l10n_it.template_impcode_riscossa_0,l10n_it.template_ivacode_riscossa_0,l10n_it.template_impcode_riscossa_0,l10n_it.template_ivacode_riscossa_0,-1,-1,True,,
-2110,2110,l10n_it_chart_template_generic,Iva al 21% detraibile 10%,,0.21,,True,percent,,,purchase,template_impcode_pagata_21det10,,template_impcode_pagata_21det10,,,,False,-1,-1
-2110a,2110a,l10n_it_chart_template_generic,Iva al 21% detraibile 10% (D),2,0,2110,False,balance,1601,1601,purchase,,template_ivacode_pagata_21det10,,template_ivacode_pagata_21det10,,,False,,
-2110b,2110b,l10n_it_chart_template_generic,Iva al 21% detraibile 10% (I),1,0.9,2110,False,percent,,,purchase,,,,,,,False,,
-2115,2115,l10n_it_chart_template_generic,Iva al 21% detraibile 15%,,0.21,,True,percent,,,purchase,template_impcode_pagata_21det15,,template_impcode_pagata_21det15,,,,False,-1,-1
-2115a,2115a,l10n_it_chart_template_generic,Iva al 21% detraibile 15% (D),2,0,2115,False,balance,1601,1601,purchase,,template_ivacode_pagata_21det15,,template_ivacode_pagata_21det15,,,False,,
-2115b,2115b,l10n_it_chart_template_generic,Iva al 21% detraibile 15% (I),1,0.85,2115,False,percent,,,purchase,,,,,,,False,,
-2140,2140,l10n_it_chart_template_generic,Iva al 21% detraibile 40%,,0.21,,True,percent,,,purchase,template_impcode_pagata_21det40,,template_impcode_pagata_21det40,,,,False,-1,-1
-2140a,2140a,l10n_it_chart_template_generic,Iva al 21% detraibile 40% (D),2,0,2140,False,balance,1601,1601,purchase,,template_ivacode_pagata_21det40,,template_ivacode_pagata_21det40,,,False,,
-2140b,2140b,l10n_it_chart_template_generic,Iva al 21% detraibile 40% (I),1,0.6,2140,False,percent,,,purchase,,,,,,,False,,
-21AO,21AO,l10n_it_chart_template_generic,Iva al 21% indetraibile,,0.21,,True,percent,,,purchase,template_impcode_pagata_21ind,,template_impcode_pagata_21ind,,,,False,-1,-1
-21AOa,21AOa,l10n_it_chart_template_generic,Iva al 21% indetraibile (D),2,0,21AO,False,balance,1601,1601,purchase,,template_ivacode_pagata_21ind,,template_ivacode_pagata_21ind,,,False,,
-21AOb,21AOb,l10n_it_chart_template_generic,Iva al 21% indetraibile (I),1,1,21AO,False,percent,,,purchase,,,,,,,False,,
-21I5,21I5,l10n_it_chart_template_generic,IVA al 21% detraibile al 50%,,0.21,,True,percent,,,purchase,template_impcode_pagata_21det50,,template_impcode_pagata_21det50,,,,False,-1,-1
-21I5b,21I5b,l10n_it_chart_template_generic,IVA al 21% detraibile al 50% (I),1,0.5,21I5,False,percent,,,purchase,,,,,,,False,,
-21I5a,21I5a,l10n_it_chart_template_generic,IVA al 21% detraibile al 50% (D),2,0,21I5,False,balance,1601,1601,purchase,,template_ivacode_pagata_21det50,,template_ivacode_pagata_21det50,,,False,,
-
+21v,21v,l10n_it_chart_template_generic,Iva al 21% (debito),1,0.21,,False,percent,2601,2601,sale,template_impcode_riscossa_21,template_ivacode_riscossa_21,template_impcode_riscossa_21,template_ivacode_riscossa_21,-1,-1,False,1,1
+21a,21a,l10n_it_chart_template_generic,Iva al 21% (credito),2,0.21,,False,percent,1601,1601,purchase,template_impcode_pagata_21,template_ivacode_pagata_21,template_impcode_pagata_21,template_ivacode_pagata_21,1,1,False,-1,-1
+20v,20v,l10n_it_chart_template_generic,Iva al 20% (debito),3,0.2,,False,percent,2601,2601,sale,template_impcode_riscossa_20,template_ivacode_riscossa_20,template_impcode_riscossa_20,template_ivacode_riscossa_20,-1,-1,False,1,1
+20a,20a,l10n_it_chart_template_generic,Iva al 20% (credito),4,0.2,,False,percent,1601,1601,purchase,template_impcode_pagata_20,template_ivacode_pagata_20,template_impcode_pagata_20,template_ivacode_pagata_20,1,1,False,-1,-1
+10v,10v,l10n_it_chart_template_generic,Iva al 10% (debito),5,0.1,,False,percent,2601,2601,sale,template_impcode_riscossa_10,template_ivacode_riscossa_10,template_impcode_riscossa_10,template_ivacode_riscossa_10,-1,-1,False,1,1
+10a,10a,l10n_it_chart_template_generic,Iva al 10% (credito),6,0.1,,False,percent,1601,1601,purchase,template_impcode_pagata_10,template_ivacode_pagata_10,template_impcode_pagata_10,template_ivacode_pagata_10,1,1,False,-1,-1
+10AO,10AO,l10n_it_chart_template_generic,Iva al 10% indetraibile,7,0.1,,True,percent,,,purchase,template_impcode_pagata_10ind,,template_impcode_pagata_10ind,,1,1,False,-1,-1
+10AOb,10AOb,l10n_it_chart_template_generic,Iva al 10% indetraibile (D),200,0,10AO,False,balance,1601,1601,purchase,,template_ivacode_pagata_10,,template_ivacode_pagata_10,1,1,False,-1,-1
+10AOa,10AOa,l10n_it_chart_template_generic,Iva al 10% indetraibile (I),100,1,10AO,False,percent,,,purchase,,template_ivacode_pagata_10ind,,template_ivacode_pagata_10ind,1,1,False,-1,-1
+12v,12v,l10n_it_chart_template_generic,Iva 12% (debito),8,0.12,,False,percent,2601,2601,sale,template_impcode_riscossa_12,template_ivacode_riscossa_12,template_impcode_riscossa_12,template_ivacode_riscossa_12,-1,-1,False,1,1
+12a,12a,l10n_it_chart_template_generic,Iva 12% (credito),9,0.12,,False,percent,1601,1601,purchase,template_impcode_pagata_12,template_ivacode_pagata_12,template_impcode_pagata_12,template_ivacode_pagata_12,1,1,False,-1,-1
+2010,2010,l10n_it_chart_template_generic,Iva al 20% detraibile 10%,10,0.2,,True,percent,,,purchase,template_impcode_pagata_20det10,,template_impcode_pagata_20det10,,1,1,False,-1,-1
+2010b,2010b,l10n_it_chart_template_generic,Iva al 20% detraibile 10% (D),200,0,2010,False,balance,1601,1601,purchase,,template_ivacode_pagata_20det10,,template_ivacode_pagata_20det10,1,1,False,-1,-1
+2010a,2010a,l10n_it_chart_template_generic,Iva al 20% detraibile 10% (I),100,0.9,2010,False,percent,,,purchase,,template_ivacode_pagata_20det10ind,,template_ivacode_pagata_20det10ind,1,1,False,-1,-1
+2015,2015,l10n_it_chart_template_generic,Iva al 20% detraibile 15%,11,0.2,,True,percent,,,purchase,template_impcode_pagata_20det15,,template_impcode_pagata_20det15,,1,1,False,-1,-1
+2015b,2015b,l10n_it_chart_template_generic,Iva al 20% detraibile 15% (D),200,0,2015,False,balance,1601,1601,purchase,,template_ivacode_pagata_20det15,,template_ivacode_pagata_20det15,1,1,False,-1,-1
+2015a,2015a,l10n_it_chart_template_generic,Iva al 20% detraibile 15% (I),100,0.85,2015,False,percent,,,purchase,,template_ivacode_pagata_20det15ind,,template_ivacode_pagata_20det15ind,1,1,False,-1,-1
+2040,2040,l10n_it_chart_template_generic,Iva al 20% detraibile 40%,12,0.2,,True,percent,,,purchase,template_impcode_pagata_20det40,,template_impcode_pagata_20det40,,1,1,False,-1,-1
+2040b,2040b,l10n_it_chart_template_generic,Iva al 20% detraibile 40% (D),200,0,2040,False,balance,1601,1601,purchase,,template_ivacode_pagata_20det40,,template_ivacode_pagata_20det40,1,1,False,-1,-1
+2040a,2040a,l10n_it_chart_template_generic,Iva al 20% detraibile 40% (I),100,0.6,2040,False,percent,,,purchase,,template_ivacode_pagata_20det40ind,,template_ivacode_pagata_20det40ind,1,1,False,-1,-1
+20AO,20AO,l10n_it_chart_template_generic,Iva al 20% indetraibile,13,0.2,,True,percent,,,purchase,template_impcode_pagata_20ind,,template_impcode_pagata_20ind,,1,1,False,-1,-1
+20AOb,20AOb,l10n_it_chart_template_generic,Iva al 20% indetraibile (D),200,0,20AO,False,balance,1601,1601,purchase,,template_ivacode_pagata_20ind,,template_ivacode_pagata_20ind,1,1,False,-1,-1
+20AOa,20AOa,l10n_it_chart_template_generic,Iva al 20% indetraibile (I),100,1,20AO,False,percent,,,purchase,,template_ivacode_pagata_20ind,,template_ivacode_pagata_20ind,1,1,False,-1,-1
+20I5,20I5,l10n_it_chart_template_generic,IVA al 20% detraibile al 50%,14,0.2,,True,percent,,,purchase,template_impcode_pagata_20det50,,template_impcode_pagata_20det50,,1,1,False,-1,-1
+20I5b,20I5b,l10n_it_chart_template_generic,IVA al 20% detraibile al 50% (D),200,0,20I5,False,balance,1601,1601,purchase,,template_ivacode_pagata_20det50,,template_ivacode_pagata_20det50,1,1,False,-1,-1
+20I5a,20I5a,l10n_it_chart_template_generic,IVA al 20% detraibile al 50% (I),100,0.5,20I5,False,percent,,,purchase,,template_ivacode_pagata_20det50ind,,template_ivacode_pagata_20det50ind,1,1,False,-1,-1
+22v,22v,l10n_it_chart_template_generic,Iva 2% (debito),15,0.02,,False,percent,2601,2601,sale,template_impcode_riscossa_2,template_ivacode_riscossa_2,template_impcode_riscossa_2,template_ivacode_riscossa_2,-1,-1,False,1,1
+22a,22a,l10n_it_chart_template_generic,Iva 2% (credito),16,0.02,,False,percent,1601,1601,purchase,template_impcode_pagata_2,template_ivacode_pagata_2,template_impcode_pagata_2,template_ivacode_pagata_2,1,1,False,-1,-1
+4v,4v,l10n_it_chart_template_generic,Iva 4% (debito),17,0.04,,False,percent,2601,2601,sale,template_impcode_riscossa_4,template_ivacode_riscossa_4,template_impcode_riscossa_4,template_ivacode_riscossa_4,-1,-1,False,1,1
+4a,4a,l10n_it_chart_template_generic,Iva 4% (credito),18,0.04,,False,percent,1601,1601,purchase,template_impcode_pagata_4,template_ivacode_pagata_4,template_impcode_pagata_4,template_ivacode_pagata_4,1,1,False,-1,-1
+4AO,4AO,l10n_it_chart_template_generic,Iva al 4% indetraibile,19,0.04,,True,percent,,,purchase,template_impcode_pagata_4ind,,template_impcode_pagata_4ind,,1,1,False,-1,-1
+4AOb,4AOb,l10n_it_chart_template_generic,Iva al 4% indetraibile (D),200,0,4AO,False,balance,1601,1601,purchase,,template_ivacode_pagata_4ind,,template_ivacode_pagata_4ind,1,1,False,-1,-1
+4AOa,4AOa,l10n_it_chart_template_generic,Iva al 4% indetraibile (I),100,1,4AO,False,percent,,,purchase,,template_ivacode_pagata_4ind,,template_ivacode_pagata_4ind,1,1,False,-1,-1
+10I5,10I5,l10n_it_chart_template_generic,IVA al 10% detraibile al 50%,20,0.1,,True,percent,,,purchase,template_impcode_pagata_10det50,,template_impcode_pagata_10det50,,1,1,False,-1,-1
+10I5b,10I5b,l10n_it_chart_template_generic,IVA al 10% detraibile al 50% (D),200,0,10I5,False,balance,1601,1601,purchase,,template_ivacode_pagata_10det50,,template_ivacode_pagata_10det50,1,1,False,-1,-1
+10I5a,10I5a,l10n_it_chart_template_generic,IVA al 10% detraibile al 50% (I),100,0.5,10I5,False,percent,,,purchase,,template_ivacode_pagata_10det50ind,,template_ivacode_pagata_10det50ind,1,1,False,-1,-1
+4I5,4I5,l10n_it_chart_template_generic,IVA al 4% detraibile al 50%,21,0.04,,True,percent,,,purchase,template_impcode_pagata_4det50,,template_impcode_pagata_4det50,,1,1,False,-1,-1
+4I5b,4I5b,l10n_it_chart_template_generic,IVA al 4% detraibile al 50% (D),200,0,4I5,False,balance,1601,1601,purchase,,template_ivacode_pagata_4det50,,template_ivacode_pagata_4det50,1,1,False,-1,-1
+4I5a,4I5a,l10n_it_chart_template_generic,IVA al 4% detraibile al 50% (I),100,0.5,4I5,False,percent,,,purchase,,template_ivacode_pagata_4det50ind,,template_ivacode_pagata_4det50ind,1,1,False,-1,-1
+00v,00v,l10n_it_chart_template_generic,Fuori Campo IVA (debito),22,0,,False,percent,2601,2601,sale,template_impcode_riscossa_0,template_ivacode_riscossa_0,template_impcode_riscossa_0,template_ivacode_riscossa_0,-1,-1,False,1,1
+00a,00a,l10n_it_chart_template_generic,Fuori Campo IVA (credito),23,0,,False,percent,1601,1601,purchase,template_impcode_pagata_0,template_ivacode_pagata_0,template_impcode_pagata_0,template_ivacode_pagata_0,1,1,False,-1,-1
+00art15v,00art15v,l10n_it_chart_template_generic,Imponibile Escluso Art.15 (debito),22,0,,False,percent,2601,2601,sale,template_impcode_riscossa_art15,template_ivacode_riscossa_art15,template_impcode_riscossa_art15,template_ivacode_riscossa_art15,-1,-1,False,1,1
+00art15a,00art15a,l10n_it_chart_template_generic,Imponibile Escluso Art.15 (credito),23,0,,False,percent,1601,1601,purchase,template_impcode_pagata_art15,template_ivacode_pagata_art15,template_impcode_pagata_art15,template_ivacode_pagata_art15,1,1,False,-1,-1
+21v INC,21v INC,l10n_it_chart_template_generic,Iva al 21% (debito) INC,24,0.21,,False,percent,l10n_it.2601,l10n_it.2601,sale,l10n_it.template_impcode_riscossa_21,l10n_it.template_ivacode_riscossa_21,l10n_it.template_impcode_riscossa_21,l10n_it.template_ivacode_riscossa_21,-1,-1,True,1,1
+20v INC,20v INC,l10n_it_chart_template_generic,Iva al 20% (debito) INC,25,0.2,,False,percent,l10n_it.2601,l10n_it.2601,sale,l10n_it.template_impcode_riscossa_20,l10n_it.template_ivacode_riscossa_20,l10n_it.template_impcode_riscossa_20,l10n_it.template_ivacode_riscossa_20,-1,-1,True,1,1
+10v INC,10v INC,l10n_it_chart_template_generic,Iva al 10% (debito) INC,26,0.1,,False,percent,l10n_it.2601,l10n_it.2601,sale,l10n_it.template_impcode_riscossa_10,l10n_it.template_ivacode_riscossa_10,l10n_it.template_impcode_riscossa_10,l10n_it.template_ivacode_riscossa_10,-1,-1,True,1,1
+12v INC,12v INC,l10n_it_chart_template_generic,Iva 12% (debito) INC,27,0.12,,False,percent,l10n_it.2601,l10n_it.2601,sale,l10n_it.template_impcode_riscossa_12,l10n_it.template_ivacode_riscossa_12,l10n_it.template_impcode_riscossa_12,l10n_it.template_ivacode_riscossa_12,-1,-1,True,1,1
+22v INC,22v INC,l10n_it_chart_template_generic,Iva 2% (debito) INC,28,0.02,,False,percent,l10n_it.2601,l10n_it.2601,sale,l10n_it.template_impcode_riscossa_2,l10n_it.template_ivacode_riscossa_2,l10n_it.template_impcode_riscossa_2,l10n_it.template_ivacode_riscossa_2,-1,-1,True,1,1
+4v INC,4v INC,l10n_it_chart_template_generic,Iva 4% (debito) INC,29,0.04,,False,percent,l10n_it.2601,l10n_it.2601,sale,l10n_it.template_impcode_riscossa_4,l10n_it.template_ivacode_riscossa_4,l10n_it.template_impcode_riscossa_4,l10n_it.template_ivacode_riscossa_4,-1,-1,True,1,1
+00v INC,00v INC,l10n_it_chart_template_generic,Fuori Campo IVA (debito) INC,30,0,,False,percent,l10n_it.2601,l10n_it.2601,sale,l10n_it.template_impcode_riscossa_0,l10n_it.template_ivacode_riscossa_0,l10n_it.template_impcode_riscossa_0,l10n_it.template_ivacode_riscossa_0,-1,-1,True,1,1
+2110,2110,l10n_it_chart_template_generic,Iva al 21% detraibile 10%,31,0.21,,True,percent,,,purchase,template_impcode_pagata_21det10,,template_impcode_pagata_21det10,,1,1,False,-1,-1
+2110b,2110b,l10n_it_chart_template_generic,Iva al 21% detraibile 10% (D),200,0,2110,False,balance,1601,1601,purchase,,template_ivacode_pagata_21det10,,template_ivacode_pagata_21det10,1,1,False,-1,-1
+2110a,2110a,l10n_it_chart_template_generic,Iva al 21% detraibile 10% (I),100,0.9,2110,False,percent,,,purchase,,template_ivacode_pagata_21det10ind,,template_ivacode_pagata_21det10ind,1,1,False,-1,-1
+2115,2115,l10n_it_chart_template_generic,Iva al 21% detraibile 15%,32,0.21,,True,percent,,,purchase,template_impcode_pagata_21det15,,template_impcode_pagata_21det15,,1,1,False,-1,-1
+2115b,2115b,l10n_it_chart_template_generic,Iva al 21% detraibile 15% (D),200,0,2115,False,balance,1601,1601,purchase,,template_ivacode_pagata_21det15,,template_ivacode_pagata_21det15,1,1,False,-1,-1
+2115a,2115a,l10n_it_chart_template_generic,Iva al 21% detraibile 15% (I),100,0.85,2115,False,percent,,,purchase,,template_ivacode_pagata_21det15ind,,template_ivacode_pagata_21det15ind,1,1,False,-1,-1
+2140,2140,l10n_it_chart_template_generic,Iva al 21% detraibile 40%,33,0.21,,True,percent,,,purchase,template_impcode_pagata_21det40,,template_impcode_pagata_21det40,,1,1,False,-1,-1
+2140b,2140b,l10n_it_chart_template_generic,Iva al 21% detraibile 40% (D),200,0,2140,False,balance,1601,1601,purchase,,template_ivacode_pagata_21det40,,template_ivacode_pagata_21det40,1,1,False,-1,-1
+2140a,2140a,l10n_it_chart_template_generic,Iva al 21% detraibile 40% (I),100,0.6,2140,False,percent,,,purchase,,template_ivacode_pagata_21det40ind,,template_ivacode_pagata_21det40ind,1,1,False,-1,-1
+21AO,21AO,l10n_it_chart_template_generic,Iva al 21% indetraibile,34,0.21,,True,percent,,,purchase,template_impcode_pagata_21ind,,template_impcode_pagata_21ind,,1,1,False,-1,-1
+21AOb,21AOb,l10n_it_chart_template_generic,Iva al 21% indetraibile (D),200,0,21AO,False,balance,1601,1601,purchase,,template_ivacode_pagata_21ind,,template_ivacode_pagata_21ind,1,1,False,-1,-1
+21AOa,21AOa,l10n_it_chart_template_generic,Iva al 21% indetraibile (I),100,1,21AO,False,percent,,,purchase,,template_ivacode_pagata_21ind,,template_ivacode_pagata_21ind,1,1,False,-1,-1
+21I5,21I5,l10n_it_chart_template_generic,IVA al 21% detraibile al 50%,35,0.21,,True,percent,,,purchase,template_impcode_pagata_21det50,,template_impcode_pagata_21det50,,1,1,False,-1,-1
+21I5b,21I5b,l10n_it_chart_template_generic,IVA al 21% detraibile al 50% (D),200,0,21I5,False,balance,1601,1601,purchase,,template_ivacode_pagata_21det50,,template_ivacode_pagata_21det50,1,1,False,-1,-1
+21I5a,21I5a,l10n_it_chart_template_generic,IVA al 21% detraibile al 50% (I),100,0.5,21I5,False,percent,,,purchase,,template_ivacode_pagata_21det50ind,,template_ivacode_pagata_21det50ind,1,1,False,-1,-1
diff --git a/addons/l10n_lu/account_financial_report.xml b/addons/l10n_lu/account_financial_report.xml
index b39b0ceb15f..62a7a8c8d7e 100644
--- a/addons/l10n_lu/account_financial_report.xml
+++ b/addons/l10n_lu/account_financial_report.xml
@@ -84,7 +84,7 @@
- 2. Concessions, brevets, licences, marques, ainsi que droits et valeurs similaires s’ils ont été
+ 2. Concessions, brevets, licences, marques, ainsi que droits et valeurs similaires s’ils ont été
115
detail_flat
@@ -256,7 +256,7 @@
- I. Stocks
+ I. Stocks
153
detail_flat
@@ -292,7 +292,7 @@
- 4. Acomptes versés
+ 4. Acomptes versés
161
no_detail
@@ -301,7 +301,7 @@
- II. Créances
+ II. Créances
163
detail_flat
@@ -364,7 +364,7 @@
- 3. Créances sur des entreprises avec lesquelles la société a un
+ 3. Créances sur des entreprises avec lesquelles la société a un lien de participation
177
detail_flat
@@ -436,7 +436,7 @@
- 2. Actions propres ou parts propres
+ 2. Actions propres ou parts propres
193
no_detail
@@ -445,7 +445,7 @@
- 3. Autres valeurs mobilières
+ 3. Autres valeurs mobilières
195
no_detail
@@ -963,7 +963,7 @@
- CHARGES
+ A. CHARGES
641
detail_flat
@@ -972,7 +972,7 @@
- 1. Consommation de marchandises et de matières premières et consommables
+ 1. Consommation de marchandises et de matières premières et consommables
601
no_detail
@@ -1044,7 +1044,7 @@
- a) sur frais d'établissement et sur immobilisations corporelles
+ a) sur frais d'établissement et sur immobilisations corporelles et incorporelles
617
no_detail
@@ -1071,7 +1071,7 @@
- 6. Corrections de valeur sur immobilisations financières et aj
+ 6. Corrections de valeur sur immobilisations financières et ajustement de juste valeur sur immobilisations financières
623
no_detail
@@ -1080,7 +1080,7 @@
- 7. Corrections de valeur et ajustement de juste valeur sur élém
+ 7. Corrections de valeur et ajustement de juste valeur sur éléments financiers de l'actif circulant. Moins-values de cessions des valeurs mobilières
625
no_detail
@@ -1143,7 +1143,7 @@
- PRODUITS
+ B. PRODUITS
737
detail_flat
@@ -1161,7 +1161,7 @@
- 2. Variation des stocks de produits finis, et de produits et de commandes en cours
+ 2. Variation des stocks de produits finis, et de produits et de commandes en cours
703
no_detail
@@ -1188,7 +1188,7 @@
- a) sur frais d'établissement et sur immobilisations corporelles
+ a) sur frais d'établissement et sur immobilisations corporelles et incorporelles
709
no_detail
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
+ sale
15
@@ -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
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
20
Inkopen import binnen EU hoog
21% BTW import binnen EU
+
+
+
+
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
res.partner
-
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
+
+
+
+
+
+ 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/data/mail_data.xml b/addons/mail/data/mail_data.xml
index 02cfd626768..4e935e4aa88 100644
--- a/addons/mail/data/mail_data.xml
+++ b/addons/mail/data/mail_data.xml
@@ -40,6 +40,12 @@
()
+
+
+ mail.catchall.alias
+ catchall
+
+
Discussions
diff --git a/addons/mail/html/index.html b/addons/mail/html/index.html
new file mode 100644
index 00000000000..b564cf3ab1e
--- /dev/null
+++ b/addons/mail/html/index.html
@@ -0,0 +1,178 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/mail/html/mail_illustration.png b/addons/mail/html/mail_illustration.png
new file mode 100644
index 00000000000..4fff4837faa
Binary files /dev/null and b/addons/mail/html/mail_illustration.png differ
diff --git a/addons/mail/html/mail_sc_00.png b/addons/mail/html/mail_sc_00.png
new file mode 100644
index 00000000000..3011ef129b5
Binary files /dev/null and b/addons/mail/html/mail_sc_00.png differ
diff --git a/addons/mail/html/mail_sc_01.png b/addons/mail/html/mail_sc_01.png
new file mode 100644
index 00000000000..1b1099f6536
Binary files /dev/null and b/addons/mail/html/mail_sc_01.png differ
diff --git a/addons/mail/html/mail_sc_02.png b/addons/mail/html/mail_sc_02.png
new file mode 100644
index 00000000000..4e59c9d1e0f
Binary files /dev/null and b/addons/mail/html/mail_sc_02.png differ
diff --git a/addons/mail/html/mail_sc_03.png b/addons/mail/html/mail_sc_03.png
new file mode 100644
index 00000000000..dbb14b4da36
Binary files /dev/null and b/addons/mail/html/mail_sc_03.png differ
diff --git a/addons/mail/html/mail_sc_04.png b/addons/mail/html/mail_sc_04.png
new file mode 100644
index 00000000000..b8f47ba2935
Binary files /dev/null and b/addons/mail/html/mail_sc_04.png differ
diff --git a/addons/mail/html/mail_sc_05.png b/addons/mail/html/mail_sc_05.png
new file mode 100644
index 00000000000..251b4ebc676
Binary files /dev/null and b/addons/mail/html/mail_sc_05.png differ
diff --git a/addons/mail/html/mail_sc_06.png b/addons/mail/html/mail_sc_06.png
new file mode 100644
index 00000000000..251b4ebc676
Binary files /dev/null and b/addons/mail/html/mail_sc_06.png differ
diff --git a/addons/mail/html/mail_sc_07.png b/addons/mail/html/mail_sc_07.png
new file mode 100644
index 00000000000..9a33332817e
Binary files /dev/null and b/addons/mail/html/mail_sc_07.png differ
diff --git a/addons/mail/html/photo.png b/addons/mail/html/photo.png
new file mode 100644
index 00000000000..e605e5c6f8e
Binary files /dev/null and b/addons/mail/html/photo.png differ
diff --git a/addons/mail/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 95fbac478d6..bd2b9c3f18a 100644
--- a/addons/mail/mail_mail.py
+++ b/addons/mail/mail_mail.py
@@ -27,8 +27,8 @@ from urlparse import urljoin
from openerp import tools
from openerp import SUPERUSER_ID
+from openerp.addons.base.ir.ir_mail_server import MailDeliveryException
from openerp.osv import fields, osv
-from openerp.osv.orm import except_orm
from openerp.tools.translate import _
_logger = logging.getLogger(__name__)
@@ -60,9 +60,6 @@ class mail_mail(osv.Model):
'recipient_ids': fields.many2many('res.partner', string='To (Partners)'),
'email_cc': fields.char('Cc', help='Carbon copy message recipients'),
'body_html': fields.text('Rich-text Contents', help="Rich-text/HTML message"),
- # If not set in create values, auto-detected based on create values (res_id, model, email_from)
- 'reply_to': fields.char('Reply-To',
- help='Preferred response address for the message'),
# Auto-detected based on create() - if 'mail_message_id' was passed then this mail is a notification
# and during unlink() we will not cascade delete the parent and its attachments
'notification': fields.boolean('Is Notification',
@@ -93,31 +90,41 @@ class mail_mail(osv.Model):
""" Return a specific reply_to: alias of the document through message_get_reply_to
or take the email_from
"""
+ # if value specified: directly return it
if values.get('reply_to'):
return values.get('reply_to')
- email_reply_to = False
- # model, res_id: comes from values OR related message
- model = values.get('model')
- res_id = values.get('res_id')
- if values.get('mail_message_id') and (not model or not res_id):
+ mailgateway = True # tells whether the answer will go through the mailgateway, leading to the formatting of reply_to
+ ir_config_parameter = self.pool.get("ir.config_parameter")
+ catchall_domain = ir_config_parameter.get_param(cr, uid, "mail.catchall.domain", context=context)
+
+ # model, res_id, email_from, reply_to: comes from values OR related message
+ message = None
+ if values.get('mail_message_id'):
message = self.pool.get('mail.message').browse(cr, uid, values.get('mail_message_id'), context=context)
- if not model:
- model = message.model
- if not res_id:
- res_id = message.res_id
+ model = values.get('model', message and message.model or False)
+ res_id = values.get('res_id', message and message.res_id or False)
+ email_from = values.get('email_from', message and message.email_from or False)
+ email_reply_to = message and message.reply_to or False
# if model and res_id: try to use ``message_get_reply_to`` that returns the document alias
- if model and res_id and hasattr(self.pool[model], 'message_get_reply_to'):
+ if not email_reply_to and model and res_id and hasattr(self.pool[model], 'message_get_reply_to'):
email_reply_to = self.pool[model].message_get_reply_to(cr, uid, [res_id], context=context)[0]
+ # no alias reply_to -> catchall alias
+ if not email_reply_to:
+ catchall_alias = ir_config_parameter.get_param(cr, uid, "mail.catchall.alias", context=context)
+ if catchall_domain and catchall_alias:
+ email_reply_to = '%s@%s' % (catchall_alias, catchall_domain)
# no alias reply_to -> reply_to will be the email_from, only the email part
- if not email_reply_to and values.get('email_from'):
- emails = tools.email_split(values.get('email_from'))
+ if not email_reply_to and email_from:
+ emails = tools.email_split(email_from)
if emails:
email_reply_to = emails[0]
+ if emails[0].split('@')[1] != catchall_domain:
+ mailgateway = False
# format 'Document name '
- if email_reply_to and model and res_id:
+ if email_reply_to and model and res_id and mailgateway:
document_name = self.pool[model].name_get(cr, SUPERUSER_ID, [res_id], context=context)[0]
if document_name:
# sanitize document name
@@ -195,6 +202,36 @@ class mail_mail(osv.Model):
self.unlink(cr, SUPERUSER_ID, [mail.id], context=context)
return True
+ #------------------------------------------------------
+ # mail_mail formatting, tools and send mechanism
+ #------------------------------------------------------
+
+ # TODO in 8.0(+): maybe factorize this to enable in modules link generation
+ # independently of mail_mail model
+ # TODO in 8.0(+): factorize doc name sanitized and 'Followers of ...' formatting
+ # because it begins to appear everywhere
+
+ def _get_partner_access_link(self, cr, uid, mail, partner=None, context=None):
+ """ Generate URLs for links in mails:
+ - partner is an user and has read access to the document: direct link to document with model, res_id
+ """
+ if partner and partner.user_ids:
+ base_url = self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url')
+ # the parameters to encode for the query and fragment part of url
+ query = {'db': cr.dbname}
+ fragment = {
+ 'login': partner.user_ids[0].login,
+ 'action': 'mail.action_mail_redirect',
+ }
+ if mail.notification:
+ fragment.update({
+ 'message_id': mail.mail_message_id.id,
+ })
+ url = urljoin(base_url, "?%s#%s" % (urlencode(query), urlencode(fragment)))
+ return _("""Access your messages and documents in OpenERP""") % url
+ else:
+ return None
+
def send_get_mail_subject(self, cr, uid, mail, force=False, partner=None, context=None):
""" If subject is void and record_name defined: ' posted on '
@@ -208,32 +245,6 @@ class mail_mail(osv.Model):
return 'Re: %s' % (mail.parent_id.subject)
return mail.subject
- def send_get_mail_body_footer(self, cr, uid, mail, partner=None, context=None):
- """ Return a specific footer for the ir_email body. The main purpose of this method
- is to be inherited by Portal, to add modify the link for signing in, in
- each notification email a partner receives.
- """
- body_footer = ""
- # partner is a user, link to a related document (incentive to install portal)
- if partner and partner.user_ids and mail.model and mail.res_id \
- and self.check_access_rights(cr, partner.user_ids[0].id, 'read', raise_exception=False):
- related_user = partner.user_ids[0]
- try:
- self.pool[mail.model].check_access_rule(cr, related_user.id, [mail.res_id], 'read', context=context)
- base_url = self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url')
- # the parameters to encode for the query and fragment part of url
- query = {'db': cr.dbname}
- fragment = {
- 'login': related_user.login,
- 'model': mail.model,
- 'id': mail.res_id,
- }
- url = urljoin(base_url, "?%s#%s" % (urlencode(query), urlencode(fragment)))
- body_footer = _("""Access this document directly in OpenERP""") % url
- except except_orm, e:
- pass
- return body_footer
-
def send_get_mail_body(self, cr, uid, mail, partner=None, context=None):
""" Return a specific ir_email body. The main purpose of this method
is to be inherited to add custom content depending on some module.
@@ -243,9 +254,10 @@ class mail_mail(osv.Model):
"""
body = mail.body_html
- # add footer
- body_footer = self.send_get_mail_body_footer(cr, uid, mail, partner=partner, context=context)
- body = tools.append_content_to_html(body, body_footer, plaintext=False, container_tag='div')
+ # generate footer
+ link = self._get_partner_access_link(cr, uid, mail, partner, context=context)
+ if link:
+ body = tools.append_content_to_html(body, link, plaintext=False, container_tag='div')
return body
def send_get_email_dict(self, cr, uid, mail, partner=None, context=None):
@@ -278,7 +290,7 @@ class mail_mail(osv.Model):
'email_to': email_to,
}
- def send(self, cr, uid, ids, auto_commit=False, context=None):
+ def send(self, cr, uid, ids, auto_commit=False, raise_exception=False, context=None):
""" Sends the selected emails immediately, ignoring their current
state (mails that have already been sent should not be passed
unless they should actually be re-sent).
@@ -289,6 +301,8 @@ class mail_mail(osv.Model):
:param bool auto_commit: whether to force a commit of the mail status
after sending each mail (meant only for scheduler processing);
should never be True during normal transactions (default: False)
+ :param bool raise_exception: whether to raise an exception if the
+ email sending process has failed
:return: True
"""
ir_mail_server = self.pool.get('ir.mail_server')
@@ -334,9 +348,16 @@ class mail_mail(osv.Model):
# see revid:odo@openerp.com-20120622152536-42b2s28lvdv3odyr in 6.1
if mail_sent:
self._postprocess_sent_message(cr, uid, mail, context=context)
- except Exception:
+ except Exception as e:
_logger.exception('failed sending mail.mail %s', mail.id)
mail.write({'state': 'exception'})
+ if raise_exception:
+ if isinstance(e, AssertionError):
+ # get the args of the original error, wrap into a value and throw a MailDeliveryException
+ # that is an except_orm, with name and value as arguments
+ value = '. '.join(e.args)
+ raise MailDeliveryException(_("Mail Delivery Failed"), value)
+ raise
if auto_commit == True:
cr.commit()
diff --git a/addons/mail/mail_mail_view.xml b/addons/mail/mail_mail_view.xml
index 1ff9a2a292e..7384cc24a75 100644
--- a/addons/mail/mail_mail_view.xml
+++ b/addons/mail/mail_mail_view.xml
@@ -6,6 +6,11 @@
mail.mail
+
diff --git a/addons/mail/res_config.py b/addons/mail/res_config.py
index 91606e1c720..c19eb4a38ee 100644
--- a/addons/mail/res_config.py
+++ b/addons/mail/res_config.py
@@ -23,11 +23,12 @@ import urlparse
from openerp.osv import osv, fields
+
class project_configuration(osv.TransientModel):
_inherit = 'base.config.settings'
_columns = {
- 'alias_domain' : fields.char('Alias Domain',
+ 'alias_domain': fields.char('Alias Domain',
help="If you have setup a catch-all email domain redirected to "
"the OpenERP server, enter the domain name here."),
}
diff --git a/addons/mail/res_users_view.xml b/addons/mail/res_users_view.xml
index 5b08ba9edd8..babe922d975 100644
--- a/addons/mail/res_users_view.xml
+++ b/addons/mail/res_users_view.xml
@@ -26,7 +26,7 @@
-
+
diff --git a/addons/mail/static/scripts/openerp_mailgate.py b/addons/mail/static/scripts/openerp_mailgate.py
old mode 100644
new mode 100755
diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index f3869b6a5a4..c969d3f3b16 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -564,13 +564,6 @@
text-align: center;
width:100%;
}
-.openerp .oe_followers button.oe_invite{
- margin: 5px 0;
- padding: 2px 8px;
- font-size: 12px;
- text-shadow: none;
- width: 100%;
-}
.openerp .oe_followers button.oe_follower.oe_following{
color: white;
background-color: #3465A4;
@@ -624,8 +617,12 @@
margin-top: 12px;
margin-bottom: 4px;
}
+.openerp .oe_followers .oe_invite{
+ float: right;
+}
.openerp .oe_followers .oe_partner {
height: 32px;
+ margin-right: 8px;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
diff --git a/addons/mail/static/src/img/email_icon.png b/addons/mail/static/src/img/email_icon.png
old mode 100755
new mode 100644
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 3338954d417..230655cd364 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -219,6 +219,7 @@ openerp.mail = function (session) {
this.type = datasets.type || false,
this.subtype = datasets.subtype || false,
this.is_author = datasets.is_author || false,
+ this.author_avatar = datasets.author_avatar || false,
this.is_private = datasets.is_private || false,
this.subject = datasets.subject || false,
this.name = datasets.name || false,
@@ -269,7 +270,9 @@ openerp.mail = function (session) {
if (this.date && new Date().getTime()-this.date.getTime() < 7*24*60*60*1000) {
this.timerelative = $.timeago(this.date);
}
- if (this.type == 'email' && (!this.author_id || !this.author_id[0])) {
+ if (this.author_avatar) {
+ this.avatar = "data:image/png;base64," + this.author_avatar;
+ } else if (this.type == 'email' && (!this.author_id || !this.author_id[0])) {
this.avatar = ('/mail/static/src/img/email_icon.png');
} else if (this.author_id && this.template != 'mail.compose_message') {
this.avatar = mail.ChatterUtils.get_image(this.session, 'mail.message', 'image_small', this.id);
@@ -858,9 +861,9 @@ openerp.mail = function (session) {
on_checked_recipient: function (event) {
var $input = $(event.target);
- var email = $input.attr("data");
+ var full_name = $input.attr("data");
_.each(this.recipients, function (recipient) {
- if (recipient.email_address == email) {
+ if (recipient.full_name == full_name) {
recipient.checked = $input.is(":checked");
}
});
@@ -1064,9 +1067,7 @@ openerp.mail = function (session) {
msg.renderElement();
msg.start();
}
- if( self.options.root_thread.__parentedParent.__parentedParent.do_reload_menu_emails ) {
- self.options.root_thread.__parentedParent.__parentedParent.do_reload_menu_emails();
- }
+ self.options.root_thread.MailWidget.do_reload_menu_emails();
});
});
@@ -1206,6 +1207,7 @@ openerp.mail = function (session) {
init: function (parent, datasets, options) {
var self = this;
this._super(parent, options);
+ this.MailWidget = parent.__proto__ == mail.Widget.prototype ? parent : false;
this.domain = options.domain || [];
this.context = _.extend(options.context || {});
@@ -1439,11 +1441,16 @@ openerp.mail = function (session) {
message_fetch_set_read: function (message_list) {
if (! this.context.mail_read_set_read) return;
- this.render_mutex.exec(_.bind(function() {
+ var self = this;
+ this.render_mutex.exec(function() {
msg_ids = _.pluck(message_list, 'id');
- return this.ds_message.call('set_message_read', [
- msg_ids, true, false, this.context]);
- }, this));
+ return self.ds_message.call('set_message_read', [msg_ids, true, false, self.context])
+ .then(function (nb_read) {
+ if (nb_read) {
+ self.options.root_thread.MailWidget.do_reload_menu_emails();
+ }
+ });
+ });
},
/**
@@ -1708,6 +1715,22 @@ openerp.mail = function (session) {
this.bind_events();
},
+ /**
+ * create an object "related_menu"
+ * contains the menu widget and the sub menu related of this wall
+ */
+ do_reload_menu_emails: function () {
+ var menu = session.webclient.menu;
+ if (!menu || !menu.current_menu) {
+ return $.when();
+ }
+ return menu.rpc("/web/menu/load_needaction", {'menu_ids': [menu.current_menu]}).done(function(r) {
+ menu.on_needaction_loaded(r);
+ }).then(function () {
+ menu.trigger("need_action_reloaded");
+ });
+ },
+
/**
*Create the root thread and display this object in the DOM.
* Call the no_message method then c all the message_fetch method
@@ -1757,6 +1780,7 @@ openerp.mail = function (session) {
init: function (parent, node) {
this._super.apply(this, arguments);
+ this.ParentViewManager = parent;
this.node = _.clone(node);
this.node.params = _.extend({
'display_indented_thread': -1,
@@ -1776,7 +1800,7 @@ openerp.mail = function (session) {
this.domain = this.node.params && this.node.params.domain || [];
- if (!this.__parentedParent.is_action_enabled('edit')) {
+ if (!this.ParentViewManager.is_action_enabled('edit')) {
this.node.params.show_link = false;
}
},
@@ -1860,12 +1884,20 @@ openerp.mail = function (session) {
*/
init: function (parent, action) {
this._super(parent, action);
+ this.ActionManager = parent;
this.action = _.clone(action);
this.domain = this.action.params.domain || this.action.domain || [];
this.context = _.extend(this.action.params.context || {}, this.action.context || {});
+ // filter some parameters that we will propagate as search_default
this.defaults = {};
+ for (var key in this.action.context.params) {
+ if (_.indexOf(['model', 'res_id'], key) == -1) {
+ continue;
+ }
+ this.context['search_default_' + key] = this.action.context.params[key];
+ }
for (var key in this.context) {
if (key.match(/^search_default_/)) {
this.defaults[key.replace(/^search_default_/, '')] = this.context[key];
@@ -1895,23 +1927,6 @@ openerp.mail = function (session) {
wall_sidebar.appendTo(this.$el.find('.oe_mail_wall_aside'));
},
- /**
- * crete an object "related_menu"
- * contain the menu widget and the the sub menu related of this wall
- */
- do_reload_menu_emails: function () {
- var menu = this.__parentedParent.__parentedParent.menu;
- // return this.rpc("/web/menu/load", {'menu_id': 100}).done(function(r) {
- // _.each(menu.data.data.children, function (val) {
- // if (val.id == 100) {
- // val.children = _.find(r.data.children, function (r_val) {return r_val.id == 100;}).children;
- // }
- // });
- // var r = menu.data;
- // window.setTimeout(function(){menu.do_reload();}, 0);
- // });
- },
-
/**
* Load the mail.message search view
* @param {Object} defaults ??
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 1ee1af68fff..5062491ecbb 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -145,8 +145,10 @@
diff --git a/addons/mail/static/src/xml/mail_followers.xml b/addons/mail/static/src/xml/mail_followers.xml
index f3317223f1d..5ad3ff09bb3 100644
--- a/addons/mail/static/src/xml/mail_followers.xml
+++ b/addons/mail/static/src/xml/mail_followers.xml
@@ -19,7 +19,7 @@
diff --git a/addons/base_status/i18n/ru.po b/addons/base_status/i18n/ru.po
index 546f2772af3..2dab7ceaf31 100644
--- a/addons/base_status/i18n/ru.po
+++ b/addons/base_status/i18n/ru.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-12-28 10:04+0000\n"
+"PO-Revision-Date: 2013-06-05 07:16+0000\n"
"Last-Translator: Chertykov Denis \n"
"Language-Team: Russian \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-16 05:52+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-06-06 05:21+0000\n"
+"X-Generator: Launchpad (build 16667)\n"
#. module: base_status
#: code:addons/base_status/base_state.py:107
@@ -27,13 +27,13 @@ msgstr "Ошибка !"
#: code:addons/base_status/base_state.py:166
#, python-format
msgid "%s has been opened."
-msgstr ""
+msgstr "%s было открыто."
#. module: base_status
#: code:addons/base_status/base_state.py:199
#, python-format
msgid "%s has been renewed."
-msgstr ""
+msgstr "%s было обновлено."
#. module: base_status
#: code:addons/base_status/base_stage.py:210
@@ -55,13 +55,13 @@ msgstr ""
#: code:addons/base_status/base_state.py:193
#, python-format
msgid "%s is now pending."
-msgstr ""
+msgstr "%s сейчас в ожидании."
#. module: base_status
#: code:addons/base_status/base_state.py:187
#, python-format
msgid "%s has been canceled."
-msgstr ""
+msgstr "%s было отменено."
#. module: base_status
#: code:addons/base_status/base_stage.py:210
@@ -70,9 +70,11 @@ msgid ""
"You are already at the top level of your sales-team category.\n"
"Therefore you cannot escalate furthermore."
msgstr ""
+"Вы уже на высшем уровне категории вашей команды продаж.\n"
+"Поэтому вы не можете обострить."
#. module: base_status
#: code:addons/base_status/base_state.py:181
#, python-format
msgid "%s has been closed."
-msgstr ""
+msgstr "%s было закрыто."
diff --git a/addons/base_vat/base_vat.py b/addons/base_vat/base_vat.py
index e7501334997..52db18b7307 100644
--- a/addons/base_vat/base_vat.py
+++ b/addons/base_vat/base_vat.py
@@ -83,6 +83,8 @@ class res_partner(osv.osv):
Check the VAT number depending of the country.
http://sima-pc.com/nif.php
'''
+ if not ustr(country_code).encode('utf-8').isalpha():
+ return False
check_func_name = 'check_vat_' + country_code
check_func = getattr(self, check_func_name, None) or \
getattr(vatnumber, check_func_name, None)
diff --git a/addons/claim_from_delivery/i18n/ru.po b/addons/claim_from_delivery/i18n/ru.po
index 253e824d1e2..ffcf8fc2781 100644
--- a/addons/claim_from_delivery/i18n/ru.po
+++ b/addons/claim_from_delivery/i18n/ru.po
@@ -8,29 +8,29 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2010-09-30 06:47+0000\n"
+"PO-Revision-Date: 2013-06-05 07:11+0000\n"
"Last-Translator: Chertykov Denis \n"
"Language-Team: Russian \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-16 05:41+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-06-06 05:21+0000\n"
+"X-Generator: Launchpad (build 16667)\n"
#. module: claim_from_delivery
#: view:stock.picking.out:0
msgid "Claims"
-msgstr ""
+msgstr "Рекламации"
#. module: claim_from_delivery
#: model:res.request.link,name:claim_from_delivery.request_link_claim_from_delivery
msgid "Delivery Order"
-msgstr ""
+msgstr "Заказ доставки"
#. module: claim_from_delivery
#: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
msgid "Claim From Delivery"
-msgstr ""
+msgstr "Рекламация по доставке"
#~ msgid "Claim from delivery"
#~ msgstr "Претензия из доставки"
diff --git a/addons/contacts/i18n/th.po b/addons/contacts/i18n/th.po
new file mode 100644
index 00000000000..a75ecac2237
--- /dev/null
+++ b/addons/contacts/i18n/th.po
@@ -0,0 +1,37 @@
+# Thai translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2013-05-15 07:10+0000\n"
+"Last-Translator: FULL NAME \n"
+"Language-Team: Thai \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-05-16 05:12+0000\n"
+"X-Generator: Launchpad (build 16626)\n"
+
+#. module: contacts
+#: model:ir.actions.act_window,help:contacts.action_contacts
+msgid ""
+"
+
@@ -98,15 +98,15 @@
redirected to the aggregated contact. You can remove
contacts from this list to avoid merging them.
+
@@ -114,24 +114,9 @@
-
-
- pool.get('base.partner.merge.automatic.wizard').merge_multi(cr, uid, None, context)
- True
- Automatic Merge
- code
- ir.actions.server
-
-
-
- res.partner
- Automatic Merge
-
+
+ Set Auto Reminder on leads which are not open since 5 days.
1
+ on_time
5
@@ -54,12 +55,10 @@ object.write({'section_id': sales_team.id})
Set Auto Followers on leads which are urgent and come from USA.
2
+ on_create
0
- minutes
+ {
'search_default_section_id': [active_id],
- 'search_default_new': 1,
- 'search_default_open': 1,
+ 'search_default_assigned_to_me': 1,
'default_section_id': active_id,
'stage_type': 'opportunity',
'default_type': 'opportunity',
@@ -79,12 +78,12 @@
-
diff --git a/addons/hr_recruitment/security/hr_recruitment_security.xml b/addons/hr_recruitment/security/hr_recruitment_security.xml
index 570b0f036cd..4fccca1a791 100644
--- a/addons/hr_recruitment/security/hr_recruitment_security.xml
+++ b/addons/hr_recruitment/security/hr_recruitment_security.xml
@@ -4,7 +4,7 @@
\n" +" Click to add a contact in your address book.\n" +"
\n" +" OpenERP helps you easily track all activities related to\n" +" a customer; discussions, history of business opportunities,\n" +" documents, etc.\n" +"
\n" +" " +msgstr "" + +#. module: contacts +#: model:ir.actions.act_window,name:contacts.action_contacts +#: model:ir.ui.menu,name:contacts.menu_contacts +msgid "Contacts" +msgstr "" diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py index 8e17a882076..e7ab7df27ea 100644 --- a/addons/crm/__openerp__.py +++ b/addons/crm/__openerp__.py @@ -81,8 +81,6 @@ Dashboard for CRM will include: 'crm_lead_view.xml', 'crm_lead_menu.xml', - 'crm_case_section_view.xml', - 'crm_meeting_menu.xml', 'crm_phonecall_view.xml', @@ -98,6 +96,8 @@ Dashboard for CRM will include: 'res_config_view.xml', 'base_partner_merge_view.xml', + + 'crm_case_section_view.xml', ], 'demo': [ 'crm_demo.xml', @@ -121,7 +121,8 @@ Dashboard for CRM will include: 'static/src/css/crm.css' ], 'js': [ - 'static/src/js/crm.js' + 'static/lib/sparkline/jquery.sparkline.js', + 'static/src/js/crm_case_section.js', ], 'installable': True, 'application': True, diff --git a/addons/crm/base_partner_merge.py b/addons/crm/base_partner_merge.py index b2645e7fb79..42e1ab7c7ec 100644 --- a/addons/crm/base_partner_merge.py +++ b/addons/crm/base_partner_merge.py @@ -13,6 +13,7 @@ from openerp.tools import mute_logger # Validation Library https://pypi.python.org/pypi/validate_email/1.1 from .validate_email import validate_email +import openerp from openerp.osv import osv, orm from openerp.osv import fields from openerp.osv.orm import browse_record @@ -101,14 +102,26 @@ class MergePartnerAutomatic(osv.TransientModel): 'current_line_id': fields.many2one('base.partner.merge.line', 'Current Line'), 'line_ids': fields.one2many('base.partner.merge.line', 'wizard_id', 'Lines'), 'partner_ids': fields.many2many('res.partner', string='Contacts'), + 'dst_partner_id': fields.many2one('res.partner', string='Destination Contact'), 'exclude_contact': fields.boolean('A user associated to the contact'), 'exclude_journal_item': fields.boolean('Journal Items associated to the contact'), 'maximum_group': fields.integer("Maximum of Group of Contacts"), } + def default_get(self, cr, uid, fields, context=None): + if context is None: + context = {} + res = super(MergePartnerAutomatic, self).default_get(cr, uid, fields, context) + if context.get('active_model') == 'res.partner' and context.get('active_ids'): + partner_ids = context['active_ids'] + res['state'] = 'selection' + res['partner_ids'] = partner_ids + res['dst_partner_id'] = self._get_ordered_partner(cr, uid, partner_ids, context=context)[-1].id + return res + _defaults = { - 'state': 'option', + 'state': 'option' } def get_fk_on(self, cr, table): @@ -204,8 +217,8 @@ class MergePartnerAutomatic(osv.TransientModel): if proxy is None: return domain = [(field_model, '=', 'res.partner'), (field_id, '=', src.id)] - ids = proxy.search(cr, uid, domain, context=context) - return proxy.write(cr, uid, ids, {field_id: dst_partner.id}, context=context) + ids = proxy.search(cr, openerp.SUPERUSER_ID, domain, context=context) + return proxy.write(cr, openerp.SUPERUSER_ID, ids, {field_id: dst_partner.id}, context=context) update_records = functools.partial(update_records, context=context) @@ -219,9 +232,9 @@ class MergePartnerAutomatic(osv.TransientModel): proxy = self.pool['ir.model.fields'] domain = [('ttype', '=', 'reference')] - record_ids = proxy.search(cr, uid, domain, context=context) + record_ids = proxy.search(cr, openerp.SUPERUSER_ID, domain, context=context) - for record in proxy.browse(cr, uid, record_ids, context=context): + for record in proxy.browse(cr, openerp.SUPERUSER_ID, record_ids, context=context): proxy_model = self.pool[record.model] field_type = proxy_model._columns.get(record.name).__class__._type @@ -233,11 +246,11 @@ class MergePartnerAutomatic(osv.TransientModel): domain = [ (record.name, '=', 'res.partner,%d' % partner.id) ] - model_ids = proxy_model.search(cr, uid, domain, context=context) + model_ids = proxy_model.search(cr, openerp.SUPERUSER_ID, domain, context=context) values = { record.name: 'res.partner,%d' % dst_partner.id, } - proxy_model.write(cr, uid, model_ids, values, context=context) + proxy_model.write(cr, openerp.SUPERUSER_ID, model_ids, values, context=context) def _update_values(self, cr, uid, src_partners, dst_partner, context=None): _logger.debug('_update_values for dst_partner: %s for src_partners: %r', dst_partner.id, list(map(operator.attrgetter('id'), src_partners))) @@ -251,7 +264,7 @@ class MergePartnerAutomatic(osv.TransientModel): values = dict() for column, field in columns.iteritems(): - if field._type not in ('many2many', 'one2many', 'function'): + if field._type not in ('many2many', 'one2many') and not isinstance(field, fields.function): for item in itertools.chain(src_partners, [dst_partner]): if item[column]: values[column] = write_serializer(column, item[column]) @@ -266,22 +279,31 @@ class MergePartnerAutomatic(osv.TransientModel): _logger.info('Skip recursive partner hierarchies for parent_id %s of partner: %s', parent_id, dst_partner.id) @mute_logger('openerp.osv.expression', 'openerp.osv.orm') - def _merge(self, cr, uid, partner_ids, context=None): + def _merge(self, cr, uid, partner_ids, dst_partner=None, context=None): proxy = self.pool.get('res.partner') partner_ids = proxy.exists(cr, uid, list(partner_ids), context=context) if len(partner_ids) < 2: return - partners = proxy.browse(cr, uid, list(partner_ids), context=context) - ordered_partners = sorted(sorted(partners, - key=operator.attrgetter('create_date'), reverse=True), - key=operator.attrgetter('active'), reverse=True) + if len(partner_ids) > 3: + raise osv.except_osv(_('Error'), _("For safety reasons, you cannot merge more than 3 contacts together. You can re-open the wizard several times if needed.")) - dst_partner = ordered_partners[-1] - src_partners = ordered_partners[:-1] + if openerp.SUPERUSER_ID != uid and len(set(partner.email for partner in proxy.browse(cr, uid, partner_ids, context=context))) > 1: + raise osv.except_osv(_('Error'), _("All contacts must have the same email. Only the Administrator can merge contacts with different emails.")) + + if dst_partner and dst_partner.id in partner_ids: + src_partners = proxy.browse(cr, uid, [id for id in partner_ids if id != dst_partner.id], context=context) + else: + ordered_partners = self._get_ordered_partner(cr, uid, partner_ids, context) + dst_partner = ordered_partners[-1] + src_partners = ordered_partners[:-1] _logger.info("dst_partner: %s", dst_partner.id) + if openerp.SUPERUSER_ID != uid and self._model_is_installed(cr, uid, 'account.move.line', context=context) and \ + self.pool.get('account.move.line').search(cr, openerp.SUPERUSER_ID, [('partner_id', 'in', [partner.id for partner in src_partners])], context=context): + raise osv.except_osv(_('Error'), _("Only the destination contact may be linked to existing Journal Items. Please ask the Administrator if you need to merge several contacts linked to existing Journal Items.")) + call_it = lambda function: function(cr, uid, src_partners, dst_partner, context=context) @@ -289,12 +311,12 @@ class MergePartnerAutomatic(osv.TransientModel): call_it(self._update_reference_fields) call_it(self._update_values) - _logger.info("---merged---") - + _logger.info('(uid = %s) merged the partners %r with %s', uid, list(map(operator.attrgetter('id'), src_partners)), dst_partner.id) + dst_partner.message_post(body='%s %s'%(_("Merged with the following partners:"), ", ".join('%s<%s>(ID %s)' % (p.name, p.email or 'n/a', p.id) for p in src_partners))) + for partner in src_partners: partner.unlink() - def clean_emails(self, cr, uid, context=None): """ Clean the email address of the partner, if there is an email field with @@ -414,9 +436,16 @@ class MergePartnerAutomatic(osv.TransientModel): this = self.browse(cr, uid, ids[0], context=context) if this.current_line_id: this.current_line_id.unlink() - return self._next_screen(this) + return self._next_screen(cr, uid, this, context) - def _next_screen(self, this): + def _get_ordered_partner(self, cr, uid, partner_ids, context=None): + partners = self.pool.get('res.partner').browse(cr, uid, list(partner_ids), context=context) + ordered_partners = sorted(sorted(partners, + key=operator.attrgetter('create_date'), reverse=True), + key=operator.attrgetter('active'), reverse=True) + return ordered_partners + + def _next_screen(self, cr, uid, this, context=None): this.refresh() values = {} if this.line_ids: @@ -426,6 +455,7 @@ class MergePartnerAutomatic(osv.TransientModel): values.update({ 'current_line_id': current_line.id, 'partner_ids': [(6, 0, current_partner_ids)], + 'dst_partner_id': self._get_ordered_partner(cr, uid, current_partner_ids, context)[-1].id, 'state': 'selection', }) else: @@ -525,7 +555,7 @@ class MergePartnerAutomatic(osv.TransientModel): query = self._generate_query(groups, this.maximum_group) self._process_query(cr, uid, ids, query, context=context) - return self._next_screen(this) + return self._next_screen(cr, uid, this, context) def automatic_process_cb(self, cr, uid, ids, context=None): assert is_integer_list(ids) @@ -666,7 +696,7 @@ class MergePartnerAutomatic(osv.TransientModel): # p1.parent_id = p1.id # """) - return self._next_screen(this) + return self._next_screen(cr, uid, this, context) def merge_cb(self, cr, uid, ids, context=None): assert is_integer_list(ids) @@ -685,33 +715,12 @@ class MergePartnerAutomatic(osv.TransientModel): 'target': 'new', } - self._merge(cr, uid, partner_ids, context=context) + self._merge(cr, uid, partner_ids, this.dst_partner_id, context=context) - this.current_line_id.unlink() + if this.current_line_id: + this.current_line_id.unlink() - return self._next_screen(this) - - def merge_multi(self, cr, uid, ids, context=None): - - active_model = context.get('active_model') - if active_model != 'res.partner': - raise osv.except_osv( - _('Error'), - _('This wizard can only used with the Partners') - ) - - partner_ids = context.get('active_ids', []) - - MINIMAL_NUMBER = 2 - if len(partner_ids) < MINIMAL_NUMBER: - raise osv.except_osv( - _('Error'), - _("You can't use this wizard with only one Partner") - ) - - self._merge(cr, uid, partner_ids, context=context) - - return True + return self._next_screen(cr, uid, this, context) def auto_set_parent_id(self, cr, uid, ids, context=None): assert is_integer_list(ids) diff --git a/addons/crm/base_partner_merge_view.xml b/addons/crm/base_partner_merge_view.xml index 74e7a72d7a8..8ce0b5fd99f 100644 --- a/addons/crm/base_partner_merge_view.xml +++ b/addons/crm/base_partner_merge_view.xml @@ -68,9 +68,9 @@ OpenERP will propose you to merge only those having all these fields in common. (not one of the fields). -
-
+
-
-
+
+
-
-
-
+
-
-
-
diff --git a/addons/event_sale/event_sale.py b/addons/event_sale/event_sale.py
index ec583a58cbf..8bacd37fc15 100644
--- a/addons/event_sale/event_sale.py
+++ b/addons/event_sale/event_sale.py
@@ -70,6 +70,8 @@ class sale_order_line(osv.osv):
'''
create registration with sales order
'''
+ if context is None:
+ context = {}
registration_obj = self.pool.get('event.registration')
sale_obj = self.pool.get('sale.order')
for order_line in self.browse(cr, uid, ids, context=context):
@@ -83,7 +85,8 @@ class sale_order_line(osv.osv):
'origin': order_line.order_id.name,
'event_id': order_line.event_id.id,
}
+ message = _("The registration has been created for event %s from the Sale Order %s. ") % (order_line.event_id.name, order_line.order_id.name)
+ context.update({'mail_create_nolog': True})
registration_id = registration_obj.create(cr, uid, dic, context=context)
- message = _("The registration %s has been created from the Sales Order %s.") % (registration_id, order_line.order_id.name)
registration_obj.message_post(cr, uid, [registration_id], body=message, context=context)
return super(sale_order_line, self).button_confirm(cr, uid, ids, context=context)
diff --git a/addons/fetchmail/fetchmail_view.xml b/addons/fetchmail/fetchmail_view.xml
index 4e653adce28..5ee17c61b6f 100644
--- a/addons/fetchmail/fetchmail_view.xml
+++ b/addons/fetchmail/fetchmail_view.xml
@@ -97,15 +97,17 @@
General Settings
base.config.settings
-
-
-
+
+
+
+
+
-
+
' +
+ ' ';
+ return vel;
+ },
+
+ _drawCircle: function (shapeid, x, y, radius, lineColor, fillColor, lineWidth) {
+ var stroke, fill, vel;
+ x -= radius;
+ y -= radius;
+ stroke = lineColor === undefined ? ' stroked="false" ' : ' strokeWeight="' + lineWidth + 'px" strokeColor="' + lineColor + '" ';
+ fill = fillColor === undefined ? ' filled="false"' : ' fillColor="' + fillColor + '" filled="true" ';
+ vel = '' +
+ ' ';
+ return vel;
+ },
+
+ _drawRect: function (shapeid, x, y, width, height, lineColor, fillColor) {
+ return this._drawShape(shapeid, [[x, y], [x, y + height], [x + width, y + height], [x + width, y], [x, y]], lineColor, fillColor);
+ },
+
+ reset: function () {
+ this.group.innerHTML = '';
+ },
+
+ appendShape: function (shape) {
+ var vel = this['_draw' + shape.type].apply(this, shape.args);
+ if (this.rendered) {
+ this.group.insertAdjacentHTML('beforeEnd', vel);
+ } else {
+ this.prerender += vel;
+ }
+ this.lastShapeId = shape.id;
+ return shape.id;
+ },
+
+ replaceWithShape: function (shapeid, shape) {
+ var existing = $('#jqsshape' + shapeid),
+ vel = this['_draw' + shape.type].apply(this, shape.args);
+ existing[0].outerHTML = vel;
+ },
+
+ replaceWithShapes: function (shapeids, shapes) {
+ // replace the first shapeid with all the new shapes then toast the remaining old shapes
+ var existing = $('#jqsshape' + shapeids[0]),
+ replace = '',
+ slen = shapes.length,
+ i;
+ for (i = 0; i < slen; i++) {
+ replace += this['_draw' + shapes[i].type].apply(this, shapes[i].args);
+ }
+ existing[0].outerHTML = replace;
+ for (i = 1; i < shapeids.length; i++) {
+ $('#jqsshape' + shapeids[i]).remove();
+ }
+ },
+
+ insertAfterShape: function (shapeid, shape) {
+ var existing = $('#jqsshape' + shapeid),
+ vel = this['_draw' + shape.type].apply(this, shape.args);
+ existing[0].insertAdjacentHTML('afterEnd', vel);
+ },
+
+ removeShapeId: function (shapeid) {
+ var existing = $('#jqsshape' + shapeid);
+ this.group.removeChild(existing[0]);
+ },
+
+ getShapeAt: function (el, x, y) {
+ var shapeid = el.id.substr(8);
+ return shapeid;
+ },
+
+ render: function () {
+ if (!this.rendered) {
+ // batch the intial render into a single repaint
+ this.group.innerHTML = this.prerender;
+ this.rendered = true;
+ }
+ }
+ });
+
+}));
diff --git a/addons/crm/static/src/css/crm.css b/addons/crm/static/src/css/crm.css
index 3ad3840a4e1..ba4473edc26 100644
--- a/addons/crm/static/src/css/crm.css
+++ b/addons/crm/static/src/css/crm.css
@@ -20,15 +20,27 @@
}
.openerp .oe_kanban_view .oe_kanban_crm_salesteams .oe_items_list {
- margin: 10px 0;
+ position: relative;
+ margin: 10px;
}
-.openerp .oe_kanban_view .oe_kanban_crm_salesteams .oe_items_list a {
- width: 110px;
+.openerp .oe_kanban_view .oe_kanban_crm_salesteams .oe_items_list div {
+ width: 160px;
+ height: 22px;
+ margin: 0 !important;
+ position: relative;
display: inline-block;
}
.openerp .oe_kanban_view .oe_kanban_crm_salesteams .oe_items_list a:hover {
text-decoration: underline !important;
}
+.openerp .oe_kanban_view .oe_kanban_crm_salesteams .oe_items_list div a:nth-child(2n) {
+ position: absolute;
+ left: 90px;
+ top: 0;
+}
+.openerp .oe_kanban_view .oe_kanban_crm_salesteams .oe_items_list div:nth-child(2n) a:nth-child(2n) {
+ left: 110px;
+}
.openerp .oe_kanban_view .oe_kanban_crm_salesteams .oe_center {
text-align: center;
margin: 3px 0;
@@ -40,3 +52,13 @@
.openerp .oe_kanban_view .oe_kanban_crm_salesteams .oe_center .oe_subsum {
font-size: 10px;
}
+
+.openerp .oe_kanban_view .oe_justgage {
+ color: black;
+ display: inline-block;
+}
+
+.openerp .oe_kanban_view .oe_sparkline_bar {
+ height: 20px;
+ width: 36px;
+}
\ No newline at end of file
diff --git a/addons/crm/static/src/js/crm.js b/addons/crm/static/src/js/crm.js
deleted file mode 100644
index e027313d6dc..00000000000
--- a/addons/crm/static/src/js/crm.js
+++ /dev/null
@@ -1,11 +0,0 @@
-openerp.crm = function(openerp) {
- openerp.web_kanban.KanbanRecord.include({
- on_card_clicked: function() {
- if (this.view.dataset.model === 'crm.case.section') {
- this.$('.oe_kanban_crm_salesteams_list a').first().click();
- } else {
- this._super.apply(this, arguments);
- }
- },
- });
-};
diff --git a/addons/crm/static/src/js/crm_case_section.js b/addons/crm/static/src/js/crm_case_section.js
new file mode 100644
index 00000000000..2b4ca741d75
--- /dev/null
+++ b/addons/crm/static/src/js/crm_case_section.js
@@ -0,0 +1,34 @@
+openerp.crm = function(openerp) {
+ openerp.web_kanban.KanbanRecord.include({
+ on_card_clicked: function() {
+ if (this.view.dataset.model === 'crm.case.section') {
+ this.$('.oe_kanban_crm_salesteams_list a').first().click();
+ } else {
+ this._super.apply(this, arguments);
+ }
+ },
+ });
+
+ openerp.crm.SparklineBarWidget = openerp.web_kanban.AbstractField.extend({
+ className: "oe_sparkline_bar",
+ start: function() {
+ var self = this;
+ var title = this.$node.html();
+ setTimeout(function () {
+ var value = _.pluck(self.field.value, 'value');
+ var tooltips = _.pluck(self.field.value, 'tooltip');
+ self.$el.sparkline(value, {
+ type: 'bar',
+ barWidth: 5,
+ tooltipFormat: '{{offset:offset}} {{value}}',
+ tooltipValueLookups: {
+ 'offset': tooltips
+ },
+ });
+ self.$el.tipsy({'delayIn': 0, 'html': true, 'title': function(){return title}, 'gravity': 'n'});
+ }, 0);
+ },
+ });
+ openerp.web_kanban.fields_registry.add("sparkline_bar", "openerp.crm.SparklineBarWidget");
+
+};
diff --git a/addons/crm/test/crm_lead_cancel.yml b/addons/crm/test/crm_lead_cancel.yml
index edaf844952a..8749675bf23 100644
--- a/addons/crm/test/crm_lead_cancel.yml
+++ b/addons/crm/test/crm_lead_cancel.yml
@@ -1,7 +1,9 @@
-
- I cancel unqualified lead.
+ I set a new sale team (with Marketing at parent) and I cancel unqualified lead .
-
!python {model: crm.lead}: |
+ section_id = self.pool.get('crm.case.section').create(cr, uid, {'name': "Phone Marketing", 'parent_id': ref("crm.crm_case_section_2")})
+ self.write(cr, uid, [ref("crm_case_1")], {'section_id': section_id})
self.case_cancel(cr, uid, [ref("crm_case_1")])
-
I check cancelled lead.
@@ -42,4 +44,4 @@
I check the lead is correctly escalated to the parent team.
-
!assert {model: crm.lead, id: crm.crm_case_1, string: Escalate lead to parent team}:
- - section_id.name == "Support Department"
+ - section_id.name == "Marketing"
diff --git a/addons/crm_claim/crm_claim.py b/addons/crm_claim/crm_claim.py
index 275d9edaab4..774571b0314 100644
--- a/addons/crm_claim/crm_claim.py
+++ b/addons/crm_claim/crm_claim.py
@@ -105,7 +105,7 @@ class crm_claim(base_stage, osv.osv):
'email_from': fields.char('Email', size=128, help="Destination email for email gateway."),
'partner_phone': fields.char('Phone', size=32),
'stage_id': fields.many2one ('crm.claim.stage', 'Stage', track_visibility='onchange',
- domain="['&',('fold', '=', False),'|', ('section_ids', '=', section_id), ('case_default', '=', True)]"),
+ domain="['|', ('section_ids', '=', section_id), ('case_default', '=', True)]"),
'cause': fields.text('Root Cause'),
'state': fields.related('stage_id', 'state', type="selection", store=True,
selection=crm.AVAILABLE_STATES, string="Status", readonly=True,
diff --git a/addons/crm_claim/i18n/ru.po b/addons/crm_claim/i18n/ru.po
index afcf4702a67..4579b6d8557 100644
--- a/addons/crm_claim/i18n/ru.po
+++ b/addons/crm_claim/i18n/ru.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-10-24 05:01+0000\n"
+"PO-Revision-Date: 2013-05-30 14:03+0000\n"
"Last-Translator: Chertykov Denis \n"
"Language-Team: Russian \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-16 05:44+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-05-31 05:38+0000\n"
+"X-Generator: Launchpad (build 16660)\n"
#. module: crm_claim
#: help:crm.claim.stage,fold:0
@@ -23,6 +23,8 @@ msgid ""
"This stage is not visible, for example in status bar or kanban view, when "
"there are no records in that stage to display."
msgstr ""
+"Эта стадия не видима, например в статус-баре или виде канбан, когда нет "
+"записей этой стадии для отображения."
#. module: crm_claim
#: field:crm.claim.report,nbr:0
@@ -46,11 +48,13 @@ msgid ""
"Allows you to configure your incoming mail server, and create claims from "
"incoming emails."
msgstr ""
+"Позволяет настроить сервер входящей почты и создавать претензии из входящих "
+"эл. писем."
#. module: crm_claim
#: model:ir.model,name:crm_claim.model_crm_claim_stage
msgid "Claim stages"
-msgstr ""
+msgstr "Этапы претензии"
#. module: crm_claim
#: selection:crm.claim.report,month:0
@@ -65,7 +69,7 @@ msgstr "Задержка закрытия"
#. module: crm_claim
#: field:crm.claim,message_unread:0
msgid "Unread Messages"
-msgstr ""
+msgstr "Непрочитанные"
#. module: crm_claim
#: field:crm.claim,resolution:0
@@ -100,12 +104,12 @@ msgstr "# претензий"
#. module: crm_claim
#: field:crm.claim.stage,name:0
msgid "Stage Name"
-msgstr ""
+msgstr "Название этапа"
#. module: crm_claim
#: view:crm.claim.report:0
msgid "Salesperson"
-msgstr ""
+msgstr "Продавец"
#. module: crm_claim
#: selection:crm.claim,priority:0
@@ -149,7 +153,7 @@ msgstr "Предупредительная мера"
#. module: crm_claim
#: help:crm.claim,message_unread:0
msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "Если отмечено, новые сообщения требуют вашего внимания."
#. module: crm_claim
#: field:crm.claim.report,date_closed:0
@@ -182,6 +186,8 @@ msgid ""
"Holds the Chatter summary (number of messages, ...). This summary is "
"directly in html format in order to be inserted in kanban views."
msgstr ""
+"Содержит сводку по Чаттеру (количество сообщений,...). Эта сводка в формате "
+"html для возможности использования в канбан виде"
#. module: crm_claim
#: view:crm.claim:0
@@ -235,12 +241,12 @@ msgstr "Важность"
#. module: crm_claim
#: field:crm.claim.stage,fold:0
msgid "Hide in Views when Empty"
-msgstr ""
+msgstr "Скрыть вид, если пусто"
#. module: crm_claim
#: field:crm.claim,message_follower_ids:0
msgid "Followers"
-msgstr ""
+msgstr "Подписчики"
#. module: crm_claim
#: view:crm.claim:0
@@ -254,7 +260,7 @@ msgstr "Новый"
#. module: crm_claim
#: field:crm.claim.stage,section_ids:0
msgid "Sections"
-msgstr ""
+msgstr "Секции"
#. module: crm_claim
#: field:crm.claim,email_from:0
@@ -290,7 +296,7 @@ msgstr "Предмет претензии"
#. module: crm_claim
#: model:crm.claim.stage,name:crm_claim.stage_claim3
msgid "Rejected"
-msgstr ""
+msgstr "Отклонено"
#. module: crm_claim
#: field:crm.claim,date_action_next:0
@@ -344,7 +350,7 @@ msgstr ""
#: code:addons/crm_claim/crm_claim.py:194
#, python-format
msgid "No Subject"
-msgstr ""
+msgstr "Без темы"
#. module: crm_claim
#: help:crm.claim.stage,state:0
@@ -358,7 +364,7 @@ msgstr ""
#. module: crm_claim
#: view:crm.claim:0
msgid "Settle"
-msgstr ""
+msgstr "Решать"
#. module: crm_claim
#: model:ir.ui.menu,name:crm_claim.menu_claim_stage_view
@@ -384,7 +390,7 @@ msgstr "Отчет о претензиях"
#. module: crm_claim
#: view:sale.config.settings:0
msgid "Configure"
-msgstr ""
+msgstr "Настроить"
#. module: crm_claim
#: model:crm.case.resource.type,name:crm_claim.type_claim1
@@ -430,6 +436,8 @@ msgid ""
"If you check this field, this stage will be proposed by default on each "
"sales team. It will not assign this stage to existing teams."
msgstr ""
+"Если вы отметите это поле, этот этап будет предложен по умолчанию каждому "
+"отделу продаж. Этот этап не будет назначен существующим отделам."
#. module: crm_claim
#: field:crm.claim,categ_id:0
@@ -485,7 +493,7 @@ msgstr "Закрыто"
#. module: crm_claim
#: view:crm.claim:0
msgid "Reject"
-msgstr ""
+msgstr "Отклонить"
#. module: crm_claim
#: view:res.partner:0
@@ -495,7 +503,7 @@ msgstr "Претензии партнера"
#. module: crm_claim
#: view:crm.claim.stage:0
msgid "Claim Stage"
-msgstr ""
+msgstr "Этап претензии"
#. module: crm_claim
#: view:crm.claim:0
@@ -513,7 +521,7 @@ msgstr "Отложено"
#: field:crm.claim.report,state:0
#: field:crm.claim.stage,state:0
msgid "Status"
-msgstr ""
+msgstr "Статус"
#. module: crm_claim
#: selection:crm.claim.report,month:0
@@ -529,7 +537,7 @@ msgstr "Обычный"
#. module: crm_claim
#: help:crm.claim.stage,sequence:0
msgid "Used to order stages. Lower is better."
-msgstr ""
+msgstr "Используется для упорядочивания этапов. Меньше - лучше."
#. module: crm_claim
#: selection:crm.claim.report,month:0
@@ -549,7 +557,7 @@ msgstr "Телефон"
#. module: crm_claim
#: field:crm.claim,message_is_follower:0
msgid "Is a Follower"
-msgstr ""
+msgstr "Подписан"
#. module: crm_claim
#: field:crm.claim.report,user_id:0
@@ -581,6 +589,10 @@ msgid ""
"the case needs to be reviewed then the status is set "
"to 'Pending'."
msgstr ""
+"Статус устанавливается в \"Черновик\", при создании дела. Если дело в "
+"процессе, то статус - «Открыт». Когда дело закончено, устанавливается статус "
+"\"Готово\". Если дело должно быть пересмотрено то статус установлен в "
+"'Ожидание'."
#. module: crm_claim
#: field:crm.claim,active:0
@@ -628,7 +640,7 @@ msgstr "Дата претензии"
#. module: crm_claim
#: field:crm.claim,message_summary:0
msgid "Summary"
-msgstr ""
+msgstr "Итог"
#. module: crm_claim
#: model:ir.actions.act_window,name:crm_claim.crm_claim_categ_action
@@ -638,7 +650,7 @@ msgstr "Категории претензий"
#. module: crm_claim
#: field:crm.claim.stage,case_default:0
msgid "Common to All Teams"
-msgstr ""
+msgstr "Общее для всех отделов"
#. module: crm_claim
#: view:crm.claim:0
@@ -677,7 +689,7 @@ msgstr "Претензия"
#. module: crm_claim
#: view:crm.claim.report:0
msgid "My Company"
-msgstr ""
+msgstr "Моя компания"
#. module: crm_claim
#: view:crm.claim.report:0
@@ -807,7 +819,7 @@ msgstr "Февраль"
#. module: crm_claim
#: model:ir.model,name:crm_claim.model_sale_config_settings
msgid "sale.config.settings"
-msgstr ""
+msgstr "sale.config.settings"
#. module: crm_claim
#: view:crm.claim.report:0
@@ -833,22 +845,22 @@ msgstr "Мои дела"
#. module: crm_claim
#: model:crm.claim.stage,name:crm_claim.stage_claim2
msgid "Settled"
-msgstr ""
+msgstr "Решено"
#. module: crm_claim
#: help:crm.claim,message_ids:0
msgid "Messages and communication history"
-msgstr ""
+msgstr "Сообщения и история общения"
#. module: crm_claim
#: field:sale.config.settings,fetchmail_claim:0
msgid "Create claims from incoming mails"
-msgstr ""
+msgstr "Создать претензии из входящей почты"
#. module: crm_claim
#: field:crm.claim.stage,sequence:0
msgid "Sequence"
-msgstr ""
+msgstr "Нумерация"
#. module: crm_claim
#: view:crm.claim:0
@@ -883,6 +895,8 @@ msgid ""
"Link between stages and sales teams. When set, this limitate the current "
"stage to the selected sales teams."
msgstr ""
+"Связь между этапами и отделами продаж. При установке, ограничивает этап для "
+"выбранного отдела продаж."
#. module: crm_claim
#: help:crm.claim.stage,case_refused:0
diff --git a/addons/crm_claim/report/crm_claim_report_view.xml b/addons/crm_claim/report/crm_claim_report_view.xml
index 530eb6061a3..bae02ef8c0c 100644
--- a/addons/crm_claim/report/crm_claim_report_view.xml
+++ b/addons/crm_claim/report/crm_claim_report_view.xml
@@ -55,7 +55,7 @@
\n"
"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-10-24 05:08+0000\n"
+"PO-Revision-Date: 2013-05-30 14:09+0000\n"
"Last-Translator: Chertykov Denis \n"
"Language-Team: Russian \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-16 05:46+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-05-31 05:38+0000\n"
+"X-Generator: Launchpad (build 16660)\n"
#. module: crm_helpdesk
#: field:crm.helpdesk.report,delay_close:0
@@ -46,7 +46,7 @@ msgstr "Март"
#. module: crm_helpdesk
#: field:crm.helpdesk,message_unread:0
msgid "Unread Messages"
-msgstr ""
+msgstr "Непрочитанные"
#. module: crm_helpdesk
#: field:crm.helpdesk,company_id:0
@@ -63,7 +63,7 @@ msgstr "Адреса наблюдателей"
#. module: crm_helpdesk
#: view:crm.helpdesk.report:0
msgid "Salesperson"
-msgstr ""
+msgstr "Продавец"
#. module: crm_helpdesk
#: selection:crm.helpdesk,priority:0
@@ -106,7 +106,7 @@ msgstr "Отменено"
#. module: crm_helpdesk
#: help:crm.helpdesk,message_unread:0
msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "Если отмечено, новые сообщения требуют вашего внимания."
#. module: crm_helpdesk
#: model:ir.actions.act_window,name:crm_helpdesk.action_report_crm_helpdesk
@@ -136,6 +136,8 @@ msgid ""
"Holds the Chatter summary (number of messages, ...). This summary is "
"directly in html format in order to be inserted in kanban views."
msgstr ""
+"Содержит сводку по Чаттеру (количество сообщений,...). Эта сводка в формате "
+"html для возможности использования в канбан виде"
#. module: crm_helpdesk
#: view:crm.helpdesk:0
@@ -176,7 +178,7 @@ msgstr "Приоритет"
#. module: crm_helpdesk
#: field:crm.helpdesk,message_follower_ids:0
msgid "Followers"
-msgstr ""
+msgstr "Подписчики"
#. module: crm_helpdesk
#: view:crm.helpdesk:0
@@ -400,7 +402,7 @@ msgstr "В ожидании"
#: view:crm.helpdesk.report:0
#: field:crm.helpdesk.report,state:0
msgid "Status"
-msgstr ""
+msgstr "Статус"
#. module: crm_helpdesk
#: selection:crm.helpdesk.report,month:0
@@ -454,7 +456,7 @@ msgstr "Планируемая выручка"
#. module: crm_helpdesk
#: field:crm.helpdesk,message_is_follower:0
msgid "Is a Follower"
-msgstr ""
+msgstr "Подписан"
#. module: crm_helpdesk
#: field:crm.helpdesk.report,user_id:0
@@ -501,7 +503,7 @@ msgstr "Январь"
#. module: crm_helpdesk
#: field:crm.helpdesk,message_summary:0
msgid "Summary"
-msgstr ""
+msgstr "Итог"
#. module: crm_helpdesk
#: view:crm.helpdesk:0
@@ -517,7 +519,7 @@ msgstr "Прочее"
#. module: crm_helpdesk
#: view:crm.helpdesk.report:0
msgid "My Company"
-msgstr ""
+msgstr "Моя компания"
#. module: crm_helpdesk
#: view:crm.helpdesk:0
@@ -666,7 +668,7 @@ msgstr ""
#. module: crm_helpdesk
#: help:crm.helpdesk,message_ids:0
msgid "Messages and communication history"
-msgstr ""
+msgstr "Сообщения и история общения"
#. module: crm_helpdesk
#: model:ir.actions.act_window,help:crm_helpdesk.crm_helpdesk_categ_action
diff --git a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
index 6ce2c60093f..c1ffc00303d 100644
--- a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
+++ b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
@@ -56,7 +56,7 @@
User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.2.14) Gecko/20110223 Lightning/1.0b2 Thunderbird/3.1.8
MIME-Version: 1.0
-To: info@my.com
+To: _helpdesk@my.com
Subject: Where is download link of user manual of your product ?
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 8bit
diff --git a/addons/crm_partner_assign/i18n/ru.po b/addons/crm_partner_assign/i18n/ru.po
index f0a7ff509c9..53a2929be4e 100644
--- a/addons/crm_partner_assign/i18n/ru.po
+++ b/addons/crm_partner_assign/i18n/ru.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2011-03-23 13:46+0000\n"
+"PO-Revision-Date: 2013-05-30 14:10+0000\n"
"Last-Translator: Chertykov Denis \n"
"Language-Team: Russian \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-16 05:47+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-05-31 05:38+0000\n"
+"X-Generator: Launchpad (build 16660)\n"
#. module: crm_partner_assign
#: field:crm.lead.report.assign,delay_close:0
@@ -25,7 +25,7 @@ msgstr "Задержка закрытия"
#. module: crm_partner_assign
#: field:crm.lead.forward.to.partner,author_id:0
msgid "Author"
-msgstr ""
+msgstr "Автор"
#. module: crm_partner_assign
#: field:crm.lead.report.assign,planned_revenue:0
@@ -38,6 +38,9 @@ msgid ""
"Message type: email for email message, notification for system message, "
"comment for other messages such as user replies"
msgstr ""
+"Тип сообщения: эл. почта - для эл. почты, уведомление - для системных "
+"сообщений, комментарий - для остальных сообщений таких как сообщения "
+"пользователя"
#. module: crm_partner_assign
#: field:crm.lead.report.assign,nbr:0
@@ -53,7 +56,7 @@ msgstr "Группировать по ..."
#. module: crm_partner_assign
#: help:crm.lead.forward.to.partner,body:0
msgid "Automatically sanitized HTML contents"
-msgstr ""
+msgstr "Автоматически обработанное HTML содержимое"
#. module: crm_partner_assign
#: view:crm.lead:0
@@ -68,7 +71,7 @@ msgstr "Геолоцировать"
#. module: crm_partner_assign
#: field:crm.lead.forward.to.partner,starred:0
msgid "Starred"
-msgstr ""
+msgstr "Отмеченные"
#. module: crm_partner_assign
#: view:crm.lead.forward.to.partner:0
@@ -81,6 +84,8 @@ msgid ""
"Email address of the sender. This field is set when no matching partner is "
"found for incoming emails."
msgstr ""
+"Адрес эл. почты отправителя. Это поле устанавливается когда партнер не "
+"определен для входящих писем."
#. module: crm_partner_assign
#: view:crm.partner.report.assign:0
@@ -111,7 +116,7 @@ msgstr "Компания"
#. module: crm_partner_assign
#: field:crm.lead.forward.to.partner,notification_ids:0
msgid "Notifications"
-msgstr ""
+msgstr "Уведомления"
#. module: crm_partner_assign
#: field:crm.lead.report.assign,date_assign:0
@@ -123,7 +128,7 @@ msgstr "Дата партнера"
#: view:crm.partner.report.assign:0
#: view:res.partner:0
msgid "Salesperson"
-msgstr ""
+msgstr "Продавец"
#. module: crm_partner_assign
#: selection:crm.lead.report.assign,priority:0
@@ -170,12 +175,12 @@ msgstr "Географическое назначение"
#. module: crm_partner_assign
#: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
msgid "Email composition wizard"
-msgstr ""
+msgstr "Мастер составления эл. почты"
#. module: crm_partner_assign
#: field:crm.partner.report.assign,turnover:0
msgid "Turnover"
-msgstr ""
+msgstr "Оборот"
#. module: crm_partner_assign
#: field:crm.lead.report.assign,date_closed:0
@@ -199,7 +204,7 @@ msgstr ""
#. module: crm_partner_assign
#: selection:crm.lead.forward.to.partner,type:0
msgid "System notification"
-msgstr ""
+msgstr "Системное уведомление"
#. module: crm_partner_assign
#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
@@ -271,7 +276,7 @@ msgstr "Тип"
#. module: crm_partner_assign
#: selection:crm.lead.forward.to.partner,type:0
msgid "Email"
-msgstr ""
+msgstr "Эл. почта"
#. module: crm_partner_assign
#: help:crm.lead,partner_assigned_id:0
@@ -286,7 +291,7 @@ msgstr "Низший"
#. module: crm_partner_assign
#: view:crm.partner.report.assign:0
msgid "Date Invoice"
-msgstr ""
+msgstr "Дата счета"
#. module: crm_partner_assign
#: field:crm.lead.forward.to.partner,template_id:0
@@ -311,12 +316,12 @@ msgstr "Дата создания"
#. module: crm_partner_assign
#: model:ir.model,name:crm_partner_assign.model_res_partner_activation
msgid "res.partner.activation"
-msgstr ""
+msgstr "res.partner.activation"
#. module: crm_partner_assign
#: field:crm.lead.forward.to.partner,parent_id:0
msgid "Parent Message"
-msgstr ""
+msgstr "Родительское сообщение"
#. module: crm_partner_assign
#: field:crm.lead.forward.to.partner,res_id:0
@@ -358,12 +363,12 @@ msgstr "Этап"
#: view:crm.lead.report.assign:0
#: field:crm.lead.report.assign,state:0
msgid "Status"
-msgstr ""
+msgstr "Статус"
#. module: crm_partner_assign
#: field:crm.lead.forward.to.partner,to_read:0
msgid "To read"
-msgstr ""
+msgstr "Прочитать"
#. module: crm_partner_assign
#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
@@ -418,12 +423,12 @@ msgstr "Количество дней, для закрытия вопроса"
#: help:crm.lead.forward.to.partner,notified_partner_ids:0
msgid ""
"Partners that have a notification pushing this message in their mailboxes"
-msgstr ""
+msgstr "Партнеры которые имеют уведомление доставляемое в их почтовые ящики"
#. module: crm_partner_assign
#: selection:crm.lead.forward.to.partner,type:0
msgid "Comment"
-msgstr ""
+msgstr "Комментарий"
#. module: crm_partner_assign
#: field:res.partner,partner_weight:0
@@ -451,7 +456,7 @@ msgstr "Декабрь"
#. module: crm_partner_assign
#: help:crm.lead.forward.to.partner,vote_user_ids:0
msgid "Users that voted for this message"
-msgstr ""
+msgstr "Пользователи, которые проголосовали за это сообщение"
#. module: crm_partner_assign
#: view:crm.lead.report.assign:0
@@ -467,7 +472,7 @@ msgstr "Дата открытия"
#. module: crm_partner_assign
#: field:crm.lead.forward.to.partner,child_ids:0
msgid "Child Messages"
-msgstr ""
+msgstr "Связанные сообщения"
#. module: crm_partner_assign
#: field:crm.partner.report.assign,date_review:0
@@ -483,17 +488,17 @@ msgstr "Тема"
#. module: crm_partner_assign
#: view:crm.lead.forward.to.partner:0
msgid "or"
-msgstr ""
+msgstr "или"
#. module: crm_partner_assign
#: field:crm.lead.forward.to.partner,body:0
msgid "Contents"
-msgstr ""
+msgstr "Содержимое"
#. module: crm_partner_assign
#: field:crm.lead.forward.to.partner,vote_user_ids:0
msgid "Votes"
-msgstr ""
+msgstr "Голоса"
#. module: crm_partner_assign
#: view:crm.lead.report.assign:0
@@ -504,6 +509,8 @@ msgstr "# Предложений"
#: help:crm.lead.forward.to.partner,starred:0
msgid "Current user has a starred notification linked to this message"
msgstr ""
+"Текущий пользователь имеет отмеченное уведомление, связанное с этим "
+"сообщением"
#. module: crm_partner_assign
#: field:crm.partner.report.assign,date_partnership:0
@@ -561,7 +568,7 @@ msgstr "Август"
#. module: crm_partner_assign
#: help:crm.lead.forward.to.partner,record_name:0
msgid "Name get of the related document."
-msgstr ""
+msgstr "Название связанного документа."
#. module: crm_partner_assign
#: selection:crm.lead.report.assign,priority:0
@@ -684,7 +691,7 @@ msgstr "Вложения"
#. module: crm_partner_assign
#: field:crm.lead.forward.to.partner,record_name:0
msgid "Message Record Name"
-msgstr ""
+msgstr "Название записи сообщения"
#. module: crm_partner_assign
#: field:res.partner.activation,sequence:0
@@ -724,7 +731,7 @@ msgstr "Открыто"
#. module: crm_partner_assign
#: field:crm.lead.forward.to.partner,subtype_id:0
msgid "Subtype"
-msgstr ""
+msgstr "Подтип"
#. module: crm_partner_assign
#: field:res.partner,date_localization:0
@@ -739,12 +746,12 @@ msgstr "Текущий"
#. module: crm_partner_assign
#: model:ir.model,name:crm_partner_assign.model_crm_lead
msgid "Lead/Opportunity"
-msgstr ""
+msgstr "Кандидат/Предложение"
#. module: crm_partner_assign
#: field:crm.lead.forward.to.partner,notified_partner_ids:0
msgid "Notified partners"
-msgstr ""
+msgstr "Уведомленные партнеры"
#. module: crm_partner_assign
#: view:crm.lead.forward.to.partner:0
@@ -775,7 +782,7 @@ msgstr "Вероятная выручка"
#: field:res.partner,activation:0
#: view:res.partner.activation:0
msgid "Activation"
-msgstr ""
+msgstr "Активация"
#. module: crm_partner_assign
#: view:crm.lead:0
@@ -792,6 +799,8 @@ msgstr ""
#: help:crm.lead.forward.to.partner,to_read:0
msgid "Current user has an unread notification linked to this message"
msgstr ""
+"Текущий пользователь имеет непрочитанные уведомления, связанные с этим "
+"сообщением"
#. module: crm_partner_assign
#: selection:crm.lead.report.assign,type:0
@@ -860,6 +869,8 @@ msgid ""
"Technical field holding the message notifications. Use notified_partner_ids "
"to access notified partners."
msgstr ""
+"Техническое поле, содержащее уведомления. Используйте notified_partner_ids "
+"для доступа к оповещаемым партнерам."
#. module: crm_partner_assign
#: view:crm.partner.report.assign:0
@@ -874,12 +885,12 @@ msgstr "CRM - отчет по кандидатам"
#. module: crm_partner_assign
#: field:crm.lead.forward.to.partner,composition_mode:0
msgid "Composition mode"
-msgstr ""
+msgstr "Режим составления"
#. module: crm_partner_assign
#: field:crm.lead.forward.to.partner,model:0
msgid "Related Document Model"
-msgstr ""
+msgstr "Модель связанного документа"
#. module: crm_partner_assign
#: selection:crm.lead.forward.to.partner,history_mode:0
@@ -892,6 +903,8 @@ msgid ""
"Author of the message. If not set, email_from may hold an email address that "
"did not match any partner."
msgstr ""
+"Автор сообщения. Если не установлен, email_from может содержать адрес почты, "
+"который не соответствует ни одному партнеру."
#. module: crm_partner_assign
#: model:ir.model,name:crm_partner_assign.model_crm_partner_report_assign
@@ -906,12 +919,12 @@ msgstr "Высокий"
#. module: crm_partner_assign
#: field:crm.lead.forward.to.partner,partner_ids:0
msgid "Additional contacts"
-msgstr ""
+msgstr "Дополнительные контакты"
#. module: crm_partner_assign
#: help:crm.lead.forward.to.partner,parent_id:0
msgid "Initial thread message."
-msgstr ""
+msgstr "Первое сообщение цепочки."
#. module: crm_partner_assign
#: field:crm.lead.report.assign,create_date:0
diff --git a/addons/crm_partner_assign/wizard/crm_forward_to_partner.py b/addons/crm_partner_assign/wizard/crm_forward_to_partner.py
index 91d462de015..724102a84b1 100644
--- a/addons/crm_partner_assign/wizard/crm_forward_to_partner.py
+++ b/addons/crm_partner_assign/wizard/crm_forward_to_partner.py
@@ -105,10 +105,17 @@ class crm_lead_forward_to_partner(osv.TransientModel):
""" Forward the lead to a partner """
if context is None:
context = {}
+ # TDE FIX in 7.0: force mass_mailing mode; this way, the message will be
+ # send only to partners; default subtype of mass_mailing is indeed False
+ # Chatter will show 'logged a note', but partner_ids (aka, the assigned partner)
+ # will effectively receive the message if present in the composition window
+ self.write(cr, uid, ids, {'composition_mode': 'mass_mail'}, context=context)
res = {'type': 'ir.actions.act_window_close'}
wizard = self.browse(cr, uid, ids[0], context=context)
if wizard.model not in ('crm.lead'):
return res
+ if context.get('active_ids') is None:
+ context['active_ids'] = [wizard.res_id]
lead = self.pool[wizard.model]
lead_ids = wizard.res_id and [wizard.res_id] or []
@@ -116,6 +123,8 @@ class crm_lead_forward_to_partner(osv.TransientModel):
if wizard.composition_mode == 'mass_mail':
lead_ids = context and context.get('active_ids', []) or []
value = self.default_get(cr, uid, ['body', 'email_to', 'email_cc', 'subject', 'history_mode'], context=context)
+ value.pop('composition_mode')
+ self.pool.get('crm.lead').message_subscribe(cr, uid, lead_ids, [partner.id for partner in wizard.partner_ids], context=context)
self.write(cr, uid, ids, value, context=context)
return self.send_mail(cr, uid, ids, context=context)
diff --git a/addons/crm_profiling/i18n/ru.po b/addons/crm_profiling/i18n/ru.po
index 8cbe1695e82..a7325d894c5 100644
--- a/addons/crm_profiling/i18n/ru.po
+++ b/addons/crm_profiling/i18n/ru.po
@@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-05-10 17:51+0000\n"
+"PO-Revision-Date: 2013-05-30 14:05+0000\n"
"Last-Translator: Chertykov Denis \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-16 05:32+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-05-31 05:38+0000\n"
+"X-Generator: Launchpad (build 16660)\n"
#. module: crm_profiling
#: view:crm_profiling.questionnaire:0
@@ -151,7 +151,7 @@ msgstr "Используйте правила профилирования"
#. module: crm_profiling
#: constraint:crm.segmentation:0
msgid "Error ! You cannot create recursive profiles."
-msgstr ""
+msgstr "Ошибка ! Нельзя создать рекурсивный профиль."
#. module: crm_profiling
#: field:crm.segmentation,answer_yes:0
@@ -200,7 +200,7 @@ msgstr "Сохранить данные"
#. module: crm_profiling
#: view:open.questionnaire:0
msgid "or"
-msgstr ""
+msgstr "или"
#~ msgid ""
#~ "The Object name must start with x_ and not contain any special character !"
diff --git a/addons/document/odt2txt.py b/addons/document/odt2txt.py
old mode 100644
new mode 100755
diff --git a/addons/document_page/document_page_view.xml b/addons/document_page/document_page_view.xml
index 08c77647d17..4d0b5596e75 100644
--- a/addons/document_page/document_page_view.xml
+++ b/addons/document_page/document_page_view.xml
@@ -26,6 +26,7 @@
diff --git a/addons/document_webdav/__openerp__.py b/addons/document_webdav/__openerp__.py
index ec112ec7c38..befb87829ed 100644
--- a/addons/document_webdav/__openerp__.py
+++ b/addons/document_webdav/__openerp__.py
@@ -24,7 +24,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#
##############################################################################
diff --git a/addons/document_webdav/test_davclient.py b/addons/document_webdav/test_davclient.py
index 058dc1c748d..f3a8b35b582 100644
--- a/addons/document_webdav/test_davclient.py
+++ b/addons/document_webdav/test_davclient.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
# -*- encoding: utf-8 -*-
#
# Copyright P. Christeas 2008,2009
@@ -24,7 +23,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
###############################################################################
""" A trivial HTTP/WebDAV client, used for testing the server
diff --git a/addons/document_webdav/webdav_server.py b/addons/document_webdav/webdav_server.py
index f67de272e29..e495f5c9f2f 100644
--- a/addons/document_webdav/webdav_server.py
+++ b/addons/document_webdav/webdav_server.py
@@ -30,7 +30,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
###############################################################################
diff --git a/addons/document_webdav/webdav_setup.xml b/addons/document_webdav/webdav_setup.xml
index d75c416a93e..dbf6bc8fbcc 100644
--- a/addons/document_webdav/webdav_setup.xml
+++ b/addons/document_webdav/webdav_setup.xml
@@ -1,4 +1,3 @@
-
+
+ Case Sections - Search
+ crm.case.section
+
+
+
+
+
+
+
+
@@ -128,6 +142,7 @@
crm.case.section
form
kanban,tree,form
+ {'search_default_personal': True}
- Sales
- Sales
+ Direct Sales
+ DM
True
+ info
diff --git a/addons/crm/crm_demo.xml b/addons/crm/crm_demo.xml
index 203193dc3bc..2858250e86a 100644
--- a/addons/crm/crm_demo.xml
+++ b/addons/crm/crm_demo.xml
@@ -7,27 +7,13 @@
- Sales Marketing Department
- SMD
- Indirect Sales
+ IM
- Support Department
+ Marketing
SPD
-
-
-
- Direct Marketing
- DM
-
-
-
- Online Support
- OS
-
diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 61e8c75cea8..b8673e73927 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
@@ -76,12 +77,12 @@ class crm_lead(base_stage, format_address, osv.osv):
_track = {
'state': {
- 'crm.mt_lead_create': lambda self, cr, uid, obj, ctx=None: obj['state'] == 'new',
+ 'crm.mt_lead_create': lambda self, cr, uid, obj, ctx=None: obj['state'] in ['new', 'draft'],
'crm.mt_lead_won': lambda self, cr, uid, obj, ctx=None: obj['state'] == 'done',
'crm.mt_lead_lost': lambda self, cr, uid, obj, ctx=None: obj['state'] == 'cancel',
},
'stage_id': {
- 'crm.mt_lead_stage': lambda self, cr, uid, obj, ctx=None: obj['state'] not in ['new', 'cancel', 'done'],
+ 'crm.mt_lead_stage': lambda self, cr, uid, obj, ctx=None: obj['state'] not in ['new', 'draft', 'cancel', 'done'],
},
}
@@ -102,7 +103,9 @@ class crm_lead(base_stage, format_address, osv.osv):
if vals.get('type'):
ctx['default_type'] = vals['type']
vals['stage_id'] = self._get_default_stage_id(cr, uid, context=ctx)
- return super(crm_lead, self).create(cr, uid, vals, context=context)
+ # context: no_log, because subtype already handle this
+ create_context = dict(context, mail_create_nolog=True)
+ return super(crm_lead, self).create(cr, uid, vals, context=create_context)
def _get_default_section_id(self, cr, uid, context=None):
""" Gives default section by checking if present in the context """
@@ -274,7 +277,7 @@ class crm_lead(base_stage, format_address, osv.osv):
'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority', select=True),
'date_closed': fields.datetime('Closed', readonly=True),
'stage_id': fields.many2one('crm.case.stage', 'Stage', track_visibility='onchange',
- domain="['&', '&', ('fold', '=', False), ('section_ids', '=', section_id), '|', ('type', '=', type), ('type', '=', 'both')]"),
+ domain="['&', ('section_ids', '=', section_id), '|', ('type', '=', type), ('type', '=', 'both')]"),
'user_id': fields.many2one('res.users', 'Salesperson', select=True, track_visibility='onchange'),
'referred': fields.char('Referred By', size=64),
'date_open': fields.datetime('Opened', readonly=True),
@@ -366,8 +369,8 @@ class crm_lead(base_stage, format_address, osv.osv):
def on_change_user(self, cr, uid, ids, user_id, context=None):
""" When changing the user, also set a section_id or restrict section id
to the ones user_id is member of. """
- section_id = False
- if user_id:
+ section_id = self._get_default_section_id(cr, uid, context=context) or False
+ if user_id and not section_id:
section_ids = self.pool.get('crm.case.section').search(cr, uid, ['|', ('user_id', '=', user_id), ('member_ids', '=', user_id)], context=context)
if section_ids:
section_id = section_ids[0]
@@ -677,8 +680,9 @@ class crm_lead(base_stage, format_address, osv.osv):
merged_data['stage_id'] = section_stage_ids and section_stage_ids[0] or False
# Write merged data into first opportunity
self.write(cr, uid, [highest.id], merged_data, context=context)
- # Delete tail opportunities
- self.unlink(cr, uid, [x.id for x in tail_opportunities], context=context)
+ # Delete tail opportunities
+ # We use the SUPERUSER to avoid access rights issues because as the user had the rights to see the records it should be safe to do so
+ self.unlink(cr, SUPERUSER_ID, [x.id for x in tail_opportunities], context=context)
return highest.id
@@ -980,15 +984,28 @@ class crm_lead(base_stage, format_address, osv.osv):
def message_get_reply_to(self, cr, uid, ids, context=None):
""" Override to get the reply_to of the parent project. """
return [lead.section_id.message_get_reply_to()[0] if lead.section_id else False
- for lead in self.browse(cr, uid, ids, context=context)]
+ for lead in self.browse(cr, SUPERUSER_ID, ids, context=context)]
+
+ def _get_formview_action(self, cr, uid, id, context=None):
+ action = super(crm_lead, self)._get_formview_action(cr, uid, id, context=context)
+ obj = self.browse(cr, uid, id, context=context)
+ if obj.type == 'opportunity':
+ model, view_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'crm', 'crm_case_form_view_oppor')
+ action.update({
+ 'views': [(view_id, 'form')],
+ })
+ return action
def message_get_suggested_recipients(self, cr, uid, ids, context=None):
recipients = super(crm_lead, self).message_get_suggested_recipients(cr, uid, ids, context=context)
- for lead in self.browse(cr, uid, ids, context=context):
- if lead.partner_id:
- self._message_add_suggested_recipient(cr, uid, recipients, lead, partner=lead.partner_id, reason=_('Customer'))
- elif lead.email_from:
- self._message_add_suggested_recipient(cr, uid, recipients, lead, email=lead.email_from, reason=_('Customer Email'))
+ try:
+ for lead in self.browse(cr, uid, ids, context=context):
+ if lead.partner_id:
+ self._message_add_suggested_recipient(cr, uid, recipients, lead, partner=lead.partner_id, reason=_('Customer'))
+ elif lead.email_from:
+ self._message_add_suggested_recipient(cr, uid, recipients, lead, email=lead.email_from, reason=_('Customer Email'))
+ except (osv.except_osv, orm.except_orm): # no read access rights -> just ignore suggested recipients because this imply modifying followers
+ pass
return recipients
def message_new(self, cr, uid, msg, custom_values=None, context=None):
diff --git a/addons/crm/crm_lead_demo.xml b/addons/crm/crm_lead_demo.xml
index 21d60ad2961..e7e6beae33e 100644
--- a/addons/crm/crm_lead_demo.xml
+++ b/addons/crm/crm_lead_demo.xml
@@ -20,7 +20,7 @@
1
- Hello,
@@ -44,7 +44,7 @@ Can you send me the details ?
4
- 2
- 3
- 3
- 5
-
+
+
lead
@@ -211,7 +214,7 @@ Contact: +1 813 494 5005
2
- Hi,
@@ -235,7 +238,7 @@ Andrew
3
- Meeting for pricing information.
- Send Catalogue by Email
-
opportunity
Plan to buy RedHat servers
- 69 rue de Chimay
Call to ask system requirement
-
@@ -367,6 +371,7 @@ Andrew
@@ -388,10 +393,11 @@ Andrew
Send price list regarding our interventions
-
@@ -412,7 +418,7 @@ Andrew
Call to define real needs about training
- Ask for the good receprion of the proposition
@@ -468,10 +475,11 @@ Andrew
3
-
@@ -486,7 +494,7 @@ Andrew
3
- 5
opportunity
Need 20 Days of Consultancy
- info@mycompany.net
@@ -544,7 +554,7 @@ Andrew
2
Conf call with technical service
- Send Catalogue by Email
-
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 8c22a0a2e1c..6ddd06c1c90 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -157,7 +157,8 @@
@@ -556,7 +557,7 @@
-
@@ -608,5 +609,22 @@
+
+ Mark As Lost
+ code
+
+ if context.get('active_model') == 'crm.lead' and context.get('active_ids'):
+ self.case_cancel(cr, uid, context['active_ids'], context=context)
+
+
+
+
+ Mark As Lost
+
+
diff --git a/addons/crm/crm_phonecall_demo.xml b/addons/crm/crm_phonecall_demo.xml
index f441c29a7e6..4002e18815e 100644
--- a/addons/crm/crm_phonecall_demo.xml
+++ b/addons/crm/crm_phonecall_demo.xml
@@ -37,7 +37,7 @@
Ask for convenient time of meeting
open
+1 786 525 0724
- done
(077) 582-4035
(077) 341-3591
- Proposal for discount offer
open
+34 230 953 485
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/crm/i18n/ru.po b/addons/crm/i18n/ru.po
index 19ae76e9f46..ec2a9f35ee5 100644
--- a/addons/crm/i18n/ru.po
+++ b/addons/crm/i18n/ru.po
@@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-12-21 17:04+0000\n"
-"PO-Revision-Date: 2013-03-01 11:27+0000\n"
-"Last-Translator: Антон Лаврёнов \n"
+"PO-Revision-Date: 2013-05-30 13:52+0000\n"
+"Last-Translator: Chertykov Denis \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-16 05:09+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-05-31 05:38+0000\n"
+"X-Generator: Launchpad (build 16660)\n"
#. module: crm
#: view:crm.lead.report:0
@@ -452,7 +452,7 @@ msgstr "# Предложений"
#, python-format
msgid ""
"Please select more than one element (lead or opportunity) from the list view."
-msgstr ""
+msgstr "Пожалуйста, выберите хотя бы один элемент из списка ниже."
#. module: crm
#: view:crm.lead:0
@@ -1108,7 +1108,7 @@ msgstr "Удалить"
#. module: crm
#: model:mail.message.subtype,description:crm.mt_lead_create
msgid "Opportunity created"
-msgstr ""
+msgstr "Предложение создано"
#. module: crm
#: view:crm.lead:0
@@ -1397,7 +1397,7 @@ msgstr "Сделать"
#. module: crm
#: model:mail.message.subtype,description:crm.mt_lead_lost
msgid "Opportunity lost"
-msgstr ""
+msgstr "Предложение отклонено"
#. module: crm
#: field:crm.lead2opportunity.partner,action:0
@@ -1446,7 +1446,7 @@ msgstr "Пользователи"
#. module: crm
#: model:mail.message.subtype,name:crm.mt_lead_stage
msgid "Stage Changed"
-msgstr ""
+msgstr "Стадия изменена"
#. module: crm
#: field:crm.case.stage,section_ids:0
@@ -1759,7 +1759,7 @@ msgstr "Способ оплаты"
#. module: crm
#: model:ir.model,name:crm.model_crm_lead2opportunity_partner_mass
msgid "Mass Lead To Opportunity Partner"
-msgstr "Массовое проведение предложений партнёру"
+msgstr "Массовое преобразование кандидатов в предложения"
#. module: crm
#: view:sale.config.settings:0
@@ -1917,7 +1917,7 @@ msgstr "Сделать"
#: model:mail.message.subtype,name:crm.mt_lead_convert_to_opportunity
#: model:mail.message.subtype,name:crm.mt_salesteam_lead_opportunity
msgid "Lead to Opportunity"
-msgstr ""
+msgstr "Кандидат в предложение"
#. module: crm
#: field:crm.lead,user_email:0
@@ -2126,7 +2126,7 @@ msgstr ""
#. module: crm
#: view:crm.lead:0
msgid "Address"
-msgstr ""
+msgstr "Адрес"
#. module: crm
#: help:crm.case.section,alias_id:0
@@ -2134,6 +2134,8 @@ msgid ""
"The email address associated with this team. New emails received will "
"automatically create new leads assigned to the team."
msgstr ""
+"Адрес эл. почты связанный с этой командой. Новая полученная эл. почта будет "
+"автоматически создавать новые кандидаты связанные с командой."
#. module: crm
#: view:crm.lead:0
@@ -2192,7 +2194,7 @@ msgstr "Продолжение процесса"
#: selection:crm.lead2opportunity.partner.mass,name:0
#: model:ir.actions.act_window,name:crm.action_crm_lead2opportunity_partner
msgid "Convert to opportunity"
-msgstr "Преобразовать в возможность"
+msgstr "Преобразовать в предложение"
#. module: crm
#: field:crm.opportunity2phonecall,user_id:0
@@ -2234,6 +2236,8 @@ msgid ""
"This stage is not visible, for example in status bar or kanban view, when "
"there are no records in that stage to display."
msgstr ""
+"Эта стадия не видима, например в статус-баре или виде канбан, когда нет "
+"записей этой стадии для отображения."
#. module: crm
#: field:crm.lead.report,nbr:0
@@ -2249,7 +2253,7 @@ msgstr "Отдел продаж, которому принадлежит воп
#. module: crm
#: model:crm.case.resource.type,name:crm.type_lead6
msgid "Banner Ads"
-msgstr ""
+msgstr "Баннер"
#. module: crm
#: field:crm.merge.opportunity,opportunity_ids:0
@@ -2279,7 +2283,7 @@ msgstr "Выполняется"
#. module: crm
#: model:mail.message.subtype,description:crm.mt_lead_convert_to_opportunity
msgid "Lead converted into an opportunity"
-msgstr ""
+msgstr "Кандидат превращенный в предложение"
#. module: crm
#: view:crm.lead:0
@@ -2289,7 +2293,7 @@ msgstr "Нераспределенные кандидаты"
#. module: crm
#: model:mail.message.subtype,description:crm.mt_lead_won
msgid "Opportunity won"
-msgstr ""
+msgstr "Предложение принято"
#. module: crm
#: field:crm.case.categ,object_id:0
@@ -2364,7 +2368,7 @@ msgstr ""
#. module: crm
#: field:crm.case.stage,state:0
msgid "Related Status"
-msgstr ""
+msgstr "Связанный статус"
#. module: crm
#: field:crm.phonecall,name:0
@@ -2410,7 +2414,7 @@ msgstr "Подтвердить"
#. module: crm
#: view:crm.lead:0
msgid "Unread messages"
-msgstr ""
+msgstr "Непрочитанные сообщения"
#. module: crm
#: field:crm.phonecall.report,section_id:0
@@ -2501,7 +2505,7 @@ msgstr "Создание предложений из кандидатов"
#. module: crm
#: model:crm.case.resource.type,name:crm.type_lead3
msgid "Email Campaign - Products"
-msgstr ""
+msgstr "Кампания эл. почты - Продукция"
#. module: crm
#: model:ir.actions.act_window,help:crm.crm_case_categ_phone_incoming0
@@ -2578,7 +2582,7 @@ msgstr "Август"
#: model:mail.message.subtype,name:crm.mt_lead_lost
#: model:mail.message.subtype,name:crm.mt_salesteam_lead_lost
msgid "Opportunity Lost"
-msgstr ""
+msgstr "Предложение отклонено"
#. module: crm
#: field:crm.lead.report,deadline_month:0
@@ -2644,7 +2648,7 @@ msgstr "Сотрудники отдела"
#: view:crm.opportunity2phonecall:0
#: view:crm.phonecall2phonecall:0
msgid "Schedule/Log a Call"
-msgstr ""
+msgstr "Запланировать/Описать звонок"
#. module: crm
#: field:crm.lead,planned_cost:0
@@ -2654,7 +2658,7 @@ msgstr "Планируемые затраты"
#. module: crm
#: help:crm.lead,date_deadline:0
msgid "Estimate of the date on which the opportunity will be won."
-msgstr ""
+msgstr "Оценка даты на которую это предложение будет принято."
#. module: crm
#: help:crm.lead,email_cc:0
@@ -2676,7 +2680,7 @@ msgstr "Описанные звонки"
#: model:mail.message.subtype,name:crm.mt_lead_won
#: model:mail.message.subtype,name:crm.mt_salesteam_lead_won
msgid "Opportunity Won"
-msgstr ""
+msgstr "Предложение принято"
#. module: crm
#: model:ir.actions.act_window,name:crm.crm_case_section_act_tree
@@ -2895,7 +2899,7 @@ msgstr ""
#. module: crm
#: view:crm.lead:0
msgid "Internal Notes"
-msgstr ""
+msgstr "Внутренние заметки"
#. module: crm
#: view:crm.lead:0
@@ -2960,6 +2964,7 @@ msgstr "Проиграно"
#, python-format
msgid "Closed/Cancelled leads cannot be converted into opportunities."
msgstr ""
+"Закрытые/Отмененные кандидаты не могут быть конвертированы в возможности."
#. module: crm
#: view:crm.lead:0
@@ -3050,7 +3055,7 @@ msgstr "Рассылка"
#. module: crm
#: model:mail.message.subtype,name:crm.mt_salesteam_lead_stage
msgid "Opportunity Stage Changed"
-msgstr ""
+msgstr "Этап предложения изменен"
#. module: crm
#: model:ir.actions.act_window,help:crm.crm_lead_stage_act
diff --git a/addons/crm/process/crm_configuration_process.xml b/addons/crm/process/crm_configuration_process.xml
index c56bb8935d9..882c9680268 100644
--- a/addons/crm/process/crm_configuration_process.xml
+++ b/addons/crm/process/crm_configuration_process.xml
@@ -60,24 +60,24 @@
diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml
index 759063b3c1d..09853c6379e 100644
--- a/addons/crm/report/crm_lead_report_view.xml
+++ b/addons/crm/report/crm_lead_report_view.xml
@@ -75,7 +75,7 @@
-
í
-
-
@@ -121,6 +114,27 @@
+
+
+
- %%
+
+ %%
-
@@ -149,9 +164,9 @@
+
+
+
+ Customer Relationship Management
+Boost sales productivity, improve win rates, grow revenue
+
+
+
+
+ 
+
+
+
+
+
+
+
+
+ +Manage your sales funnel with no effort. Attract leads, follow-up on phone calls and meetings. Analyse the quality of your leads to make informed decisions and save time by integrating emails directly into the application. +
+ +
+
+Your Sales Funnel, The Way You Like It
+
+
+ +Track your opportunities pipeline with the revolutionary kanban view. Work inside your sales funnel and get instant visual information about next actions, new messages, top opportunities and expected revenues. +
+
+
+
+ 
+
+
+
+
+Social Network Integration
+
+
+
+ 
+
+
+
+
+ +Bring social intelligence to your sales process. Gain insights from social media site LinkedIn to find prospects easily and load their data automatically into your address book. +
+
+
+Lead Management Made Easy
+
+
+ +Create leads automatically from incoming emails. Analyse leads efficiency and compare performance by campaigns, channels or sales team. +
++Find duplicates, merge leads and assign them to the right salesperson in one operation. Spend less time on administration and more time on qualifying leads. +
+
+
+
+ 
+
+
+
+
+Organize Your Opportunities
+A clean user interface with everything in one screen
+
+
+
+ 
+
+
+
+
+ +Get your opportunities organized to stay focused on the best deals. Manage all your customer interactions from the opportunity like emails, phone calls, internal notes, meetings and quotations. +
+Follow opportunities that interrests you to get notified upon specific events: deal won or lost, stage changed, new customer demand, etc. +
+
+
+Email Integration and Automation
+
+
+ +Work with the email applications you already use every day. Whether your company uses Microsoft Outlook or Gmail, no one needs to change the way they work, so everyone stays productive. +
+Route, sort and filter incoming emails automatically. OpenERP CRM handles incoming emails and route them to the right opportunities or sales team. New leads are created on the fly and interested salespersons are notified automatically. +
+
+
+
+ 
+
+
+
+
+Collaborative Agenda
+
+
+
+ 
+
+
+
+
+ +Schedule your meetings and phone calls using the integrated calendar. You can see your agenda and your colleagues' in one view. As a manager, it's easy to see what your team is busy with. +
+
+
+Lead Automation and Marketing Campaigns
+Drive performance by automating tasks
+
+
+ + Use our marketing campaigns to automate lead acquisition, follow ups and promotions. Define automated actions (e.g. ask a salesperson to call, send an email, ...) based on triggers (no activity since 20 days, answered a promotional email, etc.) +
+ Optimize campaigns from lead to close, on every channel. Make smarter decisions about where to invest and show the impact of your marketing activities on your company's bottom line. +
+
+
+
+ 
+
+
+
+
+Customize Your Sales Cycle
+It Fits Your Sales Approach
++Customize your sales cycle by configuring sales stages that perfectly fit your sales approach. Control statistics to get accurate forecasts to improve your sales performance at every stage of your customer relationship. +
+
+ 
+ 
+ 
+ 
+
+
+
+
+
+
+
+Reporting and Dashboards
+Get access to the right information to take smart decisions
+
+
+
+
+
+
+
+
+ +Get the insights you need to make smarter decisions. Design custom dashboards to get a picture of your business at a glance. Dig deeper with real-time reports that anyone can create and share. +
+
+
+Drive Engagement with Gamification
+Leverage sales' natural desire for competition
++ Reinforce good habits and improve win rates with real-time recognition and rewards inspired by game mechanics. Align sales teams around clear business objectives with challenges, personal objectives and team leader boards. +
+
+
+ Leaderboards
+
+ 
+
+
+ + Promote leaders and competition amongst sales team with performance ratios. +
+
+
+ Personnal Objectives
+
+ 
+
+
+ + Assign clear goals to users to align them with the company objectives. +
+
+
+ Team Targets
+
+ 
+
+
+ + Compare revenues with forecasts and budgets in real time. +
+
+
+
+
+ Many companies already enjoy it
+Hear what they have to say !
+
+
+
+ 
+
+
+ + With OpenERP CRM I keep all the information about leads and customers + in a single place, and share it with my colleagues. It's great and effective. ++ +
+
+ Sales manager at CQ Creativi Quadrati.
+
+
+
+
+ 
+ Sparkline: 1,4,6,6,8,5,3,5
+* $('.sparkline').sparkline(); +* There must be no spaces in the enclosed data set +* +* Otherwise values must be an array of numbers or null values +*Sparkline: This text replaced if the browser is compatible
+* $('#sparkline1').sparkline([1,4,6,6,8,5,3,5]) +* $('#sparkline2').sparkline([1,4,6,null,null,5,3,5]) +* +* Values can also be specified in an HTML comment, or as a values attribute: +*Sparkline:
+*Sparkline:
+* $('.sparkline').sparkline(); +* +* For line charts, x values can also be specified: +*Sparkline: 1:1,2.7:4,3.4:6,5:6,6:8,8.7:5,9:3,10:5
+* $('#sparkline1').sparkline([ [1,1], [2.7,4], [3.4,6], [5,6], [6,8], [8.7,5], [9,3], [10,5] ]) +* +* By default, options should be passed in as teh second argument to the sparkline function: +* $('.sparkline').sparkline([1,2,3,4], {type: 'bar'}) +* +* Options can also be set by passing them on the tag itself. This feature is disabled by default though +* as there's a slight performance overhead: +* $('.sparkline').sparkline([1,2,3,4], {enableTagOptions: true}) +*Sparkline: loading
+* Prefix all options supplied as tag attribute with "spark" (configurable by setting tagOptionPrefix) +* +* Supported options: +* lineColor - Color of the line used for the chart +* fillColor - Color used to fill in the chart - Set to '' or false for a transparent chart +* width - Width of the chart - Defaults to 3 times the number of values in pixels +* height - Height of the chart - Defaults to the height of the containing element +* chartRangeMin - Specify the minimum value to use for the Y range of the chart - Defaults to the minimum value supplied +* chartRangeMax - Specify the maximum value to use for the Y range of the chart - Defaults to the maximum value supplied +* chartRangeClip - Clip out of range values to the max/min specified by chartRangeMin and chartRangeMax +* chartRangeMinX - Specify the minimum value to use for the X range of the chart - Defaults to the minimum value supplied +* chartRangeMaxX - Specify the maximum value to use for the X range of the chart - Defaults to the maximum value supplied +* composite - If true then don't erase any existing chart attached to the tag, but draw +* another chart over the top - Note that width and height are ignored if an +* existing chart is detected. +* tagValuesAttribute - Name of tag attribute to check for data values - Defaults to 'values' +* enableTagOptions - Whether to check tags for sparkline options +* tagOptionPrefix - Prefix used for options supplied as tag attributes - Defaults to 'spark' +* disableHiddenCheck - If set to true, then the plugin will assume that charts will never be drawn into a +* hidden dom element, avoding a browser reflow +* disableInteraction - If set to true then all mouseover/click interaction behaviour will be disabled, +* making the plugin perform much like it did in 1.x +* disableTooltips - If set to true then tooltips will be disabled - Defaults to false (tooltips enabled) +* disableHighlight - If set to true then highlighting of selected chart elements on mouseover will be disabled +* defaults to false (highlights enabled) +* highlightLighten - Factor to lighten/darken highlighted chart values by - Defaults to 1.4 for a 40% increase +* tooltipContainer - Specify which DOM element the tooltip should be rendered into - defaults to document.body +* tooltipClassname - Optional CSS classname to apply to tooltips - If not specified then a default style will be applied +* tooltipOffsetX - How many pixels away from the mouse pointer to render the tooltip on the X axis +* tooltipOffsetY - How many pixels away from the mouse pointer to render the tooltip on the r axis +* tooltipFormatter - Optional callback that allows you to override the HTML displayed in the tooltip +* callback is given arguments of (sparkline, options, fields) +* tooltipChartTitle - If specified then the tooltip uses the string specified by this setting as a title +* tooltipFormat - A format string or SPFormat object (or an array thereof for multiple entries) +* to control the format of the tooltip +* tooltipPrefix - A string to prepend to each field displayed in a tooltip +* tooltipSuffix - A string to append to each field displayed in a tooltip +* tooltipSkipNull - If true then null values will not have a tooltip displayed (defaults to true) +* tooltipValueLookups - An object or range map to map field values to tooltip strings +* (eg. to map -1 to "Lost", 0 to "Draw", and 1 to "Win") +* numberFormatter - Optional callback for formatting numbers in tooltips +* numberDigitGroupSep - Character to use for group separator in numbers "1,234" - Defaults to "," +* numberDecimalMark - Character to use for the decimal point when formatting numbers - Defaults to "." +* numberDigitGroupCount - Number of digits between group separator - Defaults to 3 +* +* There are 7 types of sparkline, selected by supplying a "type" option of 'line' (default), +* 'bar', 'tristate', 'bullet', 'discrete', 'pie' or 'box' +* line - Line chart. Options: +* spotColor - Set to '' to not end each line in a circular spot +* minSpotColor - If set, color of spot at minimum value +* maxSpotColor - If set, color of spot at maximum value +* spotRadius - Radius in pixels +* lineWidth - Width of line in pixels +* normalRangeMin +* normalRangeMax - If set draws a filled horizontal bar between these two values marking the "normal" +* or expected range of values +* normalRangeColor - Color to use for the above bar +* drawNormalOnTop - Draw the normal range above the chart fill color if true +* defaultPixelsPerValue - Defaults to 3 pixels of width for each value in the chart +* highlightSpotColor - The color to use for drawing a highlight spot on mouseover - Set to null to disable +* highlightLineColor - The color to use for drawing a highlight line on mouseover - Set to null to disable +* valueSpots - Specify which points to draw spots on, and in which color. Accepts a range map +* +* bar - Bar chart. Options: +* barColor - Color of bars for postive values +* negBarColor - Color of bars for negative values +* zeroColor - Color of bars with zero values +* nullColor - Color of bars with null values - Defaults to omitting the bar entirely +* barWidth - Width of bars in pixels +* colorMap - Optional mappnig of values to colors to override the *BarColor values above +* can be an Array of values to control the color of individual bars or a range map +* to specify colors for individual ranges of values +* barSpacing - Gap between bars in pixels +* zeroAxis - Centers the y-axis around zero if true +* +* tristate - Charts values of win (>0), lose (<0) or draw (=0) +* posBarColor - Color of win values +* negBarColor - Color of lose values +* zeroBarColor - Color of draw values +* barWidth - Width of bars in pixels +* barSpacing - Gap between bars in pixels +* colorMap - Optional mappnig of values to colors to override the *BarColor values above +* can be an Array of values to control the color of individual bars or a range map +* to specify colors for individual ranges of values +* +* discrete - Options: +* lineHeight - Height of each line in pixels - Defaults to 30% of the graph height +* thesholdValue - Values less than this value will be drawn using thresholdColor instead of lineColor +* thresholdColor +* +* bullet - Values for bullet graphs msut be in the order: target, performance, range1, range2, range3, ... +* options: +* targetColor - The color of the vertical target marker +* targetWidth - The width of the target marker in pixels +* performanceColor - The color of the performance measure horizontal bar +* rangeColors - Colors to use for each qualitative range background color +* +* pie - Pie chart. Options: +* sliceColors - An array of colors to use for pie slices +* offset - Angle in degrees to offset the first slice - Try -90 or +90 +* borderWidth - Width of border to draw around the pie chart, in pixels - Defaults to 0 (no border) +* borderColor - Color to use for the pie chart border - Defaults to #000 +* +* box - Box plot. Options: +* raw - Set to true to supply pre-computed plot points as values +* values should be: low_outlier, low_whisker, q1, median, q3, high_whisker, high_outlier +* When set to false you can supply any number of values and the box plot will +* be computed for you. Default is false. +* showOutliers - Set to true (default) to display outliers as circles +* outlierIQR - Interquartile range used to determine outliers. Default 1.5 +* boxLineColor - Outline color of the box +* boxFillColor - Fill color for the box +* whiskerColor - Line color used for whiskers +* outlierLineColor - Outline color of outlier circles +* outlierFillColor - Fill color of the outlier circles +* spotRadius - Radius of outlier circles +* medianColor - Line color of the median line +* target - Draw a target cross hair at the supplied value (default undefined) +* +* +* +* Examples: +* $('#sparkline1').sparkline(myvalues, { lineColor: '#f00', fillColor: false }); +* $('.barsparks').sparkline('html', { type:'bar', height:'40px', barWidth:5 }); +* $('#tristate').sparkline([1,1,-1,1,0,0,-1], { type:'tristate' }): +* $('#discrete').sparkline([1,3,4,5,5,3,4,5], { type:'discrete' }); +* $('#bullet').sparkline([10,12,12,9,7], { type:'bullet' }); +* $('#pie').sparkline([1,1,2], { type:'pie' }); +*/ + +/*jslint regexp: true, browser: true, jquery: true, white: true, nomen: false, plusplus: false, maxerr: 500, indent: 4 */ + +(function(factory) { + if(typeof define === 'function' && define.amd) { + define(['jquery'], factory); + } + else { + factory(jQuery); + } +} +(function($) { + 'use strict'; + + var UNSET_OPTION = {}, + getDefaults, createClass, SPFormat, clipval, quartile, normalizeValue, normalizeValues, + remove, isNumber, all, sum, addCSS, ensureArray, formatNumber, RangeMap, + MouseHandler, Tooltip, barHighlightMixin, + line, bar, tristate, discrete, bullet, pie, box, defaultStyles, initStyles, + VShape, VCanvas_base, VCanvas_canvas, VCanvas_vml, pending, shapeCount = 0; + + /** + * Default configuration settings + */ + getDefaults = function () { + return { + // Settings common to most/all chart types + common: { + type: 'line', + lineColor: '#00f', + fillColor: '#cdf', + defaultPixelsPerValue: 3, + width: 'auto', + height: 'auto', + composite: false, + tagValuesAttribute: 'values', + tagOptionsPrefix: 'spark', + enableTagOptions: false, + enableHighlight: true, + highlightLighten: 1.4, + tooltipSkipNull: true, + tooltipPrefix: '', + tooltipSuffix: '', + disableHiddenCheck: false, + numberFormatter: false, + numberDigitGroupCount: 3, + numberDigitGroupSep: ',', + numberDecimalMark: '.', + disableTooltips: false, + disableInteraction: false + }, + // Defaults for line charts + line: { + spotColor: '#f80', + highlightSpotColor: '#5f5', + highlightLineColor: '#f22', + spotRadius: 1.5, + minSpotColor: '#f80', + maxSpotColor: '#f80', + lineWidth: 1, + normalRangeMin: undefined, + normalRangeMax: undefined, + normalRangeColor: '#ccc', + drawNormalOnTop: false, + chartRangeMin: undefined, + chartRangeMax: undefined, + chartRangeMinX: undefined, + chartRangeMaxX: undefined, + tooltipFormat: new SPFormat('● {{prefix}}{{y}}{{suffix}}') + }, + // Defaults for bar charts + bar: { + barColor: '#3366cc', + negBarColor: '#f44', + stackedBarColor: ['#3366cc', '#dc3912', '#ff9900', '#109618', '#66aa00', + '#dd4477', '#0099c6', '#990099'], + zeroColor: undefined, + nullColor: undefined, + zeroAxis: true, + barWidth: 4, + barSpacing: 1, + chartRangeMax: undefined, + chartRangeMin: undefined, + chartRangeClip: false, + colorMap: undefined, + tooltipFormat: new SPFormat('● {{prefix}}{{value}}{{suffix}}') + }, + // Defaults for tristate charts + tristate: { + barWidth: 4, + barSpacing: 1, + posBarColor: '#6f6', + negBarColor: '#f44', + zeroBarColor: '#999', + colorMap: {}, + tooltipFormat: new SPFormat('● {{value:map}}'), + tooltipValueLookups: { map: { '-1': 'Loss', '0': 'Draw', '1': 'Win' } } + }, + // Defaults for discrete charts + discrete: { + lineHeight: 'auto', + thresholdColor: undefined, + thresholdValue: 0, + chartRangeMax: undefined, + chartRangeMin: undefined, + chartRangeClip: false, + tooltipFormat: new SPFormat('{{prefix}}{{value}}{{suffix}}') + }, + // Defaults for bullet charts + bullet: { + targetColor: '#f33', + targetWidth: 3, // width of the target bar in pixels + performanceColor: '#33f', + rangeColors: ['#d3dafe', '#a8b6ff', '#7f94ff'], + base: undefined, // set this to a number to change the base start number + tooltipFormat: new SPFormat('{{fieldkey:fields}} - {{value}}'), + tooltipValueLookups: { fields: {r: 'Range', p: 'Performance', t: 'Target'} } + }, + // Defaults for pie charts + pie: { + offset: 0, + sliceColors: ['#3366cc', '#dc3912', '#ff9900', '#109618', '#66aa00', + '#dd4477', '#0099c6', '#990099'], + borderWidth: 0, + borderColor: '#000', + tooltipFormat: new SPFormat('● {{value}} ({{percent.1}}%)') + }, + // Defaults for box plots + box: { + raw: false, + boxLineColor: '#000', + boxFillColor: '#cdf', + whiskerColor: '#000', + outlierLineColor: '#333', + outlierFillColor: '#fff', + medianColor: '#f00', + showOutliers: true, + outlierIQR: 1.5, + spotRadius: 1.5, + target: undefined, + targetColor: '#4a2', + chartRangeMax: undefined, + chartRangeMin: undefined, + tooltipFormat: new SPFormat('{{field:fields}}: {{value}}'), + tooltipFormatFieldlistKey: 'field', + tooltipValueLookups: { fields: { lq: 'Lower Quartile', med: 'Median', + uq: 'Upper Quartile', lo: 'Left Outlier', ro: 'Right Outlier', + lw: 'Left Whisker', rw: 'Right Whisker'} } + } + }; + }; + + // You can have tooltips use a css class other than jqstooltip by specifying tooltipClassname + defaultStyles = '.jqstooltip { ' + + 'position: absolute;' + + 'left: 0px;' + + 'top: 0px;' + + 'visibility: hidden;' + + 'background: rgb(0, 0, 0) transparent;' + + 'background-color: rgba(0,0,0,0.6);' + + 'filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#99000000, endColorstr=#99000000);' + + '-ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr=#99000000, endColorstr=#99000000)";' + + 'color: white;' + + 'font: 10px arial, san serif;' + + 'text-align: left;' + + 'white-space: nowrap;' + + 'padding: 5px;' + + 'border: 1px solid white;' + + 'z-index: 10000;' + + '}' + + '.jqsfield { ' + + 'color: white;' + + 'font: 10px arial, san serif;' + + 'text-align: left;' + + '}'; + + /** + * Utilities + */ + + createClass = function (/* [baseclass, [mixin, ...]], definition */) { + var Class, args; + Class = function () { + this.init.apply(this, arguments); + }; + if (arguments.length > 1) { + if (arguments[0]) { + Class.prototype = $.extend(new arguments[0](), arguments[arguments.length - 1]); + Class._super = arguments[0].prototype; + } else { + Class.prototype = arguments[arguments.length - 1]; + } + if (arguments.length > 2) { + args = Array.prototype.slice.call(arguments, 1, -1); + args.unshift(Class.prototype); + $.extend.apply($, args); + } + } else { + Class.prototype = arguments[0]; + } + Class.prototype.cls = Class; + return Class; + }; + + /** + * Wraps a format string for tooltips + * {{x}} + * {{x.2} + * {{x:months}} + */ + $.SPFormatClass = SPFormat = createClass({ + fre: /\{\{([\w.]+?)(:(.+?))?\}\}/g, + precre: /(\w+)\.(\d+)/, + + init: function (format, fclass) { + this.format = format; + this.fclass = fclass; + }, + + render: function (fieldset, lookups, options) { + var self = this, + fields = fieldset, + match, token, lookupkey, fieldvalue, prec; + return this.format.replace(this.fre, function () { + var lookup; + token = arguments[1]; + lookupkey = arguments[3]; + match = self.precre.exec(token); + if (match) { + prec = match[2]; + token = match[1]; + } else { + prec = false; + } + fieldvalue = fields[token]; + if (fieldvalue === undefined) { + return ''; + } + if (lookupkey && lookups && lookups[lookupkey]) { + lookup = lookups[lookupkey]; + if (lookup.get) { // RangeMap + return lookups[lookupkey].get(fieldvalue) || fieldvalue; + } else { + return lookups[lookupkey][fieldvalue] || fieldvalue; + } + } + if (isNumber(fieldvalue)) { + if (options.get('numberFormatter')) { + fieldvalue = options.get('numberFormatter')(fieldvalue); + } else { + fieldvalue = formatNumber(fieldvalue, prec, + options.get('numberDigitGroupCount'), + options.get('numberDigitGroupSep'), + options.get('numberDecimalMark')); + } + } + return fieldvalue; + }); + } + }); + + // convience method to avoid needing the new operator + $.spformat = function(format, fclass) { + return new SPFormat(format, fclass); + }; + + clipval = function (val, min, max) { + if (val < min) { + return min; + } + if (val > max) { + return max; + } + return val; + }; + + quartile = function (values, q) { + var vl; + if (q === 2) { + vl = Math.floor(values.length / 2); + return values.length % 2 ? values[vl] : (values[vl-1] + values[vl]) / 2; + } else { + if (values.length % 2 ) { // odd + vl = (values.length * q + q) / 4; + return vl % 1 ? (values[Math.floor(vl)] + values[Math.floor(vl) - 1]) / 2 : values[vl-1]; + } else { //even + vl = (values.length * q + 2) / 4; + return vl % 1 ? (values[Math.floor(vl)] + values[Math.floor(vl) - 1]) / 2 : values[vl-1]; + + } + } + }; + + normalizeValue = function (val) { + var nf; + switch (val) { + case 'undefined': + val = undefined; + break; + case 'null': + val = null; + break; + case 'true': + val = true; + break; + case 'false': + val = false; + break; + default: + nf = parseFloat(val); + if (val == nf) { + val = nf; + } + } + return val; + }; + + normalizeValues = function (vals) { + var i, result = []; + for (i = vals.length; i--;) { + result[i] = normalizeValue(vals[i]); + } + return result; + }; + + remove = function (vals, filter) { + var i, vl, result = []; + for (i = 0, vl = vals.length; i < vl; i++) { + if (vals[i] !== filter) { + result.push(vals[i]); + } + } + return result; + }; + + isNumber = function (num) { + return !isNaN(parseFloat(num)) && isFinite(num); + }; + + formatNumber = function (num, prec, groupsize, groupsep, decsep) { + var p, i; + num = (prec === false ? parseFloat(num).toString() : num.toFixed(prec)).split(''); + p = (p = $.inArray('.', num)) < 0 ? num.length : p; + if (p < num.length) { + num[p] = decsep; + } + for (i = p - groupsize; i > 0; i -= groupsize) { + num.splice(i, 0, groupsep); + } + return num.join(''); + }; + + // determine if all values of an array match a value + // returns true if the array is empty + all = function (val, arr, ignoreNull) { + var i; + for (i = arr.length; i--; ) { + if (ignoreNull && arr[i] === null) continue; + if (arr[i] !== val) { + return false; + } + } + return true; + }; + + // sums the numeric values in an array, ignoring other values + sum = function (vals) { + var total = 0, i; + for (i = vals.length; i--;) { + total += typeof vals[i] === 'number' ? vals[i] : 0; + } + return total; + }; + + ensureArray = function (val) { + return $.isArray(val) ? val : [val]; + }; + + // http://paulirish.com/2008/bookmarklet-inject-new-css-rules/ + addCSS = function(css) { + var tag; + //if ('\v' == 'v') /* ie only */ { + if (document.createStyleSheet) { + document.createStyleSheet().cssText = css; + } else { + tag = document.createElement('style'); + tag.type = 'text/css'; + document.getElementsByTagName('head')[0].appendChild(tag); + tag[(typeof document.body.style.WebkitAppearance == 'string') /* webkit only */ ? 'innerText' : 'innerHTML'] = css; + } + }; + + // Provide a cross-browser interface to a few simple drawing primitives + $.fn.simpledraw = function (width, height, useExisting, interact) { + var target, mhandler; + if (useExisting && (target = this.data('_jqs_vcanvas'))) { + return target; + } + if (width === undefined) { + width = $(this).innerWidth(); + } + if (height === undefined) { + height = $(this).innerHeight(); + } + if ($.fn.sparkline.hasCanvas) { + target = new VCanvas_canvas(width, height, this, interact); + } else if ($.fn.sparkline.hasVML) { + target = new VCanvas_vml(width, height, this); + } else { + return false; + } + mhandler = $(this).data('_jqs_mhandler'); + if (mhandler) { + mhandler.registerCanvas(target); + } + return target; + }; + + $.fn.cleardraw = function () { + var target = this.data('_jqs_vcanvas'); + if (target) { + target.reset(); + } + }; + + $.RangeMapClass = RangeMap = createClass({ + init: function (map) { + var key, range, rangelist = []; + for (key in map) { + if (map.hasOwnProperty(key) && typeof key === 'string' && key.indexOf(':') > -1) { + range = key.split(':'); + range[0] = range[0].length === 0 ? -Infinity : parseFloat(range[0]); + range[1] = range[1].length === 0 ? Infinity : parseFloat(range[1]); + range[2] = map[key]; + rangelist.push(range); + } + } + this.map = map; + this.rangelist = rangelist || false; + }, + + get: function (value) { + var rangelist = this.rangelist, + i, range, result; + if ((result = this.map[value]) !== undefined) { + return result; + } + if (rangelist) { + for (i = rangelist.length; i--;) { + range = rangelist[i]; + if (range[0] <= value && range[1] >= value) { + return range[2]; + } + } + } + return undefined; + } + }); + + // Convenience function + $.range_map = function(map) { + return new RangeMap(map); + }; + + MouseHandler = createClass({ + init: function (el, options) { + var $el = $(el); + this.$el = $el; + this.options = options; + this.currentPageX = 0; + this.currentPageY = 0; + this.el = el; + this.splist = []; + this.tooltip = null; + this.over = false; + this.displayTooltips = !options.get('disableTooltips'); + this.highlightEnabled = !options.get('disableHighlight'); + }, + + registerSparkline: function (sp) { + this.splist.push(sp); + if (this.over) { + this.updateDisplay(); + } + }, + + registerCanvas: function (canvas) { + var $canvas = $(canvas.canvas); + this.canvas = canvas; + this.$canvas = $canvas; + $canvas.mouseenter($.proxy(this.mouseenter, this)); + $canvas.mouseleave($.proxy(this.mouseleave, this)); + $canvas.click($.proxy(this.mouseclick, this)); + }, + + reset: function (removeTooltip) { + this.splist = []; + if (this.tooltip && removeTooltip) { + this.tooltip.remove(); + this.tooltip = undefined; + } + }, + + mouseclick: function (e) { + var clickEvent = $.Event('sparklineClick'); + clickEvent.originalEvent = e; + clickEvent.sparklines = this.splist; + this.$el.trigger(clickEvent); + }, + + mouseenter: function (e) { + $(document.body).unbind('mousemove.jqs'); + $(document.body).bind('mousemove.jqs', $.proxy(this.mousemove, this)); + this.over = true; + this.currentPageX = e.pageX; + this.currentPageY = e.pageY; + this.currentEl = e.target; + if (!this.tooltip && this.displayTooltips) { + this.tooltip = new Tooltip(this.options); + this.tooltip.updatePosition(e.pageX, e.pageY); + } + this.updateDisplay(); + }, + + mouseleave: function () { + $(document.body).unbind('mousemove.jqs'); + var splist = this.splist, + spcount = splist.length, + needsRefresh = false, + sp, i; + this.over = false; + this.currentEl = null; + + if (this.tooltip) { + this.tooltip.remove(); + this.tooltip = null; + } + + for (i = 0; i < spcount; i++) { + sp = splist[i]; + if (sp.clearRegionHighlight()) { + needsRefresh = true; + } + } + + if (needsRefresh) { + this.canvas.render(); + } + }, + + mousemove: function (e) { + this.currentPageX = e.pageX; + this.currentPageY = e.pageY; + this.currentEl = e.target; + if (this.tooltip) { + this.tooltip.updatePosition(e.pageX, e.pageY); + } + this.updateDisplay(); + }, + + updateDisplay: function () { + var splist = this.splist, + spcount = splist.length, + needsRefresh = false, + offset = this.$canvas.offset(), + localX = this.currentPageX - offset.left, + localY = this.currentPageY - offset.top, + tooltiphtml, sp, i, result, changeEvent; + if (!this.over) { + return; + } + for (i = 0; i < spcount; i++) { + sp = splist[i]; + result = sp.setRegionHighlight(this.currentEl, localX, localY); + if (result) { + needsRefresh = true; + } + } + if (needsRefresh) { + changeEvent = $.Event('sparklineRegionChange'); + changeEvent.sparklines = this.splist; + this.$el.trigger(changeEvent); + if (this.tooltip) { + tooltiphtml = ''; + for (i = 0; i < spcount; i++) { + sp = splist[i]; + tooltiphtml += sp.getCurrentRegionTooltip(); + } + this.tooltip.setContent(tooltiphtml); + } + if (!this.disableHighlight) { + this.canvas.render(); + } + } + if (result === null) { + this.mouseleave(); + } + } + }); + + + Tooltip = createClass({ + sizeStyle: 'position: static !important;' + + 'display: block !important;' + + 'visibility: hidden !important;' + + 'float: left !important;', + + init: function (options) { + var tooltipClassname = options.get('tooltipClassname', 'jqstooltip'), + sizetipStyle = this.sizeStyle, + offset; + this.container = options.get('tooltipContainer') || document.body; + this.tooltipOffsetX = options.get('tooltipOffsetX', 10); + this.tooltipOffsetY = options.get('tooltipOffsetY', 12); + // remove any previous lingering tooltip + $('#jqssizetip').remove(); + $('#jqstooltip').remove(); + this.sizetip = $('', { + id: 'jqssizetip', + style: sizetipStyle, + 'class': tooltipClassname + }); + this.tooltip = $('', { + id: 'jqstooltip', + 'class': tooltipClassname + }).appendTo(this.container); + // account for the container's location + offset = this.tooltip.offset(); + this.offsetLeft = offset.left; + this.offsetTop = offset.top; + this.hidden = true; + $(window).unbind('resize.jqs scroll.jqs'); + $(window).bind('resize.jqs scroll.jqs', $.proxy(this.updateWindowDims, this)); + this.updateWindowDims(); + }, + + updateWindowDims: function () { + this.scrollTop = $(window).scrollTop(); + this.scrollLeft = $(window).scrollLeft(); + this.scrollRight = this.scrollLeft + $(window).width(); + this.updatePosition(); + }, + + getSize: function (content) { + this.sizetip.html(content).appendTo(this.container); + this.width = this.sizetip.width() + 1; + this.height = this.sizetip.height(); + this.sizetip.remove(); + }, + + setContent: function (content) { + if (!content) { + this.tooltip.css('visibility', 'hidden'); + this.hidden = true; + return; + } + this.getSize(content); + this.tooltip.html(content) + .css({ + 'width': this.width, + 'height': this.height, + 'visibility': 'visible' + }); + if (this.hidden) { + this.hidden = false; + this.updatePosition(); + } + }, + + updatePosition: function (x, y) { + if (x === undefined) { + if (this.mousex === undefined) { + return; + } + x = this.mousex - this.offsetLeft; + y = this.mousey - this.offsetTop; + + } else { + this.mousex = x = x - this.offsetLeft; + this.mousey = y = y - this.offsetTop; + } + if (!this.height || !this.width || this.hidden) { + return; + } + + y -= this.height + this.tooltipOffsetY; + x += this.tooltipOffsetX; + + if (y < this.scrollTop) { + y = this.scrollTop; + } + if (x < this.scrollLeft) { + x = this.scrollLeft; + } else if (x + this.width > this.scrollRight) { + x = this.scrollRight - this.width; + } + + this.tooltip.css({ + 'left': x, + 'top': y + }); + }, + + remove: function () { + this.tooltip.remove(); + this.sizetip.remove(); + this.sizetip = this.tooltip = undefined; + $(window).unbind('resize.jqs scroll.jqs'); + } + }); + + initStyles = function() { + addCSS(defaultStyles); + }; + + $(initStyles); + + pending = []; + $.fn.sparkline = function (userValues, userOptions) { + return this.each(function () { + var options = new $.fn.sparkline.options(this, userOptions), + $this = $(this), + render, i; + render = function () { + var values, width, height, tmp, mhandler, sp, vals; + if (userValues === 'html' || userValues === undefined) { + vals = this.getAttribute(options.get('tagValuesAttribute')); + if (vals === undefined || vals === null) { + vals = $this.html(); + } + values = vals.replace(/(^\s*\s*$)|\s+/g, '').split(','); + } else { + values = userValues; + } + + width = options.get('width') === 'auto' ? values.length * options.get('defaultPixelsPerValue') : options.get('width'); + if (options.get('height') === 'auto') { + if (!options.get('composite') || !$.data(this, '_jqs_vcanvas')) { + // must be a better way to get the line height + tmp = document.createElement('span'); + tmp.innerHTML = 'a'; + $this.html(tmp); + height = $(tmp).innerHeight() || $(tmp).height(); + $(tmp).remove(); + tmp = null; + } + } else { + height = options.get('height'); + } + + if (!options.get('disableInteraction')) { + mhandler = $.data(this, '_jqs_mhandler'); + if (!mhandler) { + mhandler = new MouseHandler(this, options); + $.data(this, '_jqs_mhandler', mhandler); + } else if (!options.get('composite')) { + mhandler.reset(); + } + } else { + mhandler = false; + } + + if (options.get('composite') && !$.data(this, '_jqs_vcanvas')) { + if (!$.data(this, '_jqs_errnotify')) { + alert('Attempted to attach a composite sparkline to an element with no existing sparkline'); + $.data(this, '_jqs_errnotify', true); + } + return; + } + + sp = new $.fn.sparkline[options.get('type')](this, values, options, width, height); + + sp.render(); + + if (mhandler) { + mhandler.registerSparkline(sp); + } + }; + // jQuery 1.3.0 completely changed the meaning of :hidden :-/ + if (($(this).html() && !options.get('disableHiddenCheck') && $(this).is(':hidden')) || ($.fn.jquery < '1.3.0' && $(this).parents().is(':hidden')) || !$(this).parents('body').length) { + if (!options.get('composite') && $.data(this, '_jqs_pending')) { + // remove any existing references to the element + for (i = pending.length; i; i--) { + if (pending[i - 1][0] == this) { + pending.splice(i - 1, 1); + } + } + } + pending.push([this, render]); + $.data(this, '_jqs_pending', true); + } else { + render.call(this); + } + }); + }; + + $.fn.sparkline.defaults = getDefaults(); + + + $.sparkline_display_visible = function () { + var el, i, pl; + var done = []; + for (i = 0, pl = pending.length; i < pl; i++) { + el = pending[i][0]; + if ($(el).is(':visible') && !$(el).parents().is(':hidden')) { + pending[i][1].call(el); + $.data(pending[i][0], '_jqs_pending', false); + done.push(i); + } else if (!$(el).closest('html').length && !$.data(el, '_jqs_pending')) { + // element has been inserted and removed from the DOM + // If it was not yet inserted into the dom then the .data request + // will return true. + // removing from the dom causes the data to be removed. + $.data(pending[i][0], '_jqs_pending', false); + done.push(i); + } + } + for (i = done.length; i; i--) { + pending.splice(done[i - 1], 1); + } + }; + + + /** + * User option handler + */ + $.fn.sparkline.options = createClass({ + init: function (tag, userOptions) { + var extendedOptions, defaults, base, tagOptionType; + this.userOptions = userOptions = userOptions || {}; + this.tag = tag; + this.tagValCache = {}; + defaults = $.fn.sparkline.defaults; + base = defaults.common; + this.tagOptionsPrefix = userOptions.enableTagOptions && (userOptions.tagOptionsPrefix || base.tagOptionsPrefix); + + tagOptionType = this.getTagSetting('type'); + if (tagOptionType === UNSET_OPTION) { + extendedOptions = defaults[userOptions.type || base.type]; + } else { + extendedOptions = defaults[tagOptionType]; + } + this.mergedOptions = $.extend({}, base, extendedOptions, userOptions); + }, + + + getTagSetting: function (key) { + var prefix = this.tagOptionsPrefix, + val, i, pairs, keyval; + if (prefix === false || prefix === undefined) { + return UNSET_OPTION; + } + if (this.tagValCache.hasOwnProperty(key)) { + val = this.tagValCache.key; + } else { + val = this.tag.getAttribute(prefix + key); + if (val === undefined || val === null) { + val = UNSET_OPTION; + } else if (val.substr(0, 1) === '[') { + val = val.substr(1, val.length - 2).split(','); + for (i = val.length; i--;) { + val[i] = normalizeValue(val[i].replace(/(^\s*)|(\s*$)/g, '')); + } + } else if (val.substr(0, 1) === '{') { + pairs = val.substr(1, val.length - 2).split(','); + val = {}; + for (i = pairs.length; i--;) { + keyval = pairs[i].split(':', 2); + val[keyval[0].replace(/(^\s*)|(\s*$)/g, '')] = normalizeValue(keyval[1].replace(/(^\s*)|(\s*$)/g, '')); + } + } else { + val = normalizeValue(val); + } + this.tagValCache.key = val; + } + return val; + }, + + get: function (key, defaultval) { + var tagOption = this.getTagSetting(key), + result; + if (tagOption !== UNSET_OPTION) { + return tagOption; + } + return (result = this.mergedOptions[key]) === undefined ? defaultval : result; + } + }); + + + $.fn.sparkline._base = createClass({ + disabled: false, + + init: function (el, values, options, width, height) { + this.el = el; + this.$el = $(el); + this.values = values; + this.options = options; + this.width = width; + this.height = height; + this.currentRegion = undefined; + }, + + /** + * Setup the canvas + */ + initTarget: function () { + var interactive = !this.options.get('disableInteraction'); + if (!(this.target = this.$el.simpledraw(this.width, this.height, this.options.get('composite'), interactive))) { + this.disabled = true; + } else { + this.canvasWidth = this.target.pixelWidth; + this.canvasHeight = this.target.pixelHeight; + } + }, + + /** + * Actually render the chart to the canvas + */ + render: function () { + if (this.disabled) { + this.el.innerHTML = ''; + return false; + } + return true; + }, + + /** + * Return a region id for a given x/y co-ordinate + */ + getRegion: function (x, y) { + }, + + /** + * Highlight an item based on the moused-over x,y co-ordinate + */ + setRegionHighlight: function (el, x, y) { + var currentRegion = this.currentRegion, + highlightEnabled = !this.options.get('disableHighlight'), + newRegion; + if (x > this.canvasWidth || y > this.canvasHeight || x < 0 || y < 0) { + return null; + } + newRegion = this.getRegion(el, x, y); + if (currentRegion !== newRegion) { + if (currentRegion !== undefined && highlightEnabled) { + this.removeHighlight(); + } + this.currentRegion = newRegion; + if (newRegion !== undefined && highlightEnabled) { + this.renderHighlight(); + } + return true; + } + return false; + }, + + /** + * Reset any currently highlighted item + */ + clearRegionHighlight: function () { + if (this.currentRegion !== undefined) { + this.removeHighlight(); + this.currentRegion = undefined; + return true; + } + return false; + }, + + renderHighlight: function () { + this.changeHighlight(true); + }, + + removeHighlight: function () { + this.changeHighlight(false); + }, + + changeHighlight: function (highlight) {}, + + /** + * Fetch the HTML to display as a tooltip + */ + getCurrentRegionTooltip: function () { + var options = this.options, + header = '', + entries = [], + fields, formats, formatlen, fclass, text, i, + showFields, showFieldsKey, newFields, fv, + formatter, format, fieldlen, j; + if (this.currentRegion === undefined) { + return ''; + } + fields = this.getCurrentRegionFields(); + formatter = options.get('tooltipFormatter'); + if (formatter) { + return formatter(this, options, fields); + } + if (options.get('tooltipChartTitle')) { + header += '' + options.get('tooltipChartTitle') + '
\n';
+ }
+ formats = this.options.get('tooltipFormat');
+ if (!formats) {
+ return '';
+ }
+ if (!$.isArray(formats)) {
+ formats = [formats];
+ }
+ if (!$.isArray(fields)) {
+ fields = [fields];
+ }
+ showFields = this.options.get('tooltipFormatFieldlist');
+ showFieldsKey = this.options.get('tooltipFormatFieldlistKey');
+ if (showFields && showFieldsKey) {
+ // user-selected ordering of fields
+ newFields = [];
+ for (i = fields.length; i--;) {
+ fv = fields[i][showFieldsKey];
+ if ((j = $.inArray(fv, showFields)) != -1) {
+ newFields[j] = fields[i];
+ }
+ }
+ fields = newFields;
+ }
+ formatlen = formats.length;
+ fieldlen = fields.length;
+ for (i = 0; i < formatlen; i++) {
+ format = formats[i];
+ if (typeof format === 'string') {
+ format = new SPFormat(format);
+ }
+ fclass = format.fclass || 'jqsfield';
+ for (j = 0; j < fieldlen; j++) {
+ if (!fields[j].isNull || !options.get('tooltipSkipNull')) {
+ $.extend(fields[j], {
+ prefix: options.get('tooltipPrefix'),
+ suffix: options.get('tooltipSuffix')
+ });
+ text = format.render(fields[j], options.get('tooltipValueLookups'), options);
+ entries.push('' + text + '
');
+ }
+ }
+ }
+ if (entries.length) {
+ return header + entries.join('\n');
+ }
+ return '';
+ },
+
+ getCurrentRegionFields: function () {},
+
+ calcHighlightColor: function (color, options) {
+ var highlightColor = options.get('highlightColor'),
+ lighten = options.get('highlightLighten'),
+ parse, mult, rgbnew, i;
+ if (highlightColor) {
+ return highlightColor;
+ }
+ if (lighten) {
+ // extract RGB values
+ parse = /^#([0-9a-f])([0-9a-f])([0-9a-f])$/i.exec(color) || /^#([0-9a-f]{2})([0-9a-f]{2})([0-9a-f]{2})$/i.exec(color);
+ if (parse) {
+ rgbnew = [];
+ mult = color.length === 4 ? 16 : 1;
+ for (i = 0; i < 3; i++) {
+ rgbnew[i] = clipval(Math.round(parseInt(parse[i + 1], 16) * mult * lighten), 0, 255);
+ }
+ return 'rgb(' + rgbnew.join(',') + ')';
+ }
+
+ }
+ return color;
+ }
+
+ });
+
+ barHighlightMixin = {
+ changeHighlight: function (highlight) {
+ var currentRegion = this.currentRegion,
+ target = this.target,
+ shapeids = this.regionShapes[currentRegion],
+ newShapes;
+ // will be null if the region value was null
+ if (shapeids) {
+ newShapes = this.renderRegion(currentRegion, highlight);
+ if ($.isArray(newShapes) || $.isArray(shapeids)) {
+ target.replaceWithShapes(shapeids, newShapes);
+ this.regionShapes[currentRegion] = $.map(newShapes, function (newShape) {
+ return newShape.id;
+ });
+ } else {
+ target.replaceWithShape(shapeids, newShapes);
+ this.regionShapes[currentRegion] = newShapes.id;
+ }
+ }
+ },
+
+ render: function () {
+ var values = this.values,
+ target = this.target,
+ regionShapes = this.regionShapes,
+ shapes, ids, i, j;
+
+ if (!this.cls._super.render.call(this)) {
+ return;
+ }
+ for (i = values.length; i--;) {
+ shapes = this.renderRegion(i);
+ if (shapes) {
+ if ($.isArray(shapes)) {
+ ids = [];
+ for (j = shapes.length; j--;) {
+ shapes[j].append();
+ ids.push(shapes[j].id);
+ }
+ regionShapes[i] = ids;
+ } else {
+ shapes.append();
+ regionShapes[i] = shapes.id; // store just the shapeid
+ }
+ } else {
+ // null value
+ regionShapes[i] = null;
+ }
+ }
+ target.render();
+ }
+ };
+
+ /**
+ * Line charts
+ */
+ $.fn.sparkline.line = line = createClass($.fn.sparkline._base, {
+ type: 'line',
+
+ init: function (el, values, options, width, height) {
+ line._super.init.call(this, el, values, options, width, height);
+ this.vertices = [];
+ this.regionMap = [];
+ this.xvalues = [];
+ this.yvalues = [];
+ this.yminmax = [];
+ this.hightlightSpotId = null;
+ this.lastShapeId = null;
+ this.initTarget();
+ },
+
+ getRegion: function (el, x, y) {
+ var i,
+ regionMap = this.regionMap; // maps regions to value positions
+ for (i = regionMap.length; i--;) {
+ if (regionMap[i] !== null && x >= regionMap[i][0] && x <= regionMap[i][1]) {
+ return regionMap[i][2];
+ }
+ }
+ return undefined;
+ },
+
+ getCurrentRegionFields: function () {
+ var currentRegion = this.currentRegion;
+ return {
+ isNull: this.yvalues[currentRegion] === null,
+ x: this.xvalues[currentRegion],
+ y: this.yvalues[currentRegion],
+ color: this.options.get('lineColor'),
+ fillColor: this.options.get('fillColor'),
+ offset: currentRegion
+ };
+ },
+
+ renderHighlight: function () {
+ var currentRegion = this.currentRegion,
+ target = this.target,
+ vertex = this.vertices[currentRegion],
+ options = this.options,
+ spotRadius = options.get('spotRadius'),
+ highlightSpotColor = options.get('highlightSpotColor'),
+ highlightLineColor = options.get('highlightLineColor'),
+ highlightSpot, highlightLine;
+
+ if (!vertex) {
+ return;
+ }
+ if (spotRadius && highlightSpotColor) {
+ highlightSpot = target.drawCircle(vertex[0], vertex[1],
+ spotRadius, undefined, highlightSpotColor);
+ this.highlightSpotId = highlightSpot.id;
+ target.insertAfterShape(this.lastShapeId, highlightSpot);
+ }
+ if (highlightLineColor) {
+ highlightLine = target.drawLine(vertex[0], this.canvasTop, vertex[0],
+ this.canvasTop + this.canvasHeight, highlightLineColor);
+ this.highlightLineId = highlightLine.id;
+ target.insertAfterShape(this.lastShapeId, highlightLine);
+ }
+ },
+
+ removeHighlight: function () {
+ var target = this.target;
+ if (this.highlightSpotId) {
+ target.removeShapeId(this.highlightSpotId);
+ this.highlightSpotId = null;
+ }
+ if (this.highlightLineId) {
+ target.removeShapeId(this.highlightLineId);
+ this.highlightLineId = null;
+ }
+ },
+
+ scanValues: function () {
+ var values = this.values,
+ valcount = values.length,
+ xvalues = this.xvalues,
+ yvalues = this.yvalues,
+ yminmax = this.yminmax,
+ i, val, isStr, isArray, sp;
+ for (i = 0; i < valcount; i++) {
+ val = values[i];
+ isStr = typeof(values[i]) === 'string';
+ isArray = typeof(values[i]) === 'object' && values[i] instanceof Array;
+ sp = isStr && values[i].split(':');
+ if (isStr && sp.length === 2) { // x:y
+ xvalues.push(Number(sp[0]));
+ yvalues.push(Number(sp[1]));
+ yminmax.push(Number(sp[1]));
+ } else if (isArray) {
+ xvalues.push(val[0]);
+ yvalues.push(val[1]);
+ yminmax.push(val[1]);
+ } else {
+ xvalues.push(i);
+ if (values[i] === null || values[i] === 'null') {
+ yvalues.push(null);
+ } else {
+ yvalues.push(Number(val));
+ yminmax.push(Number(val));
+ }
+ }
+ }
+ if (this.options.get('xvalues')) {
+ xvalues = this.options.get('xvalues');
+ }
+
+ this.maxy = this.maxyorg = Math.max.apply(Math, yminmax);
+ this.miny = this.minyorg = Math.min.apply(Math, yminmax);
+
+ this.maxx = Math.max.apply(Math, xvalues);
+ this.minx = Math.min.apply(Math, xvalues);
+
+ this.xvalues = xvalues;
+ this.yvalues = yvalues;
+ this.yminmax = yminmax;
+
+ },
+
+ processRangeOptions: function () {
+ var options = this.options,
+ normalRangeMin = options.get('normalRangeMin'),
+ normalRangeMax = options.get('normalRangeMax');
+
+ if (normalRangeMin !== undefined) {
+ if (normalRangeMin < this.miny) {
+ this.miny = normalRangeMin;
+ }
+ if (normalRangeMax > this.maxy) {
+ this.maxy = normalRangeMax;
+ }
+ }
+ if (options.get('chartRangeMin') !== undefined && (options.get('chartRangeClip') || options.get('chartRangeMin') < this.miny)) {
+ this.miny = options.get('chartRangeMin');
+ }
+ if (options.get('chartRangeMax') !== undefined && (options.get('chartRangeClip') || options.get('chartRangeMax') > this.maxy)) {
+ this.maxy = options.get('chartRangeMax');
+ }
+ if (options.get('chartRangeMinX') !== undefined && (options.get('chartRangeClipX') || options.get('chartRangeMinX') < this.minx)) {
+ this.minx = options.get('chartRangeMinX');
+ }
+ if (options.get('chartRangeMaxX') !== undefined && (options.get('chartRangeClipX') || options.get('chartRangeMaxX') > this.maxx)) {
+ this.maxx = options.get('chartRangeMaxX');
+ }
+
+ },
+
+ drawNormalRange: function (canvasLeft, canvasTop, canvasHeight, canvasWidth, rangey) {
+ var normalRangeMin = this.options.get('normalRangeMin'),
+ normalRangeMax = this.options.get('normalRangeMax'),
+ ytop = canvasTop + Math.round(canvasHeight - (canvasHeight * ((normalRangeMax - this.miny) / rangey))),
+ height = Math.round((canvasHeight * (normalRangeMax - normalRangeMin)) / rangey);
+ this.target.drawRect(canvasLeft, ytop, canvasWidth, height, undefined, this.options.get('normalRangeColor')).append();
+ },
+
+ render: function () {
+ var options = this.options,
+ target = this.target,
+ canvasWidth = this.canvasWidth,
+ canvasHeight = this.canvasHeight,
+ vertices = this.vertices,
+ spotRadius = options.get('spotRadius'),
+ regionMap = this.regionMap,
+ rangex, rangey, yvallast,
+ canvasTop, canvasLeft,
+ vertex, path, paths, x, y, xnext, xpos, xposnext,
+ last, next, yvalcount, lineShapes, fillShapes, plen,
+ valueSpots, hlSpotsEnabled, color, xvalues, yvalues, i;
+
+ if (!line._super.render.call(this)) {
+ return;
+ }
+
+ this.scanValues();
+ this.processRangeOptions();
+
+ xvalues = this.xvalues;
+ yvalues = this.yvalues;
+
+ if (!this.yminmax.length || this.yvalues.length < 2) {
+ // empty or all null valuess
+ return;
+ }
+
+ canvasTop = canvasLeft = 0;
+
+ rangex = this.maxx - this.minx === 0 ? 1 : this.maxx - this.minx;
+ rangey = this.maxy - this.miny === 0 ? 1 : this.maxy - this.miny;
+ yvallast = this.yvalues.length - 1;
+
+ if (spotRadius && (canvasWidth < (spotRadius * 4) || canvasHeight < (spotRadius * 4))) {
+ spotRadius = 0;
+ }
+ if (spotRadius) {
+ // adjust the canvas size as required so that spots will fit
+ hlSpotsEnabled = options.get('highlightSpotColor') && !options.get('disableInteraction');
+ if (hlSpotsEnabled || options.get('minSpotColor') || (options.get('spotColor') && yvalues[yvallast] === this.miny)) {
+ canvasHeight -= Math.ceil(spotRadius);
+ }
+ if (hlSpotsEnabled || options.get('maxSpotColor') || (options.get('spotColor') && yvalues[yvallast] === this.maxy)) {
+ canvasHeight -= Math.ceil(spotRadius);
+ canvasTop += Math.ceil(spotRadius);
+ }
+ if (hlSpotsEnabled ||
+ ((options.get('minSpotColor') || options.get('maxSpotColor')) && (yvalues[0] === this.miny || yvalues[0] === this.maxy))) {
+ canvasLeft += Math.ceil(spotRadius);
+ canvasWidth -= Math.ceil(spotRadius);
+ }
+ if (hlSpotsEnabled || options.get('spotColor') ||
+ (options.get('minSpotColor') || options.get('maxSpotColor') &&
+ (yvalues[yvallast] === this.miny || yvalues[yvallast] === this.maxy))) {
+ canvasWidth -= Math.ceil(spotRadius);
+ }
+ }
+
+
+ canvasHeight--;
+
+ if (options.get('normalRangeMin') !== undefined && !options.get('drawNormalOnTop')) {
+ this.drawNormalRange(canvasLeft, canvasTop, canvasHeight, canvasWidth, rangey);
+ }
+
+ path = [];
+ paths = [path];
+ last = next = null;
+ yvalcount = yvalues.length;
+ for (i = 0; i < yvalcount; i++) {
+ x = xvalues[i];
+ xnext = xvalues[i + 1];
+ y = yvalues[i];
+ xpos = canvasLeft + Math.round((x - this.minx) * (canvasWidth / rangex));
+ xposnext = i < yvalcount - 1 ? canvasLeft + Math.round((xnext - this.minx) * (canvasWidth / rangex)) : canvasWidth;
+ next = xpos + ((xposnext - xpos) / 2);
+ regionMap[i] = [last || 0, next, i];
+ last = next;
+ if (y === null) {
+ if (i) {
+ if (yvalues[i - 1] !== null) {
+ path = [];
+ paths.push(path);
+ }
+ vertices.push(null);
+ }
+ } else {
+ if (y < this.miny) {
+ y = this.miny;
+ }
+ if (y > this.maxy) {
+ y = this.maxy;
+ }
+ if (!path.length) {
+ // previous value was null
+ path.push([xpos, canvasTop + canvasHeight]);
+ }
+ vertex = [xpos, canvasTop + Math.round(canvasHeight - (canvasHeight * ((y - this.miny) / rangey)))];
+ path.push(vertex);
+ vertices.push(vertex);
+ }
+ }
+
+ lineShapes = [];
+ fillShapes = [];
+ plen = paths.length;
+ for (i = 0; i < plen; i++) {
+ path = paths[i];
+ if (path.length) {
+ if (options.get('fillColor')) {
+ path.push([path[path.length - 1][0], (canvasTop + canvasHeight)]);
+ fillShapes.push(path.slice(0));
+ path.pop();
+ }
+ // if there's only a single point in this path, then we want to display it
+ // as a vertical line which means we keep path[0] as is
+ if (path.length > 2) {
+ // else we want the first value
+ path[0] = [path[0][0], path[1][1]];
+ }
+ lineShapes.push(path);
+ }
+ }
+
+ // draw the fill first, then optionally the normal range, then the line on top of that
+ plen = fillShapes.length;
+ for (i = 0; i < plen; i++) {
+ target.drawShape(fillShapes[i],
+ options.get('fillColor'), options.get('fillColor')).append();
+ }
+
+ if (options.get('normalRangeMin') !== undefined && options.get('drawNormalOnTop')) {
+ this.drawNormalRange(canvasLeft, canvasTop, canvasHeight, canvasWidth, rangey);
+ }
+
+ plen = lineShapes.length;
+ for (i = 0; i < plen; i++) {
+ target.drawShape(lineShapes[i], options.get('lineColor'), undefined,
+ options.get('lineWidth')).append();
+ }
+
+ if (spotRadius && options.get('valueSpots')) {
+ valueSpots = options.get('valueSpots');
+ if (valueSpots.get === undefined) {
+ valueSpots = new RangeMap(valueSpots);
+ }
+ for (i = 0; i < yvalcount; i++) {
+ color = valueSpots.get(yvalues[i]);
+ if (color) {
+ target.drawCircle(canvasLeft + Math.round((xvalues[i] - this.minx) * (canvasWidth / rangex)),
+ canvasTop + Math.round(canvasHeight - (canvasHeight * ((yvalues[i] - this.miny) / rangey))),
+ spotRadius, undefined,
+ color).append();
+ }
+ }
+
+ }
+ if (spotRadius && options.get('spotColor') && yvalues[yvallast] !== null) {
+ target.drawCircle(canvasLeft + Math.round((xvalues[xvalues.length - 1] - this.minx) * (canvasWidth / rangex)),
+ canvasTop + Math.round(canvasHeight - (canvasHeight * ((yvalues[yvallast] - this.miny) / rangey))),
+ spotRadius, undefined,
+ options.get('spotColor')).append();
+ }
+ if (this.maxy !== this.minyorg) {
+ if (spotRadius && options.get('minSpotColor')) {
+ x = xvalues[$.inArray(this.minyorg, yvalues)];
+ target.drawCircle(canvasLeft + Math.round((x - this.minx) * (canvasWidth / rangex)),
+ canvasTop + Math.round(canvasHeight - (canvasHeight * ((this.minyorg - this.miny) / rangey))),
+ spotRadius, undefined,
+ options.get('minSpotColor')).append();
+ }
+ if (spotRadius && options.get('maxSpotColor')) {
+ x = xvalues[$.inArray(this.maxyorg, yvalues)];
+ target.drawCircle(canvasLeft + Math.round((x - this.minx) * (canvasWidth / rangex)),
+ canvasTop + Math.round(canvasHeight - (canvasHeight * ((this.maxyorg - this.miny) / rangey))),
+ spotRadius, undefined,
+ options.get('maxSpotColor')).append();
+ }
+ }
+
+ this.lastShapeId = target.getLastShapeId();
+ this.canvasTop = canvasTop;
+ target.render();
+ }
+ });
+
+ /**
+ * Bar charts
+ */
+ $.fn.sparkline.bar = bar = createClass($.fn.sparkline._base, barHighlightMixin, {
+ type: 'bar',
+
+ init: function (el, values, options, width, height) {
+ var barWidth = parseInt(options.get('barWidth'), 10),
+ barSpacing = parseInt(options.get('barSpacing'), 10),
+ chartRangeMin = options.get('chartRangeMin'),
+ chartRangeMax = options.get('chartRangeMax'),
+ chartRangeClip = options.get('chartRangeClip'),
+ stackMin = Infinity,
+ stackMax = -Infinity,
+ isStackString, groupMin, groupMax, stackRanges,
+ numValues, i, vlen, range, zeroAxis, xaxisOffset, min, max, clipMin, clipMax,
+ stacked, vlist, j, slen, svals, val, yoffset, yMaxCalc, canvasHeightEf;
+ bar._super.init.call(this, el, values, options, width, height);
+
+ // scan values to determine whether to stack bars
+ for (i = 0, vlen = values.length; i < vlen; i++) {
+ val = values[i];
+ isStackString = typeof(val) === 'string' && val.indexOf(':') > -1;
+ if (isStackString || $.isArray(val)) {
+ stacked = true;
+ if (isStackString) {
+ val = values[i] = normalizeValues(val.split(':'));
+ }
+ val = remove(val, null); // min/max will treat null as zero
+ groupMin = Math.min.apply(Math, val);
+ groupMax = Math.max.apply(Math, val);
+ if (groupMin < stackMin) {
+ stackMin = groupMin;
+ }
+ if (groupMax > stackMax) {
+ stackMax = groupMax;
+ }
+ }
+ }
+
+ this.stacked = stacked;
+ this.regionShapes = {};
+ this.barWidth = barWidth;
+ this.barSpacing = barSpacing;
+ this.totalBarWidth = barWidth + barSpacing;
+ this.width = width = (values.length * barWidth) + ((values.length - 1) * barSpacing);
+
+ this.initTarget();
+
+ if (chartRangeClip) {
+ clipMin = chartRangeMin === undefined ? -Infinity : chartRangeMin;
+ clipMax = chartRangeMax === undefined ? Infinity : chartRangeMax;
+ }
+
+ numValues = [];
+ stackRanges = stacked ? [] : numValues;
+ var stackTotals = [];
+ var stackRangesNeg = [];
+ for (i = 0, vlen = values.length; i < vlen; i++) {
+ if (stacked) {
+ vlist = values[i];
+ values[i] = svals = [];
+ stackTotals[i] = 0;
+ stackRanges[i] = stackRangesNeg[i] = 0;
+ for (j = 0, slen = vlist.length; j < slen; j++) {
+ val = svals[j] = chartRangeClip ? clipval(vlist[j], clipMin, clipMax) : vlist[j];
+ if (val !== null) {
+ if (val > 0) {
+ stackTotals[i] += val;
+ }
+ if (stackMin < 0 && stackMax > 0) {
+ if (val < 0) {
+ stackRangesNeg[i] += Math.abs(val);
+ } else {
+ stackRanges[i] += val;
+ }
+ } else {
+ stackRanges[i] += Math.abs(val - (val < 0 ? stackMax : stackMin));
+ }
+ numValues.push(val);
+ }
+ }
+ } else {
+ val = chartRangeClip ? clipval(values[i], clipMin, clipMax) : values[i];
+ val = values[i] = normalizeValue(val);
+ if (val !== null) {
+ numValues.push(val);
+ }
+ }
+ }
+ this.max = max = Math.max.apply(Math, numValues);
+ this.min = min = Math.min.apply(Math, numValues);
+ this.stackMax = stackMax = stacked ? Math.max.apply(Math, stackTotals) : max;
+ this.stackMin = stackMin = stacked ? Math.min.apply(Math, numValues) : min;
+
+ if (options.get('chartRangeMin') !== undefined && (options.get('chartRangeClip') || options.get('chartRangeMin') < min)) {
+ min = options.get('chartRangeMin');
+ }
+ if (options.get('chartRangeMax') !== undefined && (options.get('chartRangeClip') || options.get('chartRangeMax') > max)) {
+ max = options.get('chartRangeMax');
+ }
+
+ this.zeroAxis = zeroAxis = options.get('zeroAxis', true);
+ if (min <= 0 && max >= 0 && zeroAxis) {
+ xaxisOffset = 0;
+ } else if (zeroAxis == false) {
+ xaxisOffset = min;
+ } else if (min > 0) {
+ xaxisOffset = min;
+ } else {
+ xaxisOffset = max;
+ }
+ this.xaxisOffset = xaxisOffset;
+
+ range = stacked ? (Math.max.apply(Math, stackRanges) + Math.max.apply(Math, stackRangesNeg)) : max - min;
+
+ // as we plot zero/min values a single pixel line, we add a pixel to all other
+ // values - Reduce the effective canvas size to suit
+ this.canvasHeightEf = (zeroAxis && min < 0) ? this.canvasHeight - 2 : this.canvasHeight - 1;
+
+ if (min < xaxisOffset) {
+ yMaxCalc = (stacked && max >= 0) ? stackMax : max;
+ yoffset = (yMaxCalc - xaxisOffset) / range * this.canvasHeight;
+ if (yoffset !== Math.ceil(yoffset)) {
+ this.canvasHeightEf -= 2;
+ yoffset = Math.ceil(yoffset);
+ }
+ } else {
+ yoffset = this.canvasHeight;
+ }
+ this.yoffset = yoffset;
+
+ if ($.isArray(options.get('colorMap'))) {
+ this.colorMapByIndex = options.get('colorMap');
+ this.colorMapByValue = null;
+ } else {
+ this.colorMapByIndex = null;
+ this.colorMapByValue = options.get('colorMap');
+ if (this.colorMapByValue && this.colorMapByValue.get === undefined) {
+ this.colorMapByValue = new RangeMap(this.colorMapByValue);
+ }
+ }
+
+ this.range = range;
+ },
+
+ getRegion: function (el, x, y) {
+ var result = Math.floor(x / this.totalBarWidth);
+ return (result < 0 || result >= this.values.length) ? undefined : result;
+ },
+
+ getCurrentRegionFields: function () {
+ var currentRegion = this.currentRegion,
+ values = ensureArray(this.values[currentRegion]),
+ result = [],
+ value, i;
+ for (i = values.length; i--;) {
+ value = values[i];
+ result.push({
+ isNull: value === null,
+ value: value,
+ color: this.calcColor(i, value, currentRegion),
+ offset: currentRegion
+ });
+ }
+ return result;
+ },
+
+ calcColor: function (stacknum, value, valuenum) {
+ var colorMapByIndex = this.colorMapByIndex,
+ colorMapByValue = this.colorMapByValue,
+ options = this.options,
+ color, newColor;
+ if (this.stacked) {
+ color = options.get('stackedBarColor');
+ } else {
+ color = (value < 0) ? options.get('negBarColor') : options.get('barColor');
+ }
+ if (value === 0 && options.get('zeroColor') !== undefined) {
+ color = options.get('zeroColor');
+ }
+ if (colorMapByValue && (newColor = colorMapByValue.get(value))) {
+ color = newColor;
+ } else if (colorMapByIndex && colorMapByIndex.length > valuenum) {
+ color = colorMapByIndex[valuenum];
+ }
+ return $.isArray(color) ? color[stacknum % color.length] : color;
+ },
+
+ /**
+ * Render bar(s) for a region
+ */
+ renderRegion: function (valuenum, highlight) {
+ var vals = this.values[valuenum],
+ options = this.options,
+ xaxisOffset = this.xaxisOffset,
+ result = [],
+ range = this.range,
+ stacked = this.stacked,
+ target = this.target,
+ x = valuenum * this.totalBarWidth,
+ canvasHeightEf = this.canvasHeightEf,
+ yoffset = this.yoffset,
+ y, height, color, isNull, yoffsetNeg, i, valcount, val, minPlotted, allMin;
+
+ vals = $.isArray(vals) ? vals : [vals];
+ valcount = vals.length;
+ val = vals[0];
+ isNull = all(null, vals);
+ allMin = all(xaxisOffset, vals, true);
+
+ if (isNull) {
+ if (options.get('nullColor')) {
+ color = highlight ? options.get('nullColor') : this.calcHighlightColor(options.get('nullColor'), options);
+ y = (yoffset > 0) ? yoffset - 1 : yoffset;
+ return target.drawRect(x, y, this.barWidth - 1, 0, color, color);
+ } else {
+ return undefined;
+ }
+ }
+ yoffsetNeg = yoffset;
+ for (i = 0; i < valcount; i++) {
+ val = vals[i];
+
+ if (stacked && val === xaxisOffset) {
+ if (!allMin || minPlotted) {
+ continue;
+ }
+ minPlotted = true;
+ }
+
+ if (range > 0) {
+ height = Math.floor(canvasHeightEf * ((Math.abs(val - xaxisOffset) / range))) + 1;
+ } else {
+ height = 1;
+ }
+ if (val < xaxisOffset || (val === xaxisOffset && yoffset === 0)) {
+ y = yoffsetNeg;
+ yoffsetNeg += height;
+ } else {
+ y = yoffset - height;
+ yoffset -= height;
+ }
+ color = this.calcColor(i, val, valuenum);
+ if (highlight) {
+ color = this.calcHighlightColor(color, options);
+ }
+ result.push(target.drawRect(x, y, this.barWidth - 1, height - 1, color, color));
+ }
+ if (result.length === 1) {
+ return result[0];
+ }
+ return result;
+ }
+ });
+
+ /**
+ * Tristate charts
+ */
+ $.fn.sparkline.tristate = tristate = createClass($.fn.sparkline._base, barHighlightMixin, {
+ type: 'tristate',
+
+ init: function (el, values, options, width, height) {
+ var barWidth = parseInt(options.get('barWidth'), 10),
+ barSpacing = parseInt(options.get('barSpacing'), 10);
+ tristate._super.init.call(this, el, values, options, width, height);
+
+ this.regionShapes = {};
+ this.barWidth = barWidth;
+ this.barSpacing = barSpacing;
+ this.totalBarWidth = barWidth + barSpacing;
+ this.values = $.map(values, Number);
+ this.width = width = (values.length * barWidth) + ((values.length - 1) * barSpacing);
+
+ if ($.isArray(options.get('colorMap'))) {
+ this.colorMapByIndex = options.get('colorMap');
+ this.colorMapByValue = null;
+ } else {
+ this.colorMapByIndex = null;
+ this.colorMapByValue = options.get('colorMap');
+ if (this.colorMapByValue && this.colorMapByValue.get === undefined) {
+ this.colorMapByValue = new RangeMap(this.colorMapByValue);
+ }
+ }
+ this.initTarget();
+ },
+
+ getRegion: function (el, x, y) {
+ return Math.floor(x / this.totalBarWidth);
+ },
+
+ getCurrentRegionFields: function () {
+ var currentRegion = this.currentRegion;
+ return {
+ isNull: this.values[currentRegion] === undefined,
+ value: this.values[currentRegion],
+ color: this.calcColor(this.values[currentRegion], currentRegion),
+ offset: currentRegion
+ };
+ },
+
+ calcColor: function (value, valuenum) {
+ var values = this.values,
+ options = this.options,
+ colorMapByIndex = this.colorMapByIndex,
+ colorMapByValue = this.colorMapByValue,
+ color, newColor;
+
+ if (colorMapByValue && (newColor = colorMapByValue.get(value))) {
+ color = newColor;
+ } else if (colorMapByIndex && colorMapByIndex.length > valuenum) {
+ color = colorMapByIndex[valuenum];
+ } else if (values[valuenum] < 0) {
+ color = options.get('negBarColor');
+ } else if (values[valuenum] > 0) {
+ color = options.get('posBarColor');
+ } else {
+ color = options.get('zeroBarColor');
+ }
+ return color;
+ },
+
+ renderRegion: function (valuenum, highlight) {
+ var values = this.values,
+ options = this.options,
+ target = this.target,
+ canvasHeight, height, halfHeight,
+ x, y, color;
+
+ canvasHeight = target.pixelHeight;
+ halfHeight = Math.round(canvasHeight / 2);
+
+ x = valuenum * this.totalBarWidth;
+ if (values[valuenum] < 0) {
+ y = halfHeight;
+ height = halfHeight - 1;
+ } else if (values[valuenum] > 0) {
+ y = 0;
+ height = halfHeight - 1;
+ } else {
+ y = halfHeight - 1;
+ height = 2;
+ }
+ color = this.calcColor(values[valuenum], valuenum);
+ if (color === null) {
+ return;
+ }
+ if (highlight) {
+ color = this.calcHighlightColor(color, options);
+ }
+ return target.drawRect(x, y, this.barWidth - 1, height - 1, color, color);
+ }
+ });
+
+ /**
+ * Discrete charts
+ */
+ $.fn.sparkline.discrete = discrete = createClass($.fn.sparkline._base, barHighlightMixin, {
+ type: 'discrete',
+
+ init: function (el, values, options, width, height) {
+ discrete._super.init.call(this, el, values, options, width, height);
+
+ this.regionShapes = {};
+ this.values = values = $.map(values, Number);
+ this.min = Math.min.apply(Math, values);
+ this.max = Math.max.apply(Math, values);
+ this.range = this.max - this.min;
+ this.width = width = options.get('width') === 'auto' ? values.length * 2 : this.width;
+ this.interval = Math.floor(width / values.length);
+ this.itemWidth = width / values.length;
+ if (options.get('chartRangeMin') !== undefined && (options.get('chartRangeClip') || options.get('chartRangeMin') < this.min)) {
+ this.min = options.get('chartRangeMin');
+ }
+ if (options.get('chartRangeMax') !== undefined && (options.get('chartRangeClip') || options.get('chartRangeMax') > this.max)) {
+ this.max = options.get('chartRangeMax');
+ }
+ this.initTarget();
+ if (this.target) {
+ this.lineHeight = options.get('lineHeight') === 'auto' ? Math.round(this.canvasHeight * 0.3) : options.get('lineHeight');
+ }
+ },
+
+ getRegion: function (el, x, y) {
+ return Math.floor(x / this.itemWidth);
+ },
+
+ getCurrentRegionFields: function () {
+ var currentRegion = this.currentRegion;
+ return {
+ isNull: this.values[currentRegion] === undefined,
+ value: this.values[currentRegion],
+ offset: currentRegion
+ };
+ },
+
+ renderRegion: function (valuenum, highlight) {
+ var values = this.values,
+ options = this.options,
+ min = this.min,
+ max = this.max,
+ range = this.range,
+ interval = this.interval,
+ target = this.target,
+ canvasHeight = this.canvasHeight,
+ lineHeight = this.lineHeight,
+ pheight = canvasHeight - lineHeight,
+ ytop, val, color, x;
+
+ val = clipval(values[valuenum], min, max);
+ x = valuenum * interval;
+ ytop = Math.round(pheight - pheight * ((val - min) / range));
+ color = (options.get('thresholdColor') && val < options.get('thresholdValue')) ? options.get('thresholdColor') : options.get('lineColor');
+ if (highlight) {
+ color = this.calcHighlightColor(color, options);
+ }
+ return target.drawLine(x, ytop, x, ytop + lineHeight, color);
+ }
+ });
+
+ /**
+ * Bullet charts
+ */
+ $.fn.sparkline.bullet = bullet = createClass($.fn.sparkline._base, {
+ type: 'bullet',
+
+ init: function (el, values, options, width, height) {
+ var min, max, vals;
+ bullet._super.init.call(this, el, values, options, width, height);
+
+ // values: target, performance, range1, range2, range3
+ this.values = values = normalizeValues(values);
+ // target or performance could be null
+ vals = values.slice();
+ vals[0] = vals[0] === null ? vals[2] : vals[0];
+ vals[1] = values[1] === null ? vals[2] : vals[1];
+ min = Math.min.apply(Math, values);
+ max = Math.max.apply(Math, values);
+ if (options.get('base') === undefined) {
+ min = min < 0 ? min : 0;
+ } else {
+ min = options.get('base');
+ }
+ this.min = min;
+ this.max = max;
+ this.range = max - min;
+ this.shapes = {};
+ this.valueShapes = {};
+ this.regiondata = {};
+ this.width = width = options.get('width') === 'auto' ? '4.0em' : width;
+ this.target = this.$el.simpledraw(width, height, options.get('composite'));
+ if (!values.length) {
+ this.disabled = true;
+ }
+ this.initTarget();
+ },
+
+ getRegion: function (el, x, y) {
+ var shapeid = this.target.getShapeAt(el, x, y);
+ return (shapeid !== undefined && this.shapes[shapeid] !== undefined) ? this.shapes[shapeid] : undefined;
+ },
+
+ getCurrentRegionFields: function () {
+ var currentRegion = this.currentRegion;
+ return {
+ fieldkey: currentRegion.substr(0, 1),
+ value: this.values[currentRegion.substr(1)],
+ region: currentRegion
+ };
+ },
+
+ changeHighlight: function (highlight) {
+ var currentRegion = this.currentRegion,
+ shapeid = this.valueShapes[currentRegion],
+ shape;
+ delete this.shapes[shapeid];
+ switch (currentRegion.substr(0, 1)) {
+ case 'r':
+ shape = this.renderRange(currentRegion.substr(1), highlight);
+ break;
+ case 'p':
+ shape = this.renderPerformance(highlight);
+ break;
+ case 't':
+ shape = this.renderTarget(highlight);
+ break;
+ }
+ this.valueShapes[currentRegion] = shape.id;
+ this.shapes[shape.id] = currentRegion;
+ this.target.replaceWithShape(shapeid, shape);
+ },
+
+ renderRange: function (rn, highlight) {
+ var rangeval = this.values[rn],
+ rangewidth = Math.round(this.canvasWidth * ((rangeval - this.min) / this.range)),
+ color = this.options.get('rangeColors')[rn - 2];
+ if (highlight) {
+ color = this.calcHighlightColor(color, this.options);
+ }
+ return this.target.drawRect(0, 0, rangewidth - 1, this.canvasHeight - 1, color, color);
+ },
+
+ renderPerformance: function (highlight) {
+ var perfval = this.values[1],
+ perfwidth = Math.round(this.canvasWidth * ((perfval - this.min) / this.range)),
+ color = this.options.get('performanceColor');
+ if (highlight) {
+ color = this.calcHighlightColor(color, this.options);
+ }
+ return this.target.drawRect(0, Math.round(this.canvasHeight * 0.3), perfwidth - 1,
+ Math.round(this.canvasHeight * 0.4) - 1, color, color);
+ },
+
+ renderTarget: function (highlight) {
+ var targetval = this.values[0],
+ x = Math.round(this.canvasWidth * ((targetval - this.min) / this.range) - (this.options.get('targetWidth') / 2)),
+ targettop = Math.round(this.canvasHeight * 0.10),
+ targetheight = this.canvasHeight - (targettop * 2),
+ color = this.options.get('targetColor');
+ if (highlight) {
+ color = this.calcHighlightColor(color, this.options);
+ }
+ return this.target.drawRect(x, targettop, this.options.get('targetWidth') - 1, targetheight - 1, color, color);
+ },
+
+ render: function () {
+ var vlen = this.values.length,
+ target = this.target,
+ i, shape;
+ if (!bullet._super.render.call(this)) {
+ return;
+ }
+ for (i = 2; i < vlen; i++) {
+ shape = this.renderRange(i).append();
+ this.shapes[shape.id] = 'r' + i;
+ this.valueShapes['r' + i] = shape.id;
+ }
+ if (this.values[1] !== null) {
+ shape = this.renderPerformance().append();
+ this.shapes[shape.id] = 'p1';
+ this.valueShapes.p1 = shape.id;
+ }
+ if (this.values[0] !== null) {
+ shape = this.renderTarget().append();
+ this.shapes[shape.id] = 't0';
+ this.valueShapes.t0 = shape.id;
+ }
+ target.render();
+ }
+ });
+
+ /**
+ * Pie charts
+ */
+ $.fn.sparkline.pie = pie = createClass($.fn.sparkline._base, {
+ type: 'pie',
+
+ init: function (el, values, options, width, height) {
+ var total = 0, i;
+
+ pie._super.init.call(this, el, values, options, width, height);
+
+ this.shapes = {}; // map shape ids to value offsets
+ this.valueShapes = {}; // maps value offsets to shape ids
+ this.values = values = $.map(values, Number);
+
+ if (options.get('width') === 'auto') {
+ this.width = this.height;
+ }
+
+ if (values.length > 0) {
+ for (i = values.length; i--;) {
+ total += values[i];
+ }
+ }
+ this.total = total;
+ this.initTarget();
+ this.radius = Math.floor(Math.min(this.canvasWidth, this.canvasHeight) / 2);
+ },
+
+ getRegion: function (el, x, y) {
+ var shapeid = this.target.getShapeAt(el, x, y);
+ return (shapeid !== undefined && this.shapes[shapeid] !== undefined) ? this.shapes[shapeid] : undefined;
+ },
+
+ getCurrentRegionFields: function () {
+ var currentRegion = this.currentRegion;
+ return {
+ isNull: this.values[currentRegion] === undefined,
+ value: this.values[currentRegion],
+ percent: this.values[currentRegion] / this.total * 100,
+ color: this.options.get('sliceColors')[currentRegion % this.options.get('sliceColors').length],
+ offset: currentRegion
+ };
+ },
+
+ changeHighlight: function (highlight) {
+ var currentRegion = this.currentRegion,
+ newslice = this.renderSlice(currentRegion, highlight),
+ shapeid = this.valueShapes[currentRegion];
+ delete this.shapes[shapeid];
+ this.target.replaceWithShape(shapeid, newslice);
+ this.valueShapes[currentRegion] = newslice.id;
+ this.shapes[newslice.id] = currentRegion;
+ },
+
+ renderSlice: function (valuenum, highlight) {
+ var target = this.target,
+ options = this.options,
+ radius = this.radius,
+ borderWidth = options.get('borderWidth'),
+ offset = options.get('offset'),
+ circle = 2 * Math.PI,
+ values = this.values,
+ total = this.total,
+ next = offset ? (2*Math.PI)*(offset/360) : 0,
+ start, end, i, vlen, color;
+
+ vlen = values.length;
+ for (i = 0; i < vlen; i++) {
+ start = next;
+ end = next;
+ if (total > 0) { // avoid divide by zero
+ end = next + (circle * (values[i] / total));
+ }
+ if (valuenum === i) {
+ color = options.get('sliceColors')[i % options.get('sliceColors').length];
+ if (highlight) {
+ color = this.calcHighlightColor(color, options);
+ }
+
+ return target.drawPieSlice(radius, radius, radius - borderWidth, start, end, undefined, color);
+ }
+ next = end;
+ }
+ },
+
+ render: function () {
+ var target = this.target,
+ values = this.values,
+ options = this.options,
+ radius = this.radius,
+ borderWidth = options.get('borderWidth'),
+ shape, i;
+
+ if (!pie._super.render.call(this)) {
+ return;
+ }
+ if (borderWidth) {
+ target.drawCircle(radius, radius, Math.floor(radius - (borderWidth / 2)),
+ options.get('borderColor'), undefined, borderWidth).append();
+ }
+ for (i = values.length; i--;) {
+ if (values[i]) { // don't render zero values
+ shape = this.renderSlice(i).append();
+ this.valueShapes[i] = shape.id; // store just the shapeid
+ this.shapes[shape.id] = i;
+ }
+ }
+ target.render();
+ }
+ });
+
+ /**
+ * Box plots
+ */
+ $.fn.sparkline.box = box = createClass($.fn.sparkline._base, {
+ type: 'box',
+
+ init: function (el, values, options, width, height) {
+ box._super.init.call(this, el, values, options, width, height);
+ this.values = $.map(values, Number);
+ this.width = options.get('width') === 'auto' ? '4.0em' : width;
+ this.initTarget();
+ if (!this.values.length) {
+ this.disabled = 1;
+ }
+ },
+
+ /**
+ * Simulate a single region
+ */
+ getRegion: function () {
+ return 1;
+ },
+
+ getCurrentRegionFields: function () {
+ var result = [
+ { field: 'lq', value: this.quartiles[0] },
+ { field: 'med', value: this.quartiles[1] },
+ { field: 'uq', value: this.quartiles[2] }
+ ];
+ if (this.loutlier !== undefined) {
+ result.push({ field: 'lo', value: this.loutlier});
+ }
+ if (this.routlier !== undefined) {
+ result.push({ field: 'ro', value: this.routlier});
+ }
+ if (this.lwhisker !== undefined) {
+ result.push({ field: 'lw', value: this.lwhisker});
+ }
+ if (this.rwhisker !== undefined) {
+ result.push({ field: 'rw', value: this.rwhisker});
+ }
+ return result;
+ },
+
+ render: function () {
+ var target = this.target,
+ values = this.values,
+ vlen = values.length,
+ options = this.options,
+ canvasWidth = this.canvasWidth,
+ canvasHeight = this.canvasHeight,
+ minValue = options.get('chartRangeMin') === undefined ? Math.min.apply(Math, values) : options.get('chartRangeMin'),
+ maxValue = options.get('chartRangeMax') === undefined ? Math.max.apply(Math, values) : options.get('chartRangeMax'),
+ canvasLeft = 0,
+ lwhisker, loutlier, iqr, q1, q2, q3, rwhisker, routlier, i,
+ size, unitSize;
+
+ if (!box._super.render.call(this)) {
+ return;
+ }
+
+ if (options.get('raw')) {
+ if (options.get('showOutliers') && values.length > 5) {
+ loutlier = values[0];
+ lwhisker = values[1];
+ q1 = values[2];
+ q2 = values[3];
+ q3 = values[4];
+ rwhisker = values[5];
+ routlier = values[6];
+ } else {
+ lwhisker = values[0];
+ q1 = values[1];
+ q2 = values[2];
+ q3 = values[3];
+ rwhisker = values[4];
+ }
+ } else {
+ values.sort(function (a, b) { return a - b; });
+ q1 = quartile(values, 1);
+ q2 = quartile(values, 2);
+ q3 = quartile(values, 3);
+ iqr = q3 - q1;
+ if (options.get('showOutliers')) {
+ lwhisker = rwhisker = undefined;
+ for (i = 0; i < vlen; i++) {
+ if (lwhisker === undefined && values[i] > q1 - (iqr * options.get('outlierIQR'))) {
+ lwhisker = values[i];
+ }
+ if (values[i] < q3 + (iqr * options.get('outlierIQR'))) {
+ rwhisker = values[i];
+ }
+ }
+ loutlier = values[0];
+ routlier = values[vlen - 1];
+ } else {
+ lwhisker = values[0];
+ rwhisker = values[vlen - 1];
+ }
+ }
+ this.quartiles = [q1, q2, q3];
+ this.lwhisker = lwhisker;
+ this.rwhisker = rwhisker;
+ this.loutlier = loutlier;
+ this.routlier = routlier;
+
+ unitSize = canvasWidth / (maxValue - minValue + 1);
+ if (options.get('showOutliers')) {
+ canvasLeft = Math.ceil(options.get('spotRadius'));
+ canvasWidth -= 2 * Math.ceil(options.get('spotRadius'));
+ unitSize = canvasWidth / (maxValue - minValue + 1);
+ if (loutlier < lwhisker) {
+ target.drawCircle((loutlier - minValue) * unitSize + canvasLeft,
+ canvasHeight / 2,
+ options.get('spotRadius'),
+ options.get('outlierLineColor'),
+ options.get('outlierFillColor')).append();
+ }
+ if (routlier > rwhisker) {
+ target.drawCircle((routlier - minValue) * unitSize + canvasLeft,
+ canvasHeight / 2,
+ options.get('spotRadius'),
+ options.get('outlierLineColor'),
+ options.get('outlierFillColor')).append();
+ }
+ }
+
+ // box
+ target.drawRect(
+ Math.round((q1 - minValue) * unitSize + canvasLeft),
+ Math.round(canvasHeight * 0.1),
+ Math.round((q3 - q1) * unitSize),
+ Math.round(canvasHeight * 0.8),
+ options.get('boxLineColor'),
+ options.get('boxFillColor')).append();
+ // left whisker
+ target.drawLine(
+ Math.round((lwhisker - minValue) * unitSize + canvasLeft),
+ Math.round(canvasHeight / 2),
+ Math.round((q1 - minValue) * unitSize + canvasLeft),
+ Math.round(canvasHeight / 2),
+ options.get('lineColor')).append();
+ target.drawLine(
+ Math.round((lwhisker - minValue) * unitSize + canvasLeft),
+ Math.round(canvasHeight / 4),
+ Math.round((lwhisker - minValue) * unitSize + canvasLeft),
+ Math.round(canvasHeight - canvasHeight / 4),
+ options.get('whiskerColor')).append();
+ // right whisker
+ target.drawLine(Math.round((rwhisker - minValue) * unitSize + canvasLeft),
+ Math.round(canvasHeight / 2),
+ Math.round((q3 - minValue) * unitSize + canvasLeft),
+ Math.round(canvasHeight / 2),
+ options.get('lineColor')).append();
+ target.drawLine(
+ Math.round((rwhisker - minValue) * unitSize + canvasLeft),
+ Math.round(canvasHeight / 4),
+ Math.round((rwhisker - minValue) * unitSize + canvasLeft),
+ Math.round(canvasHeight - canvasHeight / 4),
+ options.get('whiskerColor')).append();
+ // median line
+ target.drawLine(
+ Math.round((q2 - minValue) * unitSize + canvasLeft),
+ Math.round(canvasHeight * 0.1),
+ Math.round((q2 - minValue) * unitSize + canvasLeft),
+ Math.round(canvasHeight * 0.9),
+ options.get('medianColor')).append();
+ if (options.get('target')) {
+ size = Math.ceil(options.get('spotRadius'));
+ target.drawLine(
+ Math.round((options.get('target') - minValue) * unitSize + canvasLeft),
+ Math.round((canvasHeight / 2) - size),
+ Math.round((options.get('target') - minValue) * unitSize + canvasLeft),
+ Math.round((canvasHeight / 2) + size),
+ options.get('targetColor')).append();
+ target.drawLine(
+ Math.round((options.get('target') - minValue) * unitSize + canvasLeft - size),
+ Math.round(canvasHeight / 2),
+ Math.round((options.get('target') - minValue) * unitSize + canvasLeft + size),
+ Math.round(canvasHeight / 2),
+ options.get('targetColor')).append();
+ }
+ target.render();
+ }
+ });
+
+ // Setup a very simple "virtual canvas" to make drawing the few shapes we need easier
+ // This is accessible as $(foo).simpledraw()
+
+ // Detect browser renderer support
+ (function() {
+ if (document.namespaces && !document.namespaces.v) {
+ $.fn.sparkline.hasVML = true;
+ document.namespaces.add('v', 'urn:schemas-microsoft-com:vml', '#default#VML');
+ } else {
+ $.fn.sparkline.hasVML = false;
+ }
+
+ var el = document.createElement('canvas');
+ $.fn.sparkline.hasCanvas = !!(el.getContext && el.getContext('2d'));
+
+ })()
+
+ VShape = createClass({
+ init: function (target, id, type, args) {
+ this.target = target;
+ this.id = id;
+ this.type = type;
+ this.args = args;
+ },
+ append: function () {
+ this.target.appendShape(this);
+ return this;
+ }
+ });
+
+ VCanvas_base = createClass({
+ _pxregex: /(\d+)(px)?\s*$/i,
+
+ init: function (width, height, target) {
+ if (!width) {
+ return;
+ }
+ this.width = width;
+ this.height = height;
+ this.target = target;
+ this.lastShapeId = null;
+ if (target[0]) {
+ target = target[0];
+ }
+ $.data(target, '_jqs_vcanvas', this);
+ },
+
+ drawLine: function (x1, y1, x2, y2, lineColor, lineWidth) {
+ return this.drawShape([[x1, y1], [x2, y2]], lineColor, lineWidth);
+ },
+
+ drawShape: function (path, lineColor, fillColor, lineWidth) {
+ return this._genShape('Shape', [path, lineColor, fillColor, lineWidth]);
+ },
+
+ drawCircle: function (x, y, radius, lineColor, fillColor, lineWidth) {
+ return this._genShape('Circle', [x, y, radius, lineColor, fillColor, lineWidth]);
+ },
+
+ drawPieSlice: function (x, y, radius, startAngle, endAngle, lineColor, fillColor) {
+ return this._genShape('PieSlice', [x, y, radius, startAngle, endAngle, lineColor, fillColor]);
+ },
+
+ drawRect: function (x, y, width, height, lineColor, fillColor) {
+ return this._genShape('Rect', [x, y, width, height, lineColor, fillColor]);
+ },
+
+ getElement: function () {
+ return this.canvas;
+ },
+
+ /**
+ * Return the most recently inserted shape id
+ */
+ getLastShapeId: function () {
+ return this.lastShapeId;
+ },
+
+ /**
+ * Clear and reset the canvas
+ */
+ reset: function () {
+ alert('reset not implemented');
+ },
+
+ _insert: function (el, target) {
+ $(target).html(el);
+ },
+
+ /**
+ * Calculate the pixel dimensions of the canvas
+ */
+ _calculatePixelDims: function (width, height, canvas) {
+ // XXX This should probably be a configurable option
+ var match;
+ match = this._pxregex.exec(height);
+ if (match) {
+ this.pixelHeight = match[1];
+ } else {
+ this.pixelHeight = $(canvas).height();
+ }
+ match = this._pxregex.exec(width);
+ if (match) {
+ this.pixelWidth = match[1];
+ } else {
+ this.pixelWidth = $(canvas).width();
+ }
+ },
+
+ /**
+ * Generate a shape object and id for later rendering
+ */
+ _genShape: function (shapetype, shapeargs) {
+ var id = shapeCount++;
+ shapeargs.unshift(id);
+ return new VShape(this, id, shapetype, shapeargs);
+ },
+
+ /**
+ * Add a shape to the end of the render queue
+ */
+ appendShape: function (shape) {
+ alert('appendShape not implemented');
+ },
+
+ /**
+ * Replace one shape with another
+ */
+ replaceWithShape: function (shapeid, shape) {
+ alert('replaceWithShape not implemented');
+ },
+
+ /**
+ * Insert one shape after another in the render queue
+ */
+ insertAfterShape: function (shapeid, shape) {
+ alert('insertAfterShape not implemented');
+ },
+
+ /**
+ * Remove a shape from the queue
+ */
+ removeShapeId: function (shapeid) {
+ alert('removeShapeId not implemented');
+ },
+
+ /**
+ * Find a shape at the specified x/y co-ordinates
+ */
+ getShapeAt: function (el, x, y) {
+ alert('getShapeAt not implemented');
+ },
+
+ /**
+ * Render all queued shapes onto the canvas
+ */
+ render: function () {
+ alert('render not implemented');
+ }
+ });
+
+ VCanvas_canvas = createClass(VCanvas_base, {
+ init: function (width, height, target, interact) {
+ VCanvas_canvas._super.init.call(this, width, height, target);
+ this.canvas = document.createElement('canvas');
+ if (target[0]) {
+ target = target[0];
+ }
+ $.data(target, '_jqs_vcanvas', this);
+ $(this.canvas).css({ display: 'inline-block', width: width, height: height, verticalAlign: 'top' });
+ this._insert(this.canvas, target);
+ this._calculatePixelDims(width, height, this.canvas);
+ this.canvas.width = this.pixelWidth;
+ this.canvas.height = this.pixelHeight;
+ this.interact = interact;
+ this.shapes = {};
+ this.shapeseq = [];
+ this.currentTargetShapeId = undefined;
+ $(this.canvas).css({width: this.pixelWidth, height: this.pixelHeight});
+ },
+
+ _getContext: function (lineColor, fillColor, lineWidth) {
+ var context = this.canvas.getContext('2d');
+ if (lineColor !== undefined) {
+ context.strokeStyle = lineColor;
+ }
+ context.lineWidth = lineWidth === undefined ? 1 : lineWidth;
+ if (fillColor !== undefined) {
+ context.fillStyle = fillColor;
+ }
+ return context;
+ },
+
+ reset: function () {
+ var context = this._getContext();
+ context.clearRect(0, 0, this.pixelWidth, this.pixelHeight);
+ this.shapes = {};
+ this.shapeseq = [];
+ this.currentTargetShapeId = undefined;
+ },
+
+ _drawShape: function (shapeid, path, lineColor, fillColor, lineWidth) {
+ var context = this._getContext(lineColor, fillColor, lineWidth),
+ i, plen;
+ context.beginPath();
+ context.moveTo(path[0][0] + 0.5, path[0][1] + 0.5);
+ for (i = 1, plen = path.length; i < plen; i++) {
+ context.lineTo(path[i][0] + 0.5, path[i][1] + 0.5); // the 0.5 offset gives us crisp pixel-width lines
+ }
+ if (lineColor !== undefined) {
+ context.stroke();
+ }
+ if (fillColor !== undefined) {
+ context.fill();
+ }
+ if (this.targetX !== undefined && this.targetY !== undefined &&
+ context.isPointInPath(this.targetX, this.targetY)) {
+ this.currentTargetShapeId = shapeid;
+ }
+ },
+
+ _drawCircle: function (shapeid, x, y, radius, lineColor, fillColor, lineWidth) {
+ var context = this._getContext(lineColor, fillColor, lineWidth);
+ context.beginPath();
+ context.arc(x, y, radius, 0, 2 * Math.PI, false);
+ if (this.targetX !== undefined && this.targetY !== undefined &&
+ context.isPointInPath(this.targetX, this.targetY)) {
+ this.currentTargetShapeId = shapeid;
+ }
+ if (lineColor !== undefined) {
+ context.stroke();
+ }
+ if (fillColor !== undefined) {
+ context.fill();
+ }
+ },
+
+ _drawPieSlice: function (shapeid, x, y, radius, startAngle, endAngle, lineColor, fillColor) {
+ var context = this._getContext(lineColor, fillColor);
+ context.beginPath();
+ context.moveTo(x, y);
+ context.arc(x, y, radius, startAngle, endAngle, false);
+ context.lineTo(x, y);
+ context.closePath();
+ if (lineColor !== undefined) {
+ context.stroke();
+ }
+ if (fillColor) {
+ context.fill();
+ }
+ if (this.targetX !== undefined && this.targetY !== undefined &&
+ context.isPointInPath(this.targetX, this.targetY)) {
+ this.currentTargetShapeId = shapeid;
+ }
+ },
+
+ _drawRect: function (shapeid, x, y, width, height, lineColor, fillColor) {
+ return this._drawShape(shapeid, [[x, y], [x + width, y], [x + width, y + height], [x, y + height], [x, y]], lineColor, fillColor);
+ },
+
+ appendShape: function (shape) {
+ this.shapes[shape.id] = shape;
+ this.shapeseq.push(shape.id);
+ this.lastShapeId = shape.id;
+ return shape.id;
+ },
+
+ replaceWithShape: function (shapeid, shape) {
+ var shapeseq = this.shapeseq,
+ i;
+ this.shapes[shape.id] = shape;
+ for (i = shapeseq.length; i--;) {
+ if (shapeseq[i] == shapeid) {
+ shapeseq[i] = shape.id;
+ }
+ }
+ delete this.shapes[shapeid];
+ },
+
+ replaceWithShapes: function (shapeids, shapes) {
+ var shapeseq = this.shapeseq,
+ shapemap = {},
+ sid, i, first;
+
+ for (i = shapeids.length; i--;) {
+ shapemap[shapeids[i]] = true;
+ }
+ for (i = shapeseq.length; i--;) {
+ sid = shapeseq[i];
+ if (shapemap[sid]) {
+ shapeseq.splice(i, 1);
+ delete this.shapes[sid];
+ first = i;
+ }
+ }
+ for (i = shapes.length; i--;) {
+ shapeseq.splice(first, 0, shapes[i].id);
+ this.shapes[shapes[i].id] = shapes[i];
+ }
+
+ },
+
+ insertAfterShape: function (shapeid, shape) {
+ var shapeseq = this.shapeseq,
+ i;
+ for (i = shapeseq.length; i--;) {
+ if (shapeseq[i] === shapeid) {
+ shapeseq.splice(i + 1, 0, shape.id);
+ this.shapes[shape.id] = shape;
+ return;
+ }
+ }
+ },
+
+ removeShapeId: function (shapeid) {
+ var shapeseq = this.shapeseq,
+ i;
+ for (i = shapeseq.length; i--;) {
+ if (shapeseq[i] === shapeid) {
+ shapeseq.splice(i, 1);
+ break;
+ }
+ }
+ delete this.shapes[shapeid];
+ },
+
+ getShapeAt: function (el, x, y) {
+ this.targetX = x;
+ this.targetY = y;
+ this.render();
+ return this.currentTargetShapeId;
+ },
+
+ render: function () {
+ var shapeseq = this.shapeseq,
+ shapes = this.shapes,
+ shapeCount = shapeseq.length,
+ context = this._getContext(),
+ shapeid, shape, i;
+ context.clearRect(0, 0, this.pixelWidth, this.pixelHeight);
+ for (i = 0; i < shapeCount; i++) {
+ shapeid = shapeseq[i];
+ shape = shapes[shapeid];
+ this['_draw' + shape.type].apply(this, shape.args);
+ }
+ if (!this.interact) {
+ // not interactive so no need to keep the shapes array
+ this.shapes = {};
+ this.shapeseq = [];
+ }
+ }
+
+ });
+
+ VCanvas_vml = createClass(VCanvas_base, {
+ init: function (width, height, target) {
+ var groupel;
+ VCanvas_vml._super.init.call(this, width, height, target);
+ if (target[0]) {
+ target = target[0];
+ }
+ $.data(target, '_jqs_vcanvas', this);
+ this.canvas = document.createElement('span');
+ $(this.canvas).css({ display: 'inline-block', position: 'relative', overflow: 'hidden', width: width, height: height, margin: '0px', padding: '0px', verticalAlign: 'top'});
+ this._insert(this.canvas, target);
+ this._calculatePixelDims(width, height, this.canvas);
+ this.canvas.width = this.pixelWidth;
+ this.canvas.height = this.pixelHeight;
+ groupel = '
-
-
-
+
+
+
+
+
+ oe_kanban_text_red
+ :
+
+
+
+
+
+ Enterprise Social Network
+A private social network for your company
+
+
+
+
+ 
+
+
+
+
+
+
+
+
+ +Connect with experts, follow what interests you, share documents and promote +best practices. Get work done with effective collaboration across departments, +geographies, documents and business applications. All of this while decreasing +email overload. + +
+ +
+
+Connect with experts
+Get the right information, when you need it
+
+
+ +Next time you have a question for the marketing, sales, R&D or any other +department, don't send an email blast-post the question to OpenERP and get +answers from the right persons. +
+
+
+
+ 
+
+
+
+
+Follow what interests you
+Make the information flow across your company
+
+
+
+ 
+
+
+
+
+ +Want to get informed about new product features, hot deals, bottlenecks in projects or any other event? Just follow what interests you to get the information you need what you need; no more, no less. +
+
+
+Get Things Done
+Your inbox is a todo list
+
+
+ +You can process (not only read) the inbox and easily mark messages for future actions. Start feeling the pleasure of having an empty inbox every day; no more overload of information. +
+
+
+
+ 
+
+
+
+
+Promote best practices
+Discussion groups at your fingertips
+
+
+
+ 
+
+
+
+
+ +Cut back on meetings and email chains by working together in groups of interests. Create a group to let people share files, discuss ideas, and vote to promote best practices. +
+
+
+Improve Access to Information and Expertise
+Easily find the information you need
+
+
+ +Break down information silos. Search across your existing systems to find the answers and expertise you need to complete projects quickly. +
+
+
+
+ 
+
+
+
+
+Collaborate securely
+
+
+
+ 
+
+
+
+
+ +Set the right security policy; public, private or on invitation only -- according to the information sensitivity. +
+
+
+A Twitter-like Network For Your Company
+
+
+ +Make every employee feel more connected and engaged with twitter-like features +for your own company. Follow people, share best practices, 'like' top ideas, etc. +
+
+
+
+ 
+
+
+
+
+
+
+ Trusted by millions worldwide
+
+
+
+ 
+
+
+
+ + Emails make me waste my time. But I need them. Reading my inbox + is the most unproductive task I do on a daily basis. I have to + spend one or two full hours a day to process my emails. All the + junk flows in the same inbox; spams, information that doesn't + matter, quoted answers of quoted answers, etc. At the end of + the hour, only 10 emails actually requested an answer from me. + Since I use OpenERP, I can do the same job in only 10 minutes! ++ +
+
+
+ Followers
- + Add others\nPlease call me as soon as possible this afternoon!\n\n--\nSylvie\n', 'message_process: plaintext incoming email incorrectly parsed') + @mute_logger('openerp.addons.mail.mail_thread', 'openerp.osv.orm') def test_20_thread_parent_resolution(self): """ Testing parent/child relationships are correctly established when processing incoming mails """ cr, uid = self.cr, self.uid diff --git a/addons/mail/wizard/invite.py b/addons/mail/wizard/invite.py index 4ff6584d789..a6bfc34c213 100644 --- a/addons/mail/wizard/invite.py +++ b/addons/mail/wizard/invite.py @@ -75,7 +75,7 @@ class invite_wizard(osv.osv_memory): model_name = ir_model.name_get(cr, uid, model_ids, context=context)[0][1] # send an email if option checked and if a message exists (do not send void emails) - if wizard.send_mail and wizard.message: + if wizard.send_mail and wizard.message and not wizard.message == '
': # 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/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py index dfda3038de8..7bf4d47d1ff 100644 --- a/addons/mail/wizard/mail_compose_message.py +++ b/addons/mail/wizard/mail_compose_message.py @@ -270,6 +270,7 @@ class mail_compose_message(osv.TransientModel): context.pop('default_partner_ids', None) # post the message if mass_mail_mode and not wizard.post: + post_values['body_html'] = post_values.get('body', '') post_values['recipient_ids'] = [(4, id) for id in post_values.pop('partner_ids', [])] self.pool.get('mail.mail').create(cr, uid, post_values, context=context) else: diff --git a/addons/marketing_campaign/marketing_campaign_demo.xml b/addons/marketing_campaign/marketing_campaign_demo.xml index 92443fe987d..89a299e3a85 100644 --- a/addons/marketing_campaign/marketing_campaign_demo.xml +++ b/addons/marketing_campaign/marketing_campaign_demo.xml @@ -1,4 +1,3 @@ -
Thanks for the genuine interest you have shown in OpenERP.
-If any further information is required, do not hesitate to reply to this message.
-Regards,OpenERP Team,
]]>We have very good offer that might suit you. - We suggest you subscribe to the OpenERP Discovery Day on May 2010.
-If any further information is required, do not hesitate to reply to this message.
-Regards,OpenERP Team,
]]>Thanks for showing interest and for subscribing to the OpenERP Discovery Day.
-If any further information is required, do not hesitate to reply to this message.
-Regards,OpenERP Team,
]]>Thanks for showing interest and buying the OpenERP book.
+Regards,OpenERP Team,
]]>We have very good offer that might suit you. - For our gold partners,We are arranging free technical training on june,2010.
-If any further information is required, do not hesitate to reply to this message.
-Regards,OpenERP Team,
]]>We have very good offer that might suit you. - For our silver partners,We are paid technical training on june,2010.
-If any further information is required, do not hesitate to reply to this message.
-Regards,OpenERP Team,
]]>We have very good offer that might suit you. - For our silver partners, we are offering Gold partnership.
-If any further information is required, do not hesitate to reply to this message.
-Regards,OpenERP Team,
]]>Thanks for showing interest and for subscribing to technical training.
- If any further information required kindly revert back.I really appreciate your co-operation on this. -If any further information is required, do not hesitate to reply to this message.
-Regards,OpenERP Team,
]]>
+
+
+
+ Manufacturing Resource Planning
+Manage Bill of Materials, Plan Manufacturing Orders, Track Work Orders
+
+
+
+
+ 
+
+
+
+
+
+
+
+
+ +Get all your assembly or manufacturing operations managed by OpenERP. Schedule +manufacturing orders and work orders automatically. Review the proposed +planning with the smart kanban and gantt views. Use the advanced analytics +features to detect bottleneck in resources capacities and inventory locations. +
+ +
+
+Schedule Manufacuring Orders Efficiently
+
+
+ +Get manufacturing orders and work orders scheduled automatically based on your +procurement rules, quantities forecasted and dependent demand (demand for this +part based on another part consuming it). +
+
+ 
+
+
+
+
+Define Flexible Master Data
+Products, Bill of Materials and Routings
+
+ 
+
+
+
+
+ +Get the flexibility to create multi-level bill of materials, optional routing, +version changes and phantom bill of materials. You can use BoM for kits or for +manufacturing orders. +
+
+
+Get Flexibility In All Opertions
+
+
+ + Edit manually all proposed operations at any level of the progress. + With OpenERP, you will not be frustrated by a rigid system. +
+
+ 
+
+
+
+
+Schedule Work Orders
+Check resources capacities and fix bottlenecks
+
+
+
+ 
+
+
+
+
+ +Define routings and plan the working time and capacity of your resources. +Quickly identify resource requirements and bottlenecks to ensure your production +meets your delivery schedule dates. +
+
+ 
+
+ Download our free E-book
+
+
+
+A Productive User Interface
+Work with lists, calendars or gantt charts
+
+
+ +Organize manufacturing orders and work orders the way you like it. Process next +orders from the list view, control inthe calendar view and edit the proposed +schedule in the Gantt view. +
+
+
+ Lists
+
+ 
+
+
+
+ 
+
+
+ Gantt Charts
+
+
+
+
+
+ Calendar
+
+
+
+Inventory & Manufacturing Analytics
+
+
+
+
+
+
+
+
+ +Track the evolution of the stock value, according to the level of manufacturing +activities as they progress in the transformation process. +
+
+
+Fully Integrated with Operations
+Sales, Purchases and Accounting integration
+
+
+ +Get your manufacturing resource planning accurate with it's full integration +with sales and purchases apps. The accounting integration allows real time +accounting valuation and deeper reporting on costs and revenues on your +manufacturing operations. +
+
+
+
+ 
+
+
+
+
+
+
+ Many companies already enjoy it
+Hear what they have to say !
+
+
+
+ 
+
+
+ + OpenERP allowed our company to efficiently manage a growth from a turnover of 2.4m€ to 15m€ in 4 years. ++ +
+
+ President at Coppernic.
+
+
+
+Notes
+Getting Things Done with Notes
+
+
+
+
+ 
+
+
+
+
+
+
+
+
+ +Organize yourself with efficient todo lists and notes. From personnal tasks to collaborative meeting minutes, increase your user's productivity by giving them the tools to prioritize their work, share their ideas and collaborate on documents. +
+ +
+
+
+
+ Personal to-do lists that works
++Quickly create to-dos, organize horizontally for the mid-term (today, this week, this month, ...), prioritize vertically for the short term and group by assigning colors. The kanban approach allows a simple visual organization of your to-dos. +
+
+ 
+
+
+
+
+ Beat Work Overload
++ Feel how good it is to rely on a structured way to organize your work instead of keeping everything in memory. Use notes to Get Things Done. +
+
+
+ Prioritize Efficiently
++ Most people are lost in the flow of urgent daily tasks and have difficulties to work on important, long-term tasks. Notes gives you a simple way to allocate time very day to do important, but less urgent tasks. +
+
+
+ Find Motivation to Close Tasks
++ People used to work on tasks they like and not on important tasks. Start feeling good by checking tasks as done. +
+
+ 
+
+
+Adapts to Your Creative Process
+Customize to your own workflow
++Everyone has their own way to organize activities. OpenERP Notes' smart kanban approach allows every user to customize their own steps to process it's to-dos and notes. +
+
+
+
+
+ A Creative Person
++A creative person will organize notes based on idea's maturity level: Draft Ideas Mature Ideas Specified To Do
+
+
+ A Frequent Traveler
++ An employee travelling a lot can organize their tasks based on the context to perform the task: U.S. Office | London's Office | To Review during Flights | At Home +
+
+
+
+ A Manager
++ A manager will organize their high number of tasks based on prioritizations: Todo Today | This Week | This Month | Later +
+
+Personnal Notes
+Notes are private but can be shared
+
+
+
+ 
+
+
+
+
+ +Write down your ideas in pads, keep your notes at your finger tips, attach related documents and use tags and colors to organize the information. Once your ideas are mature, you can share them to others users, start discussing it and collaborate by improving the specification in the pad. +
+
+
+Collaborative Meeting Minutes
+Real-time sharing and edition of notes
+
+
+ +The real time collaborative writings on notes makes it the perfect tool to collaborate on meeting minutes. Attendees will be able to contribute to the minutes, attach important documents or discuss on the related thread. +
+
+ 
+
+
+ Click to add a personal note. @@ -193,7 +193,7 @@
+
+
+
+ A very friendly Point of Sale
+Set up in a minute, Sell in seconds
+
+
+
+
+ 
+
+
+
+
+
+
+
+
+ + OpenERP's Point of Sale introduces a super clean interface with no installation required + that runs online and offline on modern hardwares. +
++ It's full integration with the company inventory and accounting, gives you real time statistics and + consolidations amongst all shops without the hassle of integrating several applications. +
+ +
+
+
+
+ Work with the hardware you already have
+Desktops, laptops, tablets, it runs on everything
+
+ 
+
+
+
+
+ In your web browser
++ OpenERP's POS is a web application that can run on any device that can + display websites with little to no setup required. +
+
+
+ Touchscreen or Keyboard ?
++ The Point of Sale works perfectly on any kind of touch enabled device, whether it's + multi-touch tablets like an iPad or keyboardless resistive touchscreen terminals. +
+
+
+ Scales and Printers
++ Barcode scanners and printers are supported out of the box with no setup required. + Scales, cashboxes, and other peripherals can be used with the + proxy API. +
+
+
+
+Online and Offline
+OpenERP's POS stays reliable even if your connection isn't
+ +
+
+
+ 
+
+
+
+
+ + Deploy new stores with just an internet connection: + no installation, no specific hardware required. It works with any + iPad, Tablet PC, laptop or industrial POS machine. +
+ While an internet connection is required to start the Point of Sale, + it will stay operational even after a complete disconnection. +
+
+
+
+ Download our free E-book
+
+
+
+ A super clean user interface
+The point of sale software retailers love to use
+
+
+
+ 
+
+
+ Simple and beautifull
++ Say goodbye to ugly, outdated POS software and enjoy the OpenERP + web interface designed for modern retailer. +
+
+ 
+
+
+ Designed for Productivity
++ Whether it's for a restaurant or a shop, you can activate the multiple + tickets in parallel to not make your customers wait. +
+
+ 
+
+
+ Blasting fast search
++ Scan products, browse through hyerarchical categories, or get quick + information about products with the blasting fast filter accross + all your products. +
+
+
+Integrated Inventory Management
+
+ 
+
+
+
+
+ + Consolidate all your sales channel in real time: stores, ecommerce, sales teams. + Get real time control of the inventory and accurate forecasts to manage procurements. +
++ A full warehouse management system at your fingertips: get information + about products availabilities, trigger procurement requests, etc. +
+
+
+Deliver in-store customer services
+Repairs, warantees, deliveries, etc.
+
+
+ + Give your shopper a strong experience by integrating in-store + customer services. Handle reparations, track warantees, follow + customer claims, plan delivery orders, etc. +
+
+ 
+
+
+
+
+Invoicing & Accounting Integration
+
+ 
+
+
+
+
+ + Produce customer invoices in just a few clicks. Control sales and + cash in real time and use OpenERP's powerful reporting to make + smarter decisions to improve your store's efficiency. +
+ No more hassle of having to integrate softwares: get all your sales + and inventory operations automatically posted in your G/L. +
+
+
+Self-checkout Interface
+
+
+ + Reduce costs by limitting the number of required cashiers. + The self-checkout mode allows customers to scan products and pay by + themselves with a dedicated and super easy user interface. +
++ Use lights and sounds to control the checkout distantly. +
+
+ 
+
+
+
+
+Unified Data Amongst All Shops
+Sync products, prices, customers with no effort
+
+ 
+
+
+
+
+ + Get new products, pricing strategies and promotions applied automatically to + selected stores. Work on a unified customer base. No complex interface is + required to pilot a global strategy amongst all your stores. +
++ With OpenERP as a backend, you have a system proven to be perfectly + suitable for small stores or large multinationals. +
+
+
+Know your customers - in store and out
+
+
+ + Successful brands integrates all their customer relationship accross all their + channels to develop accurate customer profile and communicate with shoppers + as they make buying decisions, in store or online. +
++ With OpenERP, you get a 360° customer view, including cross-channel sales, + interaction history, profiles, and more. +
+
+ 
+
+
+ \n" +" Click to create an issue.\n" +"
\n" +" You can track your issues from this menu and the action we\n" +" will take.\n" +"
\n" +" " +msgstr "" + +#. module: portal_project_issue +#: model:ir.actions.act_window,name:portal_project_issue.project_issue_categ_act0 +msgid "Issues" +msgstr "" diff --git a/addons/portal_project_issue/security/portal_security.xml b/addons/portal_project_issue/security/portal_security.xml index f6cd8d89be7..598c1620a82 100644 --- a/addons/portal_project_issue/security/portal_security.xml +++ b/addons/portal_project_issue/security/portal_security.xml @@ -3,28 +3,27 @@
+
+Project Management
+Infinitely flexible. Incredibly easy to use.
+
+
+
+
+ 
+
+
+
+
+
+
+
+
+ +OpenERP's collaborative and realtime project management helps your team get +work done. Keep track of everything, from the big picture to the minute +details, from the customer contract to the billing. +
+ +
+
+Designed to fit your own process
+
+
+ +Organize projects around your own processes. Work on tasks and issues using the kanban view, schedule tasks using the gantt chart +and control deadlines in the calendar view. Every project may have it's own stages +allowing teams to optimize their job. +
+
+
+ Kanban
+
+ 
+
+
+
+ 
+
+
+ Gantt Charts
+
+
+
+ 
+
+ Calendar
+
+
+
+Easy to use
+
+ 
+
+
+
+
+ +Get organized as fast as you can think. The easy-to-use interface takes no time +to learn, and every action is instantaneous, so there’s nothing standing +between you and your sweet productive flow. +
+Work Together
+Real time chats, document sharing, email integration
+
+
+
+
+ +Use open chatter to communicate with your team or customers and share comments +and documents on tasks and issues. Integrate discussion fast with the email +integration. +
+Talk to others users or customers with the live chat feature. +
+
+ 
+
+
+
+
+Collaborative Writing
+The power of etherpad, inside your tasks
+
+ 
+
+
+
+
+ +Collaboratively edit the same specifications or meeting minutes right inside the +application. The incorporated etherpad feature allows several people to work +on the same tasks, at the same time. +
++This is very efficient for scrum meetings, meeting minutes or complex +specifications. Every user has their own color and you can replay the whole +creation of the content. +
+
+
+Get Work Done
+
+
+ +Get alerts on followed events to stay up to date with what interests you. Use +instant green/red visual indicators to scan through what has been done and what +requires your attention. +
+
+ 
+
+
+
+
+Timesheets, Contracts & Invoicing
+
+ 
+
+
+
+
+ +Projects are automatically integrated with customer contracts allowing you to +invoice based on time & materials and record timesheets easily. +
+
+
+Track Issues
+Support services, helpdesk, bug tracker, etc.
+
+
+ +Single out the issues that arise in a project in order to have a better focus +on resolving them. Integrate customer interaction on every issue and get +accurate reports on your team's performance. +
+
+
+
+ 
+
+
+
+
+
+
+ Many companies already enjoy it
+Hear what they have to say !
+
+
+
+ 
+
+
+ + OpenERP provides essential platform for our project management. + Things are better organized and much more visible with it. ++ +
+
+ Managing Director, RoomsFor (Hong Kong)
+
+
+
+
+ 
+
+
+ + The possibility to link the Project Management to Sales and Manufacturing widely + extends the range of possible applications beyond the needs of service companies. ++ +
+
+ COO, Agile Business Group.
+
+ \n" +" Click to start a new project.\n" +"
\n" +" Projects are used to organize your activities; plan\n" +" tasks, track issues, invoice timesheets. You can define\n" +" internal projects (R&D, Improve Sales Process),\n" +" private projects (My Todos) or customer ones.\n" +"
\n" +" You will be able collaborate with internal users on\n" +" projects or invite customers to share your activities.\n" +"
\n" +" " +msgstr "" + +#. module: project +#: view:project.config.settings:0 +msgid "Planning" +msgstr "" + +#. module: project +#: view:project.task:0 +#: field:project.task,date_deadline:0 +#: field:report.project.task.user,date_deadline:0 +msgid "Deadline" +msgstr "" + +#. module: project +#: view:project.task.history.cumulative:0 +msgid "Ready" +msgstr "" + +#. module: project +#: view:project.task:0 +msgid "New Tasks" +msgstr "" + +#. module: project +#: field:project.config.settings,module_project_issue_sheet:0 +msgid "Invoice working time on issues" +msgstr "" + +#. module: project +#: view:project.project:0 +#: view:project.task:0 +#: field:project.task.history,end_date:0 +#: field:project.task.history.cumulative,end_date:0 +msgid "End Date" +msgstr "" + +#. module: project +#: model:project.task.type,name:project.project_tt_specification +msgid "Specification" +msgstr "" + +#. module: project +#: model:process.transition,note:project.process_transition_draftopentask0 +msgid "From draft state, it will come into the open state." +msgstr "" + +#. module: project +#: view:project.task.history.cumulative:0 +msgid "Task's Analysis" +msgstr "" + +#. module: project +#: view:project.task.delegate:0 +#: field:project.task.delegate,new_task_description:0 +msgid "New Task Description" +msgstr "" + +#. module: project +#: field:report.project.task.user,delay_endings_days:0 +msgid "Overpassed Deadline" +msgstr "" + +#. module: project +#: view:report.project.task.user:0 +msgid "New tasks" +msgstr "" + +#. module: project +#: selection:project.task,priority:0 +#: selection:report.project.task.user,priority:0 +msgid "Medium" +msgstr "" + +#. module: project +#: field:project.project,total_hours:0 +msgid "Total Time" +msgstr "" + +#. module: project +#: view:report.project.task.user:0 +msgid "Creation Date" +msgstr "" + +#. module: project +#: view:project.project:0 +msgid "Miscellaneous" +msgstr "" + +#. module: project +#: view:project.task:0 +#: field:project.task,stage_id:0 +#: field:project.task.history,type_id:0 +#: field:project.task.history.cumulative,type_id:0 +msgid "Stage" +msgstr "" + +#. module: project +#: model:process.transition,name:project.process_transition_draftopentask0 +msgid "Draft Open task" +msgstr "" + +#. module: project +#: field:project.project,alias_model:0 +msgid "Alias Model" +msgstr "" + +#. module: project +#: help:report.project.task.user,closing_days:0 +msgid "Number of Days to close the task" +msgstr "" + +#. module: project +#: view:board.board:0 +msgid "My Board" +msgstr "" + +#. module: project +#: model:ir.actions.act_window,name:project.open_task_type_form +msgid "Stages" +msgstr "" + +#. module: project +#: view:project.project:0 +#: view:project.task:0 +msgid "Delete" +msgstr "" + +#. module: project +#: view:report.project.task.user:0 +msgid "In progress" +msgstr "" + +#. module: project +#: selection:report.project.task.user,month:0 +msgid "September" +msgstr "" + +#. module: project +#: selection:report.project.task.user,priority:0 +msgid "Urgent" +msgstr "" + +#. module: project +#: model:project.category,name:project.project_category_02 +msgid "Feature request" +msgstr "" + +#. module: project +#: view:project.task:0 +msgid "Delegated tasks" +msgstr "" + +#. module: project +#: model:ir.model,name:project.model_project_task_work +msgid "Project Task Work" +msgstr "" + +#. module: project +#: code:addons/project/wizard/project_task_delegate.py:81 +#, python-format +msgid "CHECK: %s" +msgstr "" + +#. module: project +#: view:project.project:0 +msgid "Close Project" +msgstr "" + +#. module: project +#: field:project.project,tasks:0 +msgid "Task Activities" +msgstr "" + +#. module: project +#: field:project.project,effective_hours:0 +#: field:project.task.work,hours:0 +msgid "Time Spent" +msgstr "" + +#. module: project +#: view:project.project:0 +#: view:project.task:0 +msgid "í" +msgstr "" + +#. module: project +#: field:account.analytic.account,company_uom_id:0 +msgid "unknown" +msgstr "" + +#. module: project +#: field:project.project,message_is_follower:0 +#: field:project.task,message_is_follower:0 +msgid "Is a Follower" +msgstr "" + +#. module: project +#: field:project.task,work_ids:0 +msgid "Work done" +msgstr "" + +#. module: project +#: view:report.project.task.user:0 +msgid "Extended Filters..." +msgstr "" + +#. module: project +#: model:ir.ui.menu,name:project.menu_tasks_config +msgid "GTD" +msgstr "" + +#. module: project +#: help:project.task,state:0 +msgid "" +"The status is set to 'Draft', when a case is created. " +"If the case is in progress the status is set to 'Open'. " +"When the case is over, the status is set to 'Done'. If " +"the case needs to be reviewed then the status is set " +"to 'Pending'." +msgstr "" + +#. module: project +#: model:ir.model,name:project.model_res_company +msgid "Companies" +msgstr "" + +#. module: project +#: field:project.task.type,fold:0 +msgid "Folded by Default" +msgstr "" + +#. module: project +#: field:project.task.history,date:0 +#: field:project.task.history.cumulative,date:0 +#: field:project.task.work,date:0 +msgid "Date" +msgstr "" + +#. module: project +#: help:project.config.settings,module_project_issue:0 +msgid "" +"Provides management of issues/bugs in projects.\n" +" This installs the module project_issue." +msgstr "" + +#. module: project +#: help:project.task,kanban_state:0 +msgid "" +"A task's kanban state indicates special situations affecting it:\n" +" * Normal is the default situation\n" +" * Blocked indicates something is preventing the progress of this task\n" +" * Ready for next stage indicates the task is ready to be pulled to the next " +"stage" +msgstr "" + +#. module: project +#: view:project.task:0 +msgid "10" +msgstr "" + +#. module: project +#: help:project.project,analytic_account_id:0 +msgid "" +"Link this project to an analytic account if you need financial management on " +"projects. It enables you to connect projects with budgets, planning, cost " +"and revenue analysis, timesheets on projects, etc." +msgstr "" + +#. module: project +#: model:process.transition.action,name:project.process_transition_action_draftcanceltask0 +#: model:process.transition.action,name:project.process_transition_action_opencanceltask0 +#: view:project.config.settings:0 +#: view:project.task.delegate:0 +#: view:project.task.reevaluate:0 +msgid "Cancel" +msgstr "" + +#. module: project +#: view:project.project:0 +msgid "Other Info" +msgstr "" + +#. module: project +#: view:project.task.delegate:0 +msgid "_Delegate" +msgstr "" + +#. module: project +#: selection:project.task,priority:0 +#: selection:report.project.task.user,priority:0 +msgid "Very Low" +msgstr "" + +#. module: project +#: help:project.project,effective_hours:0 +msgid "" +"Sum of spent hours of all tasks related to this project and its child " +"projects." +msgstr "" + +#. module: project +#: view:project.project:0 +msgid "" +"Follow this project to automatically track the events associated to tasks " +"and issues of this project." +msgstr "" + +#. module: project +#: view:project.task:0 +msgid "Users" +msgstr "" + +#. module: project +#: model:mail.message.subtype,name:project.mt_task_stage +msgid "Stage Changed" +msgstr "" + +#. module: project +#: view:project.project:0 +#: model:res.groups,name:project.group_project_manager +msgid "Manager" +msgstr "" + +#. module: project +#: selection:project.task,priority:0 +msgid "Important" +msgstr "" + +#. module: project +#: field:project.category,name:0 +msgid "Name" +msgstr "" + +#. module: project +#: selection:report.project.task.user,month:0 +msgid "November" +msgstr "" + +#. module: project +#: view:project.task.reevaluate:0 +msgid "Reevaluate Task" +msgstr "" + +#. module: project +#: model:ir.model,name:project.model_project_task_type +#: view:project.task.type:0 +msgid "Task Stage" +msgstr "" + +#. module: project +#: view:project.task.type:0 +msgid "Common" +msgstr "" + +#. module: project +#: help:project.project,message_ids:0 +#: help:project.task,message_ids:0 +msgid "Messages and communication history" +msgstr "" + +#. module: project +#: view:project.project:0 +msgid "" +"To invoice or setup invoicing and renewal options, go to the related " +"contract:" +msgstr "" + +#. module: project +#: field:project.task.delegate,state:0 +msgid "Validation State" +msgstr "" + +#. module: project +#: field:project.task.work,name:0 +msgid "Work summary" +msgstr "" + +#. module: project +#: view:project.project:0 +#: view:project.task:0 +#: view:report.project.task.user:0 +msgid "Group By..." +msgstr "" + +#. module: project +#: view:project.project:0 +#: selection:project.project,state:0 +msgid "Template" +msgstr "" + +#. module: project +#: view:project.project:0 +msgid "Re-open project" +msgstr "" + +#. module: project +#: help:project.project,priority:0 +msgid "Gives the sequence order when displaying the list of projects" +msgstr "" + +#. module: project +#: constraint:project.project:0 +msgid "Error! project start-date must be lower then project end-date." +msgstr "" + +#. module: project +#: field:project.project,members:0 +msgid "Project Members" +msgstr "" + +#. module: project +#: field:project.task,child_ids:0 +msgid "Delegated Tasks" +msgstr "" + +#. module: project +#: view:project.project:0 +#: field:project.project,message_unread:0 +#: view:project.task:0 +#: field:project.task,message_unread:0 +msgid "Unread Messages" +msgstr "" + +#. module: project +#: view:project.task:0 +#: field:project.task,parent_ids:0 +msgid "Parent Tasks" +msgstr "" + +#. module: project +#: model:process.node,name:project.process_node_opentask0 +msgid "Open task" +msgstr "" + +#. module: project +#: view:project.task.type:0 +msgid "Stages common to all projects" +msgstr "" + +#. module: project +#: model:process.node,name:project.process_node_drafttask0 +msgid "Draft task" +msgstr "" + +#. module: project +#: field:project.task,notes:0 +msgid "Notes" +msgstr "" + +#. module: project +#: view:project.task:0 +#: view:project.task.history.cumulative:0 +msgid "Pending Tasks" +msgstr "" + +#. module: project +#: view:project.task:0 +msgid "Show only tasks having a deadline" +msgstr "" + +#. module: project +#: model:project.category,name:project.project_category_04 +msgid "Usability" +msgstr "" + +#. module: project +#: view:report.project.task.user:0 +#: field:report.project.task.user,hours_delay:0 +msgid "Avg. Plan.-Eff." +msgstr "" + +#. module: project +#: field:project.task.work,user_id:0 +msgid "Done by" +msgstr "" + +#. module: project +#: code:addons/project/project.py:181 +#, python-format +msgid "Invalid Action!" +msgstr "" + +#. module: project +#: help:project.task.type,state:0 +msgid "" +"The status of your document is automatically changed regarding the selected " +"stage. For example, if a stage is related to the status 'Close', when your " +"document reaches this stage, it is automatically closed." +msgstr "" + +#. module: project +#: view:project.task:0 +msgid "Extra Info" +msgstr "" + +#. module: project +#: view:project.task:0 +msgid "Edit..." +msgstr "" + +#. module: project +#: view:report.project.task.user:0 +#: field:report.project.task.user,nbr:0 +msgid "# of tasks" +msgstr "" + +#. module: project +#: field:project.project,doc_count:0 +msgid "Number of documents attached" +msgstr "" + +#. module: project +#: field:project.task,priority:0 +#: field:report.project.task.user,priority:0 +msgid "Priority" +msgstr "" + +#. module: project +#: view:project.project:0 +msgid "Open Projects" +msgstr "" + +#. module: project +#: help:project.project,alias_id:0 +msgid "" +"Internal email associated with this project. Incoming emails are " +"automatically synchronizedwith Tasks (or optionally Issues if the Issue " +"Tracker module is installed)." +msgstr "" + +#. module: project +#: model:ir.actions.act_window,help:project.open_task_type_form +msgid "" +"\n" +" Click to add a stage in the task pipeline.\n" +"
\n" +" Define the steps that will be used in the project from the\n" +" creation of the task, up to the closing of the task or " +"issue.\n" +" You will use these stages in order to track the progress in\n" +" solving a task or an issue.\n" +"
\n" +" " +msgstr "" + +#. module: project +#: help:project.task,total_hours:0 +msgid "Computed as: Time Spent + Remaining Time." +msgstr "" + +#. module: project +#: code:addons/project/project.py:356 +#: code:addons/project/project.py:377 +#: code:addons/project/project.py:709 +#, python-format +msgid "%s (copy)" +msgstr "" + +#. module: project +#: model:mail.message.subtype,name:project.mt_project_task_stage +msgid "Task Stage Changed" +msgstr "" + +#. module: project +#: view:project.task:0 +#: field:project.task.history,remaining_hours:0 +#: field:project.task.history.cumulative,remaining_hours:0 +msgid "Remaining Time" +msgstr "" + +#. module: project +#: field:project.task.delegate,name:0 +msgid "Delegated Title" +msgstr "" + +#. module: project +#: selection:report.project.task.user,month:0 +msgid "July" +msgstr "" + +#. module: project +#: model:ir.model,name:project.model_project_task_reevaluate +msgid "project.task.reevaluate" +msgstr "" + +#. module: project +#: field:project.task,delay_hours:0 +msgid "Delay Hours" +msgstr "" + +#. module: project +#: view:project.project:0 +msgid "Team" +msgstr "" + +#. module: project +#: help:project.config.settings,time_unit:0 +msgid "This will set the unit of measure used in projects and tasks." +msgstr "" + +#. module: project +#: selection:project.task,priority:0 +msgid "Very important" +msgstr "" + +#. module: project +#: view:report.project.task.user:0 +#: field:report.project.task.user,month:0 +msgid "Month" +msgstr "" + +#. module: project +#: model:project.task.type,name:project.project_tt_design +msgid "Design" +msgstr "" + +#. module: project +#: view:project.task:0 +msgid "Start Date" +msgstr "" + +#. module: project +#: view:project.task:0 +#: selection:project.task,kanban_state:0 +#: selection:project.task.history,kanban_state:0 +#: view:project.task.history.cumulative:0 +#: selection:project.task.history.cumulative,kanban_state:0 +msgid "Blocked" +msgstr "" + +#. module: project +#: help:project.task,progress:0 +msgid "" +"If the task has a progress of 99.99% you should close the task if it's " +"finished or reevaluate the time" +msgstr "" + +#. module: project +#: field:project.task,user_email:0 +msgid "User Email" +msgstr "" + +#. module: project +#: help:project.task.delegate,prefix:0 +msgid "Title for your validation task" +msgstr "" + +#. module: project +#: field:project.config.settings,time_unit:0 +msgid "Working time unit" +msgstr "" + +#. module: project +#: view:project.project:0 +msgid "Projects in which I am a member." +msgstr "" + +#. module: project +#: selection:project.task,priority:0 +#: selection:report.project.task.user,priority:0 +msgid "Low" +msgstr "" + +#. module: project +#: selection:project.project,state:0 +msgid "Closed" +msgstr "" + +#. module: project +#: view:project.project:0 +#: selection:project.project,state:0 +#: view:project.task:0 +#: selection:project.task,state:0 +#: selection:project.task.delegate,state:0 +#: selection:project.task.history,state:0 +#: selection:project.task.history.cumulative,state:0 +#: selection:project.task.type,state:0 +#: view:report.project.task.user:0 +#: selection:report.project.task.user,state:0 +msgid "Pending" +msgstr "" + +#. module: project +#: model:ir.actions.act_window,name:project.project_category_action +#: model:ir.ui.menu,name:project.menu_project_category_act +#: view:project.category:0 +#: field:project.task,categ_ids:0 +msgid "Tags" +msgstr "" + +#. module: project +#: model:ir.model,name:project.model_project_task_history +#: model:ir.model,name:project.model_project_task_history_cumulative +msgid "History of Tasks" +msgstr "" + +#. module: project +#: help:project.task.delegate,state:0 +msgid "" +"New state of your own task. Pending will be reopened automatically when the " +"delegated task is closed" +msgstr "" + +#. module: project +#: help:project.config.settings,group_manage_delegation_task:0 +msgid "Allows you to delegate tasks to other users." +msgstr "" + +#. module: project +#: field:project.project,active:0 +msgid "Active" +msgstr "" + +#. module: project +#: model:ir.model,name:project.model_project_category +msgid "Category of project's task, issue, ..." +msgstr "" + +#. module: project +#: help:project.project,resource_calendar_id:0 +msgid "Timetable working hours to adjust the gantt diagram report" +msgstr "" + +#. module: project +#: help:project.task,delay_hours:0 +msgid "" +"Computed as difference between planned hours by the project manager and the " +"total hours of the task." +msgstr "" + +#. module: project +#: view:project.config.settings:0 +msgid "Helpdesk & Support" +msgstr "" + +#. module: project +#: help:report.project.task.user,opening_days:0 +msgid "Number of Days to Open the task" +msgstr "" + +#. module: project +#: field:project.task,delegated_user_id:0 +msgid "Delegated To" +msgstr "" + +#. module: project +#: help:project.task,planned_hours:0 +msgid "" +"Estimated time to do the task, usually set by the project manager when the " +"task is in draft state." +msgstr "" + +#. module: project +#: code:addons/project/project.py:220 +#, python-format +msgid "Attachments" +msgstr "" + +#. module: project +#: view:project.task:0 +#: selection:project.task,state:0 +#: selection:project.task.delegate,state:0 +#: selection:project.task.history,state:0 +#: selection:project.task.history.cumulative,state:0 +#: model:project.task.type,name:project.project_tt_deployment +#: selection:project.task.type,state:0 +#: view:report.project.task.user:0 +#: selection:report.project.task.user,state:0 +#: view:res.partner:0 +msgid "Done" +msgstr "" + +#. module: project +#: code:addons/project/project.py:182 +#, python-format +msgid "" +"You cannot delete a project containing tasks. You can either delete all the " +"project's tasks and then delete the project or simply deactivate the project." +msgstr "" + +#. module: project +#: model:process.transition.action,name:project.process_transition_action_draftopentask0 +#: view:project.project:0 +msgid "Open" +msgstr "" + +#. module: project +#: field:project.project,privacy_visibility:0 +msgid "Privacy / Visibility" +msgstr "" + +#. module: project +#: view:project.task:0 +#: field:project.task,remaining_hours:0 +#: field:project.task.reevaluate,remaining_hours:0 +#: view:report.project.task.user:0 +#: field:report.project.task.user,remaining_hours:0 +msgid "Remaining Hours" +msgstr "" + +#. module: project +#: model:mail.message.subtype,description:project.mt_task_stage +msgid "Stage changed" +msgstr "" + +#. module: project +#: constraint:project.task:0 +msgid "Error ! Task end-date must be greater then task start-date" +msgstr "" + +#. module: project +#: field:project.task.history,user_id:0 +#: field:project.task.history.cumulative,user_id:0 +msgid "Responsible" +msgstr "" + +#. module: project +#: view:project.project:0 +msgid "Search Project" +msgstr "" + +#. module: project +#: view:project.task.delegate:0 +msgid "Delegated Task" +msgstr "" + +#. module: project +#: view:report.project.task.user:0 +#: field:report.project.task.user,total_hours:0 +msgid "Total Hours" +msgstr "" + +#. module: project +#: model:ir.model,name:project.model_project_config_settings +msgid "project.config.settings" +msgstr "" + +#. module: project +#: model:project.task.type,name:project.project_tt_development +msgid "Development" +msgstr "" + +#. module: project +#: help:project.task,active:0 +msgid "" +"This field is computed automatically and have the same behavior than the " +"boolean 'active' field: if the task is linked to a template or unactivated " +"project, it will be hidden unless specifically asked." +msgstr "" + +#. module: project +#: model:res.request.link,name:project.req_link_task +msgid "Project task" +msgstr "" + +#. module: project +#: field:project.task,effective_hours:0 +msgid "Hours Spent" +msgstr "" + +#. module: project +#: help:project.config.settings,module_pad:0 +msgid "" +"Lets the company customize which Pad installation should be used to link to " +"new pads\n" +" (by default, http://ietherpad.com/).\n" +" This installs the module pad." +msgstr "" + +#. module: project +#: field:project.task,id:0 +msgid "ID" +msgstr "" + +#. module: project +#: model:ir.actions.act_window,name:project.action_view_task_overpassed_draft +msgid "Overpassed Tasks" +msgstr "" + +#. module: project +#: code:addons/project/project.py:932 +#, python-format +msgid "" +"Child task still open.\n" +"Please cancel or complete child task first." +msgstr "" + +#. module: project +#: field:project.task.delegate,user_id:0 +msgid "Assign To" +msgstr "" + +#. module: project +#: model:res.groups,name:project.group_time_work_estimation_tasks +msgid "Time Estimation on Tasks" +msgstr "" + +#. module: project +#: field:project.task,total_hours:0 +msgid "Total" +msgstr "" + +#. module: project +#: model:process.node,note:project.process_node_taskbydelegate0 +msgid "Delegate your task to the other user" +msgstr "" + +#. module: project +#: model:mail.message.subtype,description:project.mt_task_started +msgid "Task started" +msgstr "" + +#. module: project +#: help:project.task.reevaluate,remaining_hours:0 +msgid "Put here the remaining hours required to close the task." +msgstr "" + +#. module: project +#: help:project.task.type,fold:0 +msgid "" +"This stage is not visible, for example in status bar or kanban view, when " +"there are no records in that stage to display." +msgstr "" + +#. module: project +#: view:project.task:0 +msgid "Deadlines" +msgstr "" + +#. module: project +#: code:addons/project/wizard/project_task_delegate.py:69 +#: code:addons/project/wizard/project_task_delegate.py:70 +#: code:addons/project/wizard/project_task_delegate.py:77 +#: code:addons/project/wizard/project_task_delegate.py:78 +#, python-format +msgid "CHECK: " +msgstr "" + +#. module: project +#: code:addons/project/project.py:432 +#, python-format +msgid "You must assign members on the project '%s' !" +msgstr "" + +#. module: project +#: view:project.project:0 +msgid "Pending Projects" +msgstr "" + +#. module: project +#: view:project.task:0 +msgid "Remaining" +msgstr "" + +#. module: project +#: field:project.task,progress:0 +msgid "Progress (%)" +msgstr "" + +#. module: project +#: field:project.task,company_id:0 +#: field:project.task.work,company_id:0 +#: view:report.project.task.user:0 +#: field:report.project.task.user,company_id:0 +msgid "Company" +msgstr "" + +#. module: project +#: help:project.config.settings,module_project_timesheet:0 +msgid "" +"This allows you to transfer the entries under tasks defined for Project " +"Management to\n" +" the timesheet line entries for particular date and user, " +"with the effect of creating,\n" +" editing and deleting either ways.\n" +" This installs the module project_timesheet." +msgstr "" + +#. module: project +#: field:project.config.settings,module_project_issue:0 +msgid "Track issues and bugs" +msgstr "" + +#. module: project +#: field:project.config.settings,module_project_mrp:0 +msgid "Generate tasks from sale orders" +msgstr "" + +#. module: project +#: model:ir.ui.menu,name:project.menu_task_types_view +msgid "Task Stages" +msgstr "" + +#. module: project +#: model:process.node,note:project.process_node_drafttask0 +msgid "Define the Requirements and Set Planned Hours." +msgstr "" + +#. module: project +#: field:project.project,message_ids:0 +#: field:project.task,message_ids:0 +msgid "Messages" +msgstr "" + +#. module: project +#: field:project.project,color:0 +#: field:project.task,color:0 +msgid "Color Index" +msgstr "" + +#. module: project +#: model:ir.actions.act_window,name:project.open_board_project +#: model:ir.model,name:project.model_project_project +#: model:ir.ui.menu,name:project.menu_project_dashboard +#: model:ir.ui.menu,name:project.menu_project_management +#: view:project.project:0 +#: view:project.task:0 +#: field:project.task,project_id:0 +#: field:project.task.delegate,project_id:0 +#: field:project.task.history.cumulative,project_id:0 +#: view:report.project.task.user:0 +#: field:report.project.task.user,project_id:0 +#: model:res.request.link,name:project.req_link_project +msgid "Project" +msgstr "" + +#. module: project +#: selection:project.project,state:0 +#: selection:project.task,state:0 +#: selection:project.task.history,state:0 +#: selection:project.task.history.cumulative,state:0 +#: model:project.task.type,name:project.project_tt_cancel +#: selection:project.task.type,state:0 +#: selection:report.project.task.user,state:0 +msgid "Cancelled" +msgstr "" + +#. module: project +#: model:ir.actions.act_window,help:project.act_project_project_2_project_task_all +#: model:ir.actions.act_window,help:project.action_view_task +msgid "" +"\n" +" Click to create a new task.\n" +"
\n" +" OpenERP's project management allows you to manage the " +"pipeline\n" +" of tasks in order to get things done efficiently. You can\n" +" track progress, discuss on tasks, attach documents, etc.\n" +"
\n" +" " +msgstr "" + +#. module: project +#: field:project.task,date_end:0 +#: field:report.project.task.user,date_end:0 +msgid "Ending Date" +msgstr "" + +#. module: project +#: field:project.task.type,state:0 +msgid "Related Status" +msgstr "" + +#. module: project +#: view:project.project:0 +msgid "Documents" +msgstr "" + +#. module: project +#: model:mail.message.subtype,description:project.mt_task_new +msgid "Task created" +msgstr "" + +#. module: project +#: view:report.project.task.user:0 +#: field:report.project.task.user,no_of_days:0 +msgid "# of Days" +msgstr "" + +#. module: project +#: field:project.project,message_follower_ids:0 +#: field:project.task,message_follower_ids:0 +msgid "Followers" +msgstr "" + +#. module: project +#: selection:project.project,state:0 +#: view:project.task:0 +#: selection:project.task,state:0 +#: selection:project.task.history,state:0 +#: selection:project.task.history.cumulative,state:0 +#: selection:project.task.type,state:0 +#: view:report.project.task.user:0 +msgid "New" +msgstr "" + +#. module: project +#: model:ir.actions.act_window,name:project.action_view_task_history_cumulative +#: model:ir.ui.menu,name:project.menu_action_view_task_history_cumulative +msgid "Cumulative Flow" +msgstr "" + +#. module: project +#: view:report.project.task.user:0 +#: field:report.project.task.user,hours_effective:0 +msgid "Effective Hours" +msgstr "" + +#. module: project +#: view:report.project.task.user:0 +msgid "OverPass delay" +msgstr "" + +#. module: project +#: view:project.task.delegate:0 +msgid "Validation Task" +msgstr "" + +#. module: project +#: field:project.config.settings,module_project_long_term:0 +msgid "Manage resources planning on gantt view" +msgstr "" + +#. module: project +#: view:project.task:0 +#: view:project.task.history.cumulative:0 +msgid "Unassigned Tasks" +msgstr "" + +#. module: project +#: help:project.project,planned_hours:0 +msgid "" +"Sum of planned hours of all tasks related to this project and its child " +"projects." +msgstr "" + +#. module: project +#: view:res.partner:0 +msgid "For changing to done state" +msgstr "" + +#. module: project +#: view:report.project.task.user:0 +msgid "My Task" +msgstr "" + +#. module: project +#: view:project.task:0 +#: view:project.task.history.cumulative:0 +#: view:report.project.task.user:0 +msgid "My Projects" +msgstr "" + +#. module: project +#: help:project.task,sequence:0 +msgid "Gives the sequence order when displaying a list of tasks." +msgstr "" + +#. module: project +#: field:project.task,date_start:0 +#: field:report.project.task.user,date_start:0 +msgid "Starting Date" +msgstr "" + +#. module: project +#: code:addons/project/project.py:398 +#: model:ir.actions.act_window,name:project.open_view_project_all +#: model:ir.ui.menu,name:project.menu_projects +#: view:project.project:0 +#: field:project.task.type,project_ids:0 +#: view:res.company:0 +#, python-format +msgid "Projects" +msgstr "" + +#. module: project +#: model:res.groups,name:project.group_tasks_work_on_tasks +msgid "Task's Work on Tasks" +msgstr "" + +#. module: project +#: help:project.task.delegate,name:0 +msgid "New title of the task delegated to the user" +msgstr "" + +#. module: project +#: model:ir.actions.act_window,name:project.action_project_task_user_tree +#: model:ir.ui.menu,name:project.menu_project_task_user_tree +#: view:report.project.task.user:0 +msgid "Tasks Analysis" +msgstr "" + +#. module: project +#: view:project.task:0 +#: view:project.task.history.cumulative:0 +msgid "Project Tasks" +msgstr "" + +#. module: project +#: field:account.analytic.account,use_tasks:0 +#: model:ir.actions.act_window,name:project.act_project_project_2_project_task_all +#: model:ir.actions.act_window,name:project.action_view_task +#: model:ir.ui.menu,name:project.menu_action_view_task +#: model:process.process,name:project.process_process_tasksprocess0 +#: view:project.project:0 +#: view:project.task:0 +#: view:res.partner:0 +#: field:res.partner,task_ids:0 +msgid "Tasks" +msgstr "" + +#. module: project +#: selection:report.project.task.user,month:0 +msgid "December" +msgstr "" + +#. module: project +#: view:project.config.settings:0 +#: view:project.task.delegate:0 +#: view:project.task.reevaluate:0 +msgid "or" +msgstr "" + +#. module: project +#: help:project.config.settings,module_project_mrp:0 +msgid "" +"This feature automatically creates project tasks from service products in " +"sale orders.\n" +" More precisely, tasks are created for procurement lines with " +"product of type 'Service',\n" +" procurement method 'Make to Order', and supply method " +"'Manufacture'.\n" +" This installs the module project_mrp." +msgstr "" + +#. module: project +#: help:project.task.delegate,planned_hours:0 +msgid "Estimated time to close this task by the delegated user" +msgstr "" + +#. module: project +#: model:project.category,name:project.project_category_03 +msgid "Experiment" +msgstr "" + +#. module: project +#: model:process.transition.action,name:project.process_transition_action_opendrafttask0 +#: selection:report.project.task.user,state:0 +msgid "Draft" +msgstr "" + +#. module: project +#: field:project.task,kanban_state:0 +#: field:project.task.history,kanban_state:0 +#: field:project.task.history.cumulative,kanban_state:0 +msgid "Kanban State" +msgstr "" + +#. module: project +#: field:project.config.settings,module_project_timesheet:0 +msgid "Record timesheet lines per tasks" +msgstr "" + +#. module: project +#: model:ir.model,name:project.model_report_project_task_user +msgid "Tasks by user and project" +msgstr "" + +#. module: project +#: field:res.company,project_time_mode_id:0 +msgid "Project Time Unit" +msgstr "" + +#. module: project +#: view:project.task:0 +#: selection:project.task,kanban_state:0 +#: selection:project.task.history,kanban_state:0 +#: selection:project.task.history.cumulative,kanban_state:0 +msgid "Normal" +msgstr "" + +#. module: project +#: view:report.project.task.user:0 +#: field:report.project.task.user,closing_days:0 +msgid "Days to Close" +msgstr "" + +#. module: project +#: model:res.groups,name:project.group_project_user +msgid "User" +msgstr "" + +#. module: project +#: help:project.project,alias_model:0 +msgid "" +"The kind of document created when an email is received on this project's " +"email alias" +msgstr "" + +#. module: project +#: model:ir.actions.act_window,name:project.action_config_settings +#: view:project.config.settings:0 +msgid "Configure Project" +msgstr "" + +#. module: project +#: view:project.task.history.cumulative:0 +msgid "Tasks's Cumulative Flow" +msgstr "" + +#. module: project +#: selection:report.project.task.user,month:0 +msgid "January" +msgstr "" + +#. module: project +#: field:project.task.delegate,prefix:0 +msgid "Your Task Title" +msgstr "" + +#. module: project +#: view:project.task.reevaluate:0 +msgid "Reevaluation Task" +msgstr "" + +#. module: project +#: code:addons/project/project.py:1318 +#, python-format +msgid "Please delete the project linked with this account first." +msgstr "" + +#. module: project +#: model:mail.message.subtype,name:project.mt_project_task_new +#: model:mail.message.subtype,name:project.mt_task_new +msgid "Task Created" +msgstr "" + +#. module: project +#: view:report.project.task.user:0 +msgid "Non Assigned Tasks to users" +msgstr "" + +#. module: project +#: view:project.project:0 +msgid "Projects in which I am a manager" +msgstr "" + +#. module: project +#: view:project.task:0 +#: selection:project.task,kanban_state:0 +#: selection:project.task.history,kanban_state:0 +#: selection:project.task.history.cumulative,kanban_state:0 +msgid "Ready for next stage" +msgstr "" + +#. module: project +#: field:project.task.type,case_default:0 +msgid "Default for New Projects" +msgstr "" + +#. module: project +#: view:project.task:0 +#: field:project.task,description:0 +#: field:project.task.type,description:0 +msgid "Description" +msgstr "" + +#. module: project +#: selection:report.project.task.user,month:0 +msgid "May" +msgstr "" + +#. module: project +#: help:project.task.type,case_default:0 +msgid "" +"If you check this field, this stage will be proposed by default on each new " +"project. It will not assign this stage to existing projects." +msgstr "" + +#. module: project +#: field:project.task,partner_id:0 +msgid "Customer" +msgstr "" + +#. module: project +#: selection:report.project.task.user,month:0 +msgid "February" +msgstr "" + +#. module: project +#: help:project.config.settings,module_project_long_term:0 +msgid "" +"A long term project management module that tracks planning, scheduling, and " +"resource allocation.\n" +" This installs the module project_long_term." +msgstr "" + +#. module: project +#: model:mail.message.subtype,description:project.mt_task_closed +msgid "Task closed" +msgstr "" + +#. module: project +#: selection:report.project.task.user,month:0 +msgid "April" +msgstr "" + +#. module: project +#: view:project.task:0 +msgid "Spent Hours" +msgstr "" + +#. module: project +#: help:project.project,sequence:0 +msgid "Gives the sequence order when displaying a list of Projects." +msgstr "" + +#. module: project +#: model:ir.actions.act_window,name:project.act_res_users_2_project_task_opened +msgid "Assigned Tasks" +msgstr "" + +#. module: project +#: help:project.config.settings,module_project_issue_sheet:0 +msgid "" +"Provides timesheet support for the issues/bugs management in project.\n" +" This installs the module project_issue_sheet." +msgstr "" + +#. module: project +#: selection:project.project,privacy_visibility:0 +msgid "Followers Only" +msgstr "" + +#. module: project +#: view:board.board:0 +#: field:project.project,task_count:0 +msgid "Open Tasks" +msgstr "" + +#. module: project +#: field:project.project,priority:0 +#: field:project.project,sequence:0 +#: field:project.task,sequence:0 +#: field:project.task.type,sequence:0 +msgid "Sequence" +msgstr "" + +#. module: project +#: view:project.task:0 +#: view:project.task.work:0 +msgid "Task Work" +msgstr "" + +#. module: project +#: help:project.task.delegate,planned_hours_me:0 +msgid "" +"Estimated time for you to validate the work done by the user to whom you " +"delegate this task" +msgstr "" + +#. module: project +#: view:report.project.task.user:0 +#: field:report.project.task.user,year:0 +msgid "Year" +msgstr "" + +#. module: project +#: field:project.project,type_ids:0 +#: view:project.task.type:0 +msgid "Tasks Stages" +msgstr "" diff --git a/addons/project/process/task_process.xml b/addons/project/process/task_process.xml index 4a73bfd00d1..9955fe1ffe1 100644 --- a/addons/project/process/task_process.xml +++ b/addons/project/process/task_process.xml @@ -68,24 +68,24 @@
+
+
@@ -150,8 +151,8 @@
-
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/project_issue_sheet/project_issue_sheet_view.xml b/addons/project_issue_sheet/project_issue_sheet_view.xml
index fb245a0510a..4911cac8f25 100644
--- a/addons/project_issue_sheet/project_issue_sheet_view.xml
+++ b/addons/project_issue_sheet/project_issue_sheet_view.xml
@@ -19,7 +19,8 @@
-
+
+ name="%(act_project_phases)d" type="action"
+ groups="base.group_user">
-
diff --git a/addons/project_mrp/process/project_mrp_process.xml b/addons/project_mrp/process/project_mrp_process.xml
index e2195c6f61b..c25cd264538 100644
--- a/addons/project_mrp/process/project_mrp_process.xml
+++ b/addons/project_mrp/process/project_mrp_process.xml
@@ -50,24 +50,24 @@
diff --git a/addons/project_timesheet/__openerp__.py b/addons/project_timesheet/__openerp__.py
index 0651d7b9ce4..4dff3695c5c 100644
--- a/addons/project_timesheet/__openerp__.py
+++ b/addons/project_timesheet/__openerp__.py
@@ -34,7 +34,7 @@ with the effect of creating, editing and deleting either ways.
'author': 'OpenERP SA',
'website': 'http://www.openerp.com',
'images': ['images/invoice_task_work.jpeg', 'images/my_timesheet.jpeg', 'images/working_hour.jpeg'],
- 'depends': ['project', 'hr_timesheet_sheet', 'hr_timesheet_invoice', 'account_analytic_analysis'],
+ 'depends': ['resource', 'project', 'hr_timesheet_sheet', 'hr_timesheet_invoice', 'account_analytic_analysis'],
'data': [
'security/ir.model.access.csv',
'security/project_timesheet_security.xml',
diff --git a/addons/project_timesheet/process/project_timesheet_process.xml b/addons/project_timesheet/process/project_timesheet_process.xml
index 1bff69b603e..17dd35dcad2 100644
--- a/addons/project_timesheet/process/project_timesheet_process.xml
+++ b/addons/project_timesheet/process/project_timesheet_process.xml
@@ -46,24 +46,24 @@
diff --git a/addons/purchase/html/index.html b/addons/purchase/html/index.html
new file mode 100644
index 00000000000..67b122ac557
--- /dev/null
+++ b/addons/purchase/html/index.html
@@ -0,0 +1,141 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/purchase/html/purchase_compose.png b/addons/purchase/html/purchase_compose.png
new file mode 100644
index 00000000000..22cbe1cb21c
Binary files /dev/null and b/addons/purchase/html/purchase_compose.png differ
diff --git a/addons/purchase/html/purchase_dashboard.png b/addons/purchase/html/purchase_dashboard.png
new file mode 100644
index 00000000000..0939edea591
Binary files /dev/null and b/addons/purchase/html/purchase_dashboard.png differ
diff --git a/addons/purchase/html/purchase_import.png b/addons/purchase/html/purchase_import.png
new file mode 100644
index 00000000000..bd2a4d0c15e
Binary files /dev/null and b/addons/purchase/html/purchase_import.png differ
diff --git a/addons/purchase/html/purchase_incoming.png b/addons/purchase/html/purchase_incoming.png
new file mode 100644
index 00000000000..02b82cead02
Binary files /dev/null and b/addons/purchase/html/purchase_incoming.png differ
diff --git a/addons/purchase/html/purchase_po.png b/addons/purchase/html/purchase_po.png
new file mode 100644
index 00000000000..d9cec9f5140
Binary files /dev/null and b/addons/purchase/html/purchase_po.png differ
diff --git a/addons/purchase/html/purchase_procurement.png b/addons/purchase/html/purchase_procurement.png
new file mode 100644
index 00000000000..cb315e08224
Binary files /dev/null and b/addons/purchase/html/purchase_procurement.png differ
diff --git a/addons/purchase/html/purchase_product.png b/addons/purchase/html/purchase_product.png
new file mode 100644
index 00000000000..cbfd054d72e
Binary files /dev/null and b/addons/purchase/html/purchase_product.png differ
diff --git a/addons/purchase/html/purchase_product_form.png b/addons/purchase/html/purchase_product_form.png
new file mode 100644
index 00000000000..a25c85b6496
Binary files /dev/null and b/addons/purchase/html/purchase_product_form.png differ
diff --git a/addons/purchase/html/purchase_tender.png b/addons/purchase/html/purchase_tender.png
new file mode 100644
index 00000000000..33ef600b869
Binary files /dev/null and b/addons/purchase/html/purchase_tender.png differ
diff --git a/addons/purchase/process/purchase_process.xml b/addons/purchase/process/purchase_process.xml
index c6b6805351a..7feb47690e0 100644
--- a/addons/purchase/process/purchase_process.xml
+++ b/addons/purchase/process/purchase_process.xml
@@ -154,16 +154,16 @@
@@ -171,24 +171,24 @@
@@ -196,32 +196,32 @@
+
False
sale.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
-
-
+
False
sale.group_delivery_invoice_address
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 210e4dd3be6..f00fb6afd19 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -695,7 +695,7 @@ class sale_order_line(osv.osv):
_description = 'Sales Order Line'
_columns = {
'order_id': fields.many2one('sale.order', 'Order Reference', required=True, ondelete='cascade', select=True, readonly=True, states={'draft':[('readonly',False)]}),
- 'name': fields.text('Description', required=True, select=True, readonly=True, states={'draft': [('readonly', False)]}),
+ 'name': fields.text('Description', required=True, readonly=True, states={'draft': [('readonly', False)]}),
'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of sales order lines."),
'product_id': fields.many2one('product.product', 'Product', domain=[('sale_ok', '=', True)], change_default=True),
'invoice_lines': fields.many2many('account.invoice.line', 'sale_order_line_invoice_rel', 'order_line_id', 'invoice_id', 'Invoice Lines', readonly=True),
diff --git a/addons/sale/sale_demo.xml b/addons/sale/sale_demo.xml
index 428b586ffa8..eb937199aba 100644
--- a/addons/sale/sale_demo.xml
+++ b/addons/sale/sale_demo.xml
@@ -288,6 +288,8 @@
+
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index e24a6e45fe0..d8d038eb002 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -307,7 +307,7 @@
\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-16 05:32+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-06-04 05:20+0000\n"
+"X-Generator: Launchpad (build 16660)\n"
#. module: sale_analytic_plans
#: field:sale.order.line,analytics_id:0
@@ -24,7 +24,7 @@ msgstr "Разнесение аналитики"
#. module: sale_analytic_plans
#: model:ir.model,name:sale_analytic_plans.model_sale_order
msgid "Sales Order"
-msgstr ""
+msgstr "Заказ продаж"
#. module: sale_analytic_plans
#: model:ir.model,name:sale_analytic_plans.model_sale_order_line
diff --git a/addons/sale_analytic_plans/sale_analytic_plans_view.xml b/addons/sale_analytic_plans/sale_analytic_plans_view.xml
index 3600d71b7d4..121efbdf12e 100644
--- a/addons/sale_analytic_plans/sale_analytic_plans_view.xml
+++ b/addons/sale_analytic_plans/sale_analytic_plans_view.xml
@@ -52,5 +52,17 @@
+
+ account.invoice.form.analytic.inherit
+ account.invoice
+
+
+
+
+
+
+
diff --git a/addons/sale_crm/__openerp__.py b/addons/sale_crm/__openerp__.py
index 6591589342e..7db1aa1eff0 100644
--- a/addons/sale_crm/__openerp__.py
+++ b/addons/sale_crm/__openerp__.py
@@ -47,7 +47,11 @@ modules.
'security/ir.model.access.csv',
'report/sale_crm_account_invoice_report_view.xml',
],
- 'demo': [],
+ 'js': [
+ 'static/lib/justgage.js',
+ 'static/src/js/sale_crm.js',
+ ],
+ 'demo': ['sale_crm_demo.xml'],
'test': ['test/sale_crm.yml'],
'installable': True,
'auto_install': True,
diff --git a/addons/sale_crm/i18n/ru.po b/addons/sale_crm/i18n/ru.po
index 8ae90e42303..f6266edf8ca 100644
--- a/addons/sale_crm/i18n/ru.po
+++ b/addons/sale_crm/i18n/ru.po
@@ -7,20 +7,20 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-12-21 17:06+0000\n"
-"PO-Revision-Date: 2011-03-23 13:50+0000\n"
+"PO-Revision-Date: 2013-06-03 08:05+0000\n"
"Last-Translator: Chertykov Denis \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-16 05:10+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-06-04 05:20+0000\n"
+"X-Generator: Launchpad (build 16660)\n"
#. module: sale_crm
#: code:addons/sale_crm/wizard/crm_make_sale.py:90
#, python-format
msgid "Insufficient Data!"
-msgstr ""
+msgstr "Недостаточно данных!"
#. module: sale_crm
#: view:crm.lead:0
@@ -31,12 +31,12 @@ msgstr "Преобразовать в предложение"
#. module: sale_crm
#: model:ir.model,name:sale_crm.model_account_invoice_report
msgid "Invoices Statistics"
-msgstr ""
+msgstr "Статистика по счетам"
#. module: sale_crm
#: field:crm.make.sale,close:0
msgid "Mark Won"
-msgstr ""
+msgstr "Отметить \"Выиграна\""
#. module: sale_crm
#: field:res.users,default_section_id:0
@@ -51,23 +51,23 @@ msgstr "Мои отделы продаж"
#. module: sale_crm
#: model:ir.model,name:sale_crm.model_res_users
msgid "Users"
-msgstr ""
+msgstr "Пользователи"
#. module: sale_crm
#: help:crm.make.sale,close:0
msgid ""
"Check this to close the opportunity after having created the sales order."
-msgstr ""
+msgstr "Отметьте, для закрытия предложения после создания заказа продажи."
#. module: sale_crm
#: model:mail.message.subtype,name:sale_crm.mt_salesteam_order_sent
msgid "Quotation Send"
-msgstr ""
+msgstr "Отправить предложение"
#. module: sale_crm
#: field:sale.order,categ_ids:0
msgid "Categories"
-msgstr ""
+msgstr "Категории"
#. module: sale_crm
#: code:addons/sale_crm/wizard/crm_make_sale.py:124
@@ -94,7 +94,7 @@ msgstr "Продать"
#. module: sale_crm
#: model:ir.model,name:sale_crm.model_account_invoice
msgid "Invoice"
-msgstr ""
+msgstr "Счет"
#. module: sale_crm
#: code:addons/sale_crm/wizard/crm_make_sale.py:93
@@ -106,7 +106,7 @@ msgstr "Предложение: %s"
#: code:addons/sale_crm/wizard/crm_make_sale.py:110
#, python-format
msgid "Opportunity has been converted to the quotation %s."
-msgstr ""
+msgstr "Предложение преобразовано в заявку %s."
#. module: sale_crm
#: field:crm.make.sale,shop_id:0
@@ -117,12 +117,12 @@ msgstr "Магазин"
#: code:addons/sale_crm/wizard/crm_make_sale.py:90
#, python-format
msgid "No addresse(s) defined for this customer."
-msgstr ""
+msgstr "Не задан адрес для этого заказчика"
#. module: sale_crm
#: model:mail.message.subtype,name:sale_crm.mt_salesteam_order_confirmed
msgid "Sales Order Confirmed"
-msgstr ""
+msgstr "Заказ продаж подтвержден"
#. module: sale_crm
#: view:account.invoice:0
@@ -136,7 +136,7 @@ msgstr "Отдел продаж"
#. module: sale_crm
#: view:crm.lead:0
msgid "Create Quotation"
-msgstr ""
+msgstr "Создать заявку"
#. module: sale_crm
#: model:ir.actions.act_window,name:sale_crm.action_crm_make_sale
@@ -156,7 +156,7 @@ msgstr "Заказ продаж"
#. module: sale_crm
#: view:crm.make.sale:0
msgid "or"
-msgstr ""
+msgstr "или"
#~ msgid "Create"
#~ msgstr "Создать"
diff --git a/addons/sale_crm/process/sale_crm_process.xml b/addons/sale_crm/process/sale_crm_process.xml
index 721508a2ba5..21297e12dbd 100644
--- a/addons/sale_crm/process/sale_crm_process.xml
+++ b/addons/sale_crm/process/sale_crm_process.xml
@@ -42,8 +42,8 @@
-->
diff --git a/addons/sale_crm/sale_crm.py b/addons/sale_crm/sale_crm.py
index d0899729050..97c5f4579e0 100644
--- a/addons/sale_crm/sale_crm.py
+++ b/addons/sale_crm/sale_crm.py
@@ -19,7 +19,10 @@
#
##############################################################################
-from datetime import datetime
+from datetime import date
+from dateutil import relativedelta
+
+from openerp import tools
from openerp.osv import osv, fields
@@ -31,35 +34,61 @@ class sale_order(osv.osv):
domain="['|',('section_id','=',section_id),('section_id','=',False), ('object_id.model', '=', 'crm.lead')]")
}
+ def _prepare_invoice(self, cr, uid, order, lines, context=None):
+ invoice_vals = super(sale_order, self)._prepare_invoice(cr, uid, order, lines, context=context)
+ if order.section_id and order.section_id.id:
+ invoice_vals['section_id'] = order.section_id.id
+ return invoice_vals
+
class crm_case_section(osv.osv):
_inherit = 'crm.case.section'
- def _get_sum_month_invoice(self, cr, uid, ids, field_name, arg, context=None):
- res = dict.fromkeys(ids, 0)
+ def _get_sale_orders_data(self, cr, uid, ids, field_name, arg, context=None):
+ obj = self.pool.get('sale.order')
+ res = dict.fromkeys(ids, False)
+ month_begin = date.today().replace(day=1)
+ groupby_begin = (month_begin + relativedelta.relativedelta(months=-4)).strftime(tools.DEFAULT_SERVER_DATE_FORMAT)
+ for id in ids:
+ res[id] = dict()
+ created_domain = [('section_id', '=', id), ('state', 'in', ['draft', 'sent']), ('date_order', '>=', groupby_begin)]
+ res[id]['monthly_quoted'] = self.__get_bar_values(cr, uid, obj, created_domain, ['amount_total', 'date_order'], 'amount_total', 'date_order', context=context)
+ validated_domain = [('section_id', '=', id), ('state', 'not in', ['draft', 'sent']), ('date_confirm', '>=', groupby_begin)]
+ res[id]['monthly_confirmed'] = self.__get_bar_values(cr, uid, obj, validated_domain, ['amount_total', 'date_confirm'], 'amount_total', 'date_confirm', context=context)
+ return res
+
+ def _get_invoices_data(self, cr, uid, ids, field_name, arg, context=None):
obj = self.pool.get('account.invoice.report')
- when = datetime.today()
- for section_id in ids:
- invoice_ids = obj.search(cr, uid, [("section_id", "=", section_id), ('state', 'not in', ['draft', 'cancel']), ('year', '=', when.year), ('month', '=', when.month > 9 and when.month or "0%s" % when.month)], context=context)
- for invoice in obj.browse(cr, uid, invoice_ids, context=context):
- res[section_id] += invoice.price_total
+ res = dict.fromkeys(ids, False)
+ month_begin = date.today().replace(day=1)
+ groupby_begin = (month_begin + relativedelta.relativedelta(months=-4)).strftime(tools.DEFAULT_SERVER_DATE_FORMAT)
+ for id in ids:
+ created_domain = [('section_id', '=', id), ('state', 'not in', ['draft', 'cancel']), ('date', '>=', groupby_begin)]
+ res[id] = self.__get_bar_values(cr, uid, obj, created_domain, ['price_total', 'date'], 'price_total', 'date', context=context)
return res
_columns = {
- 'quotation_ids': fields.one2many('sale.order', 'section_id',
- string='Quotations', readonly=True,
- domain=[('state', 'in', ['draft', 'sent', 'cancel'])]),
- 'sale_order_ids': fields.one2many('sale.order', 'section_id',
- string='Sale Orders', readonly=True,
- domain=[('state', 'not in', ['draft', 'sent', 'cancel'])]),
- 'invoice_ids': fields.one2many('account.invoice', 'section_id',
- string='Invoices', readonly=True,
- domain=[('state', 'not in', ['draft', 'cancel'])]),
- 'sum_month_invoice': fields.function(_get_sum_month_invoice,
- string='Total invoiced this month',
- type='integer', readonly=True),
+ 'invoiced_forecast': fields.integer(string='Invoice Forecast',
+ help="Forecast of the invoice revenue for the current month. This is the amount the sales \n"
+ "team should invoice this month. It is used to compute the progression ratio \n"
+ " of the current and forecast revenue on the kanban view."),
+ 'invoiced_target': fields.integer(string='Invoice Target',
+ help="Target of invoice revenue for the current month. This is the amount the sales \n"
+ "team estimates to be able to invoice this month."),
+ 'monthly_quoted': fields.function(_get_sale_orders_data,
+ type='string', readonly=True, multi='_get_sale_orders_data',
+ string='Rate of created quotation per duration'),
+ 'monthly_confirmed': fields.function(_get_sale_orders_data,
+ type='string', readonly=True, multi='_get_sale_orders_data',
+ string='Rate of validate sales orders per duration'),
+ 'monthly_invoiced': fields.function(_get_invoices_data,
+ type='string', readonly=True,
+ string='Rate of sent invoices per duration'),
}
+ def action_forecast(self, cr, uid, id, value, context=None):
+ return self.write(cr, uid, [id], {'invoiced_forecast': value}, context=context)
+
class res_users(osv.Model):
_inherit = 'res.users'
diff --git a/addons/sale_crm/sale_crm_demo.xml b/addons/sale_crm/sale_crm_demo.xml
new file mode 100644
index 00000000000..0c2822719dd
--- /dev/null
+++ b/addons/sale_crm/sale_crm_demo.xml
@@ -0,0 +1,130 @@
+
+
+
+
+
+ 52700
+ 60000
+
+
+
+ Indirect Sales
+ IM
+ 36000
+ 40000
+
+
+
+
+
+ draft
+ out_invoice
+ Test invoice 1
+
+
+ Basic computer with Dvorak keyboard and left-handed mouse
+ 250
+ 1
+
+
+ Little server with raid 1 and 512ECC ram
+ 800
+ 2
+
+
+ Server with raid 10 and 2048ECC ram
+ 4800
+ 4
+
+
+
+
+
+
+
+ draft
+ out_invoice
+ Test invoice 1
+
+
+ Basic formation with Dvorak
+ 500
+ 1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/sale_crm/sale_crm_view.xml b/addons/sale_crm/sale_crm_view.xml
index f8b4228334e..ae21934ce61 100644
--- a/addons/sale_crm/sale_crm_view.xml
+++ b/addons/sale_crm/sale_crm_view.xml
@@ -16,6 +16,11 @@
+
+
+ {'stage_type': 'opportunity', 'default_type': 'opportunity', 'default_user_id': uid, 'needaction_menu_ref': 'sale.menu_sale_quotations'}
+
+
sale.order.inherit
sale.order
@@ -38,7 +43,7 @@
-
@@ -96,7 +101,7 @@
-
+
@@ -110,7 +115,7 @@
-
+
@@ -130,7 +135,6 @@
{
'search_default_section_id': [active_id],
'default_section_id': active_id,
- 'search_default_my_sale_orders_filter': 1,
}
@@ -153,8 +157,8 @@
tree,form,calendar,graph
{
'search_default_section_id': [active_id],
- 'default_section_id': active_id, 'show_address': 1,
- 'search_default_my_sale_orders_filter': 1
+ 'default_section_id': active_id,
+ 'show_address': 1,
}
[('state','in',('draft','sent','cancel'))]
@@ -185,7 +189,7 @@
('type', '=', 'out_invoice')]
{
'search_default_section_id': [active_id],
- 'default_section_id': active_id},
+ 'default_section_id': active_id,
'default_type':'out_invoice',
'type':'out_invoice',
'journal_type': 'sale',
@@ -207,38 +211,68 @@
+ crm.case.section.form
+ crm.case.section
+
+
+
+
+
+
+
+
crm.case.section.kanban
crm.case.section
-
-
+
-
-
- Quotations
- Quotation
-
-
- Sales Orders
- Sales Order
-
-
- Invoices
- Invoice
-
+
+
+
+
+
+
-
+
+
+
+ Purchase Management
+Automate requisition-to-pay, control invoicing
+
+
+
+
+ 
+
+
+
+
+
+
+
+
+ +Automate procurement propositions, launch request for quotations, track purchase orders, manage suppliers' information, control products reception and check suppliers' invoices. +
+ +
+
+Automated Procurement Propositions
+Reduce inventory level with procurement rules
+
+
+ +Get the right purchase proposition at the right time to reduce your inventory level. Improve your purchase and inventory performance with procurement rules depending on stock levels, logistic rules, sales orders, forecasted manufacturing orders, etc. +
+Send requests for quotations or purchase orders to your supplier in one click. Get access to product receptions and invoices from your purchase order. +
+
+ 
+
+
+
+
+Purchase Tenders
+Get the best price by negotiating with several suppliers
+
+ 
+
+
+
+
+ +Launch purchase tenders, integrate supplier's answers in the process and compare propositions. Choose the best offer and send purchase orders easily. Use reporting to analyse the quality of your suppliers afterwards. +
+
+ 
+
+ Download our free E-book
+
+
+
+Email integrations
+
+
+ +Integrate all supplier's communications on the purchase orders (or RfQs) to get a strong traceability on the negotiation or after sales service issues. Use the claim management module to track issues related to suppliers. +
+
+ 
+
+
+
+
+Standard Price, Average Price, FIFO
+
+ 
+
+
+
+
+ +Use the costing method that reflects your business: standard price, average price, fifo or lifo. Get your accounting entries and the right inventory valuation in real-time; OpenERP manages everything for you, transparently. +
+
+
+Import Supplier Pricelists
+Take smart purchase decisions using the best prices
+
+
+ +Easily import supplier's pricelists to make smarter purchase decisions based on promotions, prices depending on quantities and special contract conditions. You can even base your sales price depending on your supplier's prices. +
+
+ 
+
+
+
+
+Control Products and Invoices
+
+
+
+ 
+
+
+
+
+ +No product or order is left behind, the inventory control allows you to manage back orders, refunds, product reception and quality control. Choose the right control method according to your need. +
++Control supplier invoices with no effort. Choose the right method according to your need: pre-generate draft invoices based on purchase orders, on products receptions, create invoices manually and import lines from purchase orders, etc. +
+
+
+Get Statistics On Your Purchases
+
+
+ +Get accurate statistics on the performance of your suppliers through flexible reporting: delivery delays, negotiated discount on prices, quantities purchased, etc. Integrate purchases with the analytic accounting to analyse your contracts profitability. +
+
+ 
+
+
+
- 'dy' bug - https://github.com/DmitryBaranovskiy/raphael/issues/491
+ * 'show' parameters, like showMinMax are now 'hide' because I am lame developer - please update these in your setups
+ * Min and Max labels are now auto-off when in donut mode
+ * Start angle in donut mode is now 90
+ * donutStartAngle - option to define start angle for donut
+
+ * -----------------------------
+ * November 25, 2012.
+ * -----------------------------
+ * Option to define custom rendering function for displayed value
+
+ * -----------------------------
+ * November 19, 2012.
+ * -----------------------------
+ * Config.value is now updated after gauge refresh
+
+ * -----------------------------
+ * November 13, 2012.
+ * -----------------------------
+ * Donut display mode added
+ * Option to hide value label
+ * Option to enable responsive gauge size
+ * Removed default title attribute
+ * Option to accept min and max defined as string values
+ * Option to configure value symbol
+ * Fixed bad aspect ratio calculations
+ * Option to configure minimum font size for all texts
+ * Option to show shorthand big numbers (human friendly)
+ */
+
+ JustGage = function(config) {
+
+ if (!config.id) {alert("Missing id parameter for gauge!"); return false;}
+ if (!config.node) {
+ if (!document.getElementById(config.id)) {alert("No element with id: \""+config.id+"\" found!"); return false;}
+ config.node = document.getElementById(config.id);
+ }
+
+ var obj = this;
+
+ // configurable parameters
+ obj.config =
+ {
+ // id : string
+ // this is container element id
+ id : config.id,
+
+ // node : string
+ // the node to use instead of DOM
+ node : config.node,
+
+ // title : string
+ // gauge title
+ title : (config.title) ? config.title : "",
+
+ // titleFontColor : string
+ // color of gauge title
+ titleFontColor : (config.titleFontColor) ? config.titleFontColor : "#999999",
+
+ // value : int
+ // value gauge is showing
+ value : (config.value) ? config.value : 0,
+
+
+ // valueFontColor : string
+ // color of label showing current value
+ valueFontColor : (config.valueFontColor) ? config.valueFontColor : "#010101",
+
+ // symbol : string
+ // special symbol to show next to value
+ symbol : (config.symbol) ? config.symbol : "",
+
+ // min : int
+ // min value
+ min : (config.min) ? parseFloat(config.min) : 0,
+
+ // max : int
+ // max value
+ max : (config.max) ? parseFloat(config.max) : 100,
+
+ // humanFriendlyDecimal : int
+ // number of decimal places for our human friendly number to contain
+ humanFriendlyDecimal : (config.humanFriendlyDecimal) ? config.humanFriendlyDecimal : 0,
+
+ // textRenderer: func
+ // function applied before rendering text
+ textRenderer : (config.textRenderer) ? config.textRenderer : null,
+
+ // gaugeWidthScale : float
+ // width of the gauge element
+ gaugeWidthScale : (config.gaugeWidthScale) ? config.gaugeWidthScale : 1.0,
+
+ // gaugeColor : string
+ // background color of gauge element
+ gaugeColor : (config.gaugeColor) ? config.gaugeColor : "#edebeb",
+
+ // label : string
+ // text to show below value
+ label : (config.label) ? config.label : "",
+
+ // labelFontColor : string
+ // color of label showing label under value
+ labelFontColor : (config.labelFontColor) ? config.labelFontColor : "#b3b3b3",
+
+ // shadowOpacity : int
+ // 0 ~ 1
+ shadowOpacity : (config.shadowOpacity) ? config.shadowOpacity : 0.2,
+
+ // shadowSize: int
+ // inner shadow size
+ shadowSize : (config.shadowSize) ? config.shadowSize : 5,
+
+ // shadowVerticalOffset : int
+ // how much shadow is offset from top
+ shadowVerticalOffset : (config.shadowVerticalOffset) ? config.shadowVerticalOffset : 3,
+
+ // levelColors : string[]
+ // colors of indicator, from lower to upper, in RGB format
+ levelColors : (config.levelColors) ? config.levelColors : [
+ "#a9d70b",
+ "#f9c802",
+ "#ff0000"
+ ],
+
+ // startAnimationTime : int
+ // length of initial animation
+ startAnimationTime : (config.startAnimationTime) ? config.startAnimationTime : 700,
+
+ // startAnimationType : string
+ // type of initial animation (linear, >, <, <>, bounce)
+ startAnimationType : (config.startAnimationType) ? config.startAnimationType : ">",
+
+ // refreshAnimationTime : int
+ // length of refresh animation
+ refreshAnimationTime : (config.refreshAnimationTime) ? config.refreshAnimationTime : 700,
+
+ // refreshAnimationType : string
+ // type of refresh animation (linear, >, <, <>, bounce)
+ refreshAnimationType : (config.refreshAnimationType) ? config.refreshAnimationType : ">",
+
+ // donutStartAngle : int
+ // angle to start from when in donut mode
+ donutStartAngle : (config.donutStartAngle) ? config.donutStartAngle : 90,
+
+ // valueMinFontSize : int
+ // absolute minimum font size for the value
+ valueMinFontSize : config.valueMinFontSize || 16,
+
+ // titleMinFontSize
+ // absolute minimum font size for the title
+ titleMinFontSize : config.titleMinFontSize || 10,
+
+ // labelMinFontSize
+ // absolute minimum font size for the label
+ labelMinFontSize : config.labelMinFontSize || 10,
+
+ // minLabelMinFontSize
+ // absolute minimum font size for the minimum label
+ minLabelMinFontSize : config.minLabelMinFontSize || 10,
+
+ // maxLabelMinFontSize
+ // absolute minimum font size for the maximum label
+ maxLabelMinFontSize : config.maxLabelMinFontSize || 10,
+
+ // hideValue : bool
+ // hide value text
+ hideValue : (config.hideValue) ? config.hideValue : false,
+
+ // hideMinMax : bool
+ // hide min and max values
+ hideMinMax : (config.hideMinMax) ? config.hideMinMax : false,
+
+ // hideInnerShadow : bool
+ // hide inner shadow
+ hideInnerShadow : (config.hideInnerShadow) ? config.hideInnerShadow : false,
+
+ // humanFriendly : bool
+ // convert large numbers for min, max, value to human friendly (e.g. 1234567 -> 1.23M)
+ humanFriendly : (config.humanFriendly) ? config.humanFriendly : false,
+
+ // noGradient : bool
+ // whether to use gradual color change for value, or sector-based
+ noGradient : (config.noGradient) ? config.noGradient : false,
+
+ // donut : bool
+ // show full donut gauge
+ donut : (config.donut) ? config.donut : false,
+
+ // relativeGaugeSize : bool
+ // whether gauge size should follow changes in container element size
+ relativeGaugeSize : (config.relativeGaugeSize) ? config.relativeGaugeSize : false,
+
+ // counter : bool
+ // animate level number change
+ counter : (config.counter) ? config.counter : false,
+
+ // decimals : int
+ // number of digits after floating point
+ decimals : (config.decimals) ? config.decimals : 0,
+
+ // customSectors : [] of objects
+ // number of digits after floating point
+ customSectors : (config.customSectors) ? config.customSectors : []
+ };
+
+ // variables
+ var
+ canvasW,
+ canvasH,
+ widgetW,
+ widgetH,
+ aspect,
+ dx,
+ dy,
+ titleFontSize,
+ titleX,
+ titleY,
+ valueFontSize,
+ valueX,
+ valueY,
+ labelFontSize,
+ labelX,
+ labelY,
+ minFontSize,
+ minX,
+ minY,
+ maxFontSize,
+ maxX,
+ maxY;
+
+ // overflow values
+ if (this.config.value > this.config.max) this.config.value = this.config.max;
+ if (this.config.value < this.config.min) this.config.value = this.config.min;
+ this.originalValue = config.value;
+
+ // canvas
+ this.canvas = Raphael(this.config.node, "100%", "100%");
+ if (this.config.relativeGaugeSize === true) {
+ this.canvas.setViewBox(0, 0, 200, 150, true);
+ }
+
+ // canvas dimensions
+ if (this.config.relativeGaugeSize === true) {
+ canvasW = 200;
+ canvasH = 150;
+ } else {
+ canvasW = getStyle(this.config.node, "width").slice(0, -2) * 1;
+ canvasH = getStyle(this.config.node, "height").slice(0, -2) * 1;
+ }
+
+ // widget dimensions
+ if (this.config.donut === true) {
+
+ // DONUT *******************************
+
+ // width more than height
+ if(canvasW > canvasH) {
+ widgetH = canvasH;
+ widgetW = widgetH;
+ // width less than height
+ } else if (canvasW < canvasH) {
+ widgetW = canvasW;
+ widgetH = widgetW;
+ // if height don't fit, rescale both
+ if(widgetH > canvasH) {
+ aspect = widgetH / canvasH;
+ widgetH = widgetH / aspect;
+ widgetW = widgetH / aspect;
+ }
+ // equal
+ } else {
+ widgetW = canvasW;
+ widgetH = widgetW;
+ }
+
+ // delta
+ dx = (canvasW - widgetW)/2;
+ dy = (canvasH - widgetH)/2;
+
+ // title
+ titleFontSize = ((widgetH / 8) > 10) ? (widgetH / 10) : 10;
+ titleX = dx + widgetW / 2;
+ titleY = dy + widgetH / 11;
+
+ // value
+ valueFontSize = ((widgetH / 6.4) > 16) ? (widgetH / 5.4) : 18;
+ valueX = dx + widgetW / 2;
+ if(this.config.label !== '') {
+ valueY = dy + widgetH / 1.85;
+ } else {
+ valueY = dy + widgetH / 1.7;
+ }
+
+ // label
+ labelFontSize = ((widgetH / 16) > 10) ? (widgetH / 16) : 10;
+ labelX = dx + widgetW / 2;
+ labelY = valueY + labelFontSize;
+
+ // min
+ minFontSize = ((widgetH / 16) > 10) ? (widgetH / 16) : 10;
+ minX = dx + (widgetW / 10) + (widgetW / 6.666666666666667 * this.config.gaugeWidthScale) / 2 ;
+ minY = labelY;
+
+ // max
+ maxFontSize = ((widgetH / 16) > 10) ? (widgetH / 16) : 10;
+ maxX = dx + widgetW - (widgetW / 10) - (widgetW / 6.666666666666667 * this.config.gaugeWidthScale) / 2 ;
+ maxY = labelY;
+
+ } else {
+ // HALF *******************************
+
+ // width more than height
+ if(canvasW > canvasH) {
+ widgetH = canvasH;
+ widgetW = widgetH * 1.25;
+ //if width doesn't fit, rescale both
+ if(widgetW > canvasW) {
+ aspect = widgetW / canvasW;
+ widgetW = widgetW / aspect;
+ widgetH = widgetH / aspect;
+ }
+ // width less than height
+ } else if (canvasW < canvasH) {
+ widgetW = canvasW;
+ widgetH = widgetW / 1.25;
+ // if height don't fit, rescale both
+ if(widgetH > canvasH) {
+ aspect = widgetH / canvasH;
+ widgetH = widgetH / aspect;
+ widgetW = widgetH / aspect;
+ }
+ // equal
+ } else {
+ widgetW = canvasW;
+ widgetH = widgetW * 0.75;
+ }
+
+ // delta
+ dx = (canvasW - widgetW)/2;
+ dy = (canvasH - widgetH)/2;
+
+ // title
+ titleFontSize = ((widgetH / 8) > this.config.titleMinFontSize) ? (widgetH / 10) : this.config.titleMinFontSize;
+ titleX = dx + widgetW / 2;
+ titleY = dy + widgetH / 6.4;
+
+ // value
+ valueFontSize = ((widgetH / 6.5) > this.config.valueMinFontSize) ? (widgetH / 6.5) : this.config.valueMinFontSize;
+ valueX = dx + widgetW / 2;
+ valueY = dy + widgetH / 1.275;
+
+ // label
+ labelFontSize = ((widgetH / 16) > this.config.labelMinFontSize) ? (widgetH / 16) : this.config.labelMinFontSize;
+ labelX = dx + widgetW / 2;
+ labelY = valueY + valueFontSize / 2 + 5;
+
+ // min
+ minFontSize = ((widgetH / 16) > this.config.minLabelMinFontSize) ? (widgetH / 16) : this.config.minLabelMinFontSize;
+ minX = dx + (widgetW / 10) + (widgetW / 6.666666666666667 * this.config.gaugeWidthScale) / 2 ;
+ minY = labelY;
+
+ // max
+ maxFontSize = ((widgetH / 16) > this.config.maxLabelMinFontSize) ? (widgetH / 16) : this.config.maxLabelMinFontSize;
+ maxX = dx + widgetW - (widgetW / 10) - (widgetW / 6.666666666666667 * this.config.gaugeWidthScale) / 2 ;
+ maxY = labelY;
+ }
+
+ // parameters
+ this.params = {
+ canvasW : canvasW,
+ canvasH : canvasH,
+ widgetW : widgetW,
+ widgetH : widgetH,
+ dx : dx,
+ dy : dy,
+ titleFontSize : titleFontSize,
+ titleX : titleX,
+ titleY : titleY,
+ valueFontSize : valueFontSize,
+ valueX : valueX,
+ valueY : valueY,
+ labelFontSize : labelFontSize,
+ labelX : labelX,
+ labelY : labelY,
+ minFontSize : minFontSize,
+ minX : minX,
+ minY : minY,
+ maxFontSize : maxFontSize,
+ maxX : maxX,
+ maxY : maxY
+ };
+
+ // var clear
+ canvasW, canvasH, widgetW, widgetH, aspect, dx, dy, titleFontSize, titleX, titleY, valueFontSize, valueX, valueY, labelFontSize, labelX, labelY, minFontSize, minX, minY, maxFontSize, maxX, maxY = null
+
+ // pki - custom attribute for generating gauge paths
+ this.canvas.customAttributes.pki = function (value, min, max, w, h, dx, dy, gws, donut) {
+
+ var alpha, Ro, Ri, Cx, Cy, Xo, Yo, Xi, Yi, path;
+
+ if (donut) {
+ alpha = (1 - 2 * (value - min) / (max - min)) * Math.PI;
+ Ro = w / 2 - w / 7;
+ Ri = Ro - w / 6.666666666666667 * gws;
+
+ Cx = w / 2 + dx;
+ Cy = h / 1.95 + dy;
+
+ Xo = w / 2 + dx + Ro * Math.cos(alpha);
+ Yo = h - (h - Cy) + 0 - Ro * Math.sin(alpha);
+ Xi = w / 2 + dx + Ri * Math.cos(alpha);
+ Yi = h - (h - Cy) + 0 - Ri * Math.sin(alpha);
+
+ path += "M" + (Cx - Ri) + "," + Cy + " ";
+ path += "L" + (Cx - Ro) + "," + Cy + " ";
+ if (value > ((max - min) / 2)) {
+ path += "A" + Ro + "," + Ro + " 0 0 1 " + (Cx + Ro) + "," + Cy + " ";
+ }
+ path += "A" + Ro + "," + Ro + " 0 0 1 " + Xo + "," + Yo + " ";
+ path += "L" + Xi + "," + Yi + " ";
+ if (value > ((max - min) / 2)) {
+ path += "A" + Ri + "," + Ri + " 0 0 0 " + (Cx + Ri) + "," + Cy + " ";
+ }
+ path += "A" + Ri + "," + Ri + " 0 0 0 " + (Cx - Ri) + "," + Cy + " ";
+ path += "Z ";
+
+ return { path: path };
+
+ } else {
+ alpha = (1 - (value - min) / (max - min)) * Math.PI;
+ Ro = w / 2 - w / 10;
+ Ri = Ro - w / 6.666666666666667 * gws;
+
+ Cx = w / 2 + dx;
+ Cy = h / 1.25 + dy;
+
+ Xo = w / 2 + dx + Ro * Math.cos(alpha);
+ Yo = h - (h - Cy) + 0 - Ro * Math.sin(alpha);
+ Xi = w / 2 + dx + Ri * Math.cos(alpha);
+ Yi = h - (h - Cy) + 0 - Ri * Math.sin(alpha);
+
+ path += "M" + (Cx - Ri) + "," + Cy + " ";
+ path += "L" + (Cx - Ro) + "," + Cy + " ";
+ path += "A" + Ro + "," + Ro + " 0 0 1 " + Xo + "," + Yo + " ";
+ path += "L" + Xi + "," + Yi + " ";
+ path += "A" + Ri + "," + Ri + " 0 0 0 " + (Cx - Ri) + "," + Cy + " ";
+ path += "Z ";
+
+ return { path: path };
+ }
+
+ // var clear
+ alpha, Ro, Ri, Cx, Cy, Xo, Yo, Xi, Yi, path = null;
+ };
+
+ // gauge
+ this.gauge = this.canvas.path().attr({
+ "stroke": "none",
+ "fill": this.config.gaugeColor,
+ pki: [this.config.max, this.config.min, this.config.max, this.params.widgetW, this.params.widgetH, this.params.dx, this.params.dy, this.config.gaugeWidthScale, this.config.donut]
+ });
+ this.gauge.id = this.config.id+"-gauge";
+
+ // level
+ this.level = this.canvas.path().attr({
+ "stroke": "none",
+ "fill": getColor(this.config.value, (this.config.value - this.config.min) / (this.config.max - this.config.min), this.config.levelColors, this.config.noGradient, this.config.customSectors),
+ pki: [this.config.min, this.config.min, this.config.max, this.params.widgetW, this.params.widgetH, this.params.dx, this.params.dy, this.config.gaugeWidthScale, this.config.donut]
+ });
+ if(this.config.donut) {
+ this.level.transform("r" + this.config.donutStartAngle + ", " + (this.params.widgetW/2 + this.params.dx) + ", " + (this.params.widgetH/1.95 + this.params.dy));
+ }
+ this.level.id = this.config.id+"-level";
+
+ // title
+ this.txtTitle = this.canvas.text(this.params.titleX, this.params.titleY, this.config.title);
+ this.txtTitle.attr({
+ "font-size":this.params.titleFontSize,
+ "font-weight":"bold",
+ "font-family":"Arial",
+ "fill":this.config.titleFontColor,
+ "fill-opacity":"1"
+ });
+ setDy(this.txtTitle, this.params.titleFontSize, this.params.titleY);
+ this.txtTitle.id = this.config.id+"-txttitle";
+
+ // value
+ this.txtValue = this.canvas.text(this.params.valueX, this.params.valueY, 0);
+ this.txtValue.attr({
+ "font-size":this.params.valueFontSize,
+ "font-weight":"bold",
+ "font-family":"Arial",
+ "fill":this.config.valueFontColor,
+ "fill-opacity":"0"
+ });
+ setDy(this.txtValue, this.params.valueFontSize, this.params.valueY);
+ this.txtValue.id = this.config.id+"-txtvalue";
+
+ // label
+ this.txtLabel = this.canvas.text(this.params.labelX, this.params.labelY, this.config.label);
+ this.txtLabel.attr({
+ "font-size":this.params.labelFontSize,
+ "font-weight":"normal",
+ "font-family":"Arial",
+ "fill":this.config.labelFontColor,
+ "fill-opacity":"0"
+ });
+ setDy(this.txtLabel, this.params.labelFontSize, this.params.labelY);
+ this.txtLabel.id = this.config.id+"-txtlabel";
+
+ // min
+ this.txtMinimum = this.config.min;
+ if( this.config.humanFriendly ) this.txtMinimum = humanFriendlyNumber( this.config.min, this.config.humanFriendlyDecimal );
+ this.txtMin = this.canvas.text(this.params.minX, this.params.minY, this.txtMinimum);
+ this.txtMin.attr({
+ "font-size":this.params.minFontSize,
+ "font-weight":"normal",
+ "font-family":"Arial",
+ "fill":this.config.labelFontColor,
+ "fill-opacity": (this.config.hideMinMax || this.config.donut)? "0" : "1"
+ });
+ setDy(this.txtMin, this.params.minFontSize, this.params.minY);
+ this.txtMin.id = this.config.id+"-txtmin";
+
+ // max
+ this.txtMaximum = this.config.max;
+ if( this.config.humanFriendly ) this.txtMaximum = humanFriendlyNumber( this.config.max, this.config.humanFriendlyDecimal );
+ this.txtMax = this.canvas.text(this.params.maxX, this.params.maxY, this.txtMaximum);
+ this.txtMax.attr({
+ "font-size":this.params.maxFontSize,
+ "font-weight":"normal",
+ "font-family":"Arial",
+ "fill":this.config.labelFontColor,
+ "fill-opacity": (this.config.hideMinMax || this.config.donut)? "0" : "1"
+ });
+ setDy(this.txtMax, this.params.maxFontSize, this.params.maxY);
+ this.txtMax.id = this.config.id+"-txtmax";
+
+ var defs = this.canvas.canvas.childNodes[1];
+ var svg = "http://www.w3.org/2000/svg";
+
+ if (ie < 9) {
+ onCreateElementNsReady(function() {
+ this.generateShadow(svg, defs);
+ });
+ } else {
+ this.generateShadow(svg, defs);
+ }
+
+ // var clear
+ defs, svg = null;
+
+ // execute on each animation frame
+ function onAnimate() {
+ if (obj.config.counter) {
+ var currentValue = obj.level.attr("pki");
+
+ if(obj.config.textRenderer) {
+ // this.originalValue = this.config.textRenderer(this.originalValue);
+ obj.txtValue.attr("text", obj.config.textRenderer(Math.floor(currentValue[0])));
+ } else if(obj.config.humanFriendly) {
+ // this.originalValue = humanFriendlyNumber( this.originalValue, this.config.humanFriendlyDecimal ) + this.config.symbol;
+ obj.txtValue.attr("text", humanFriendlyNumber( Math.floor(currentValue[0]), obj.config.humanFriendlyDecimal ) + obj.config.symbol);
+ } else {
+ // this.originalValue += this.config.symbol;
+ obj.txtValue.attr("text", (currentValue[0] * 1).toFixed(obj.config.decimals) + obj.config.symbol);
+ }
+
+ setDy(obj.txtValue, obj.params.valueFontSize, obj.params.valueY);
+ currentValue = null;
+ }
+ }
+
+ if(!obj.config.counter) {
+ if(obj.config.textRenderer) {
+ obj.originalValue = obj.config.textRenderer(obj.originalValue);
+ } else if(obj.config.humanFriendly) {
+ obj.originalValue = humanFriendlyNumber( obj.originalValue, obj.config.humanFriendlyDecimal ) + obj.config.symbol;
+ } else {
+ obj.originalValue = (obj.originalValue * 1).toFixed(obj.config.decimals) + obj.config.symbol;
+ }
+
+ obj.txtValue.attr("text", obj.originalValue);
+ setDy(obj.txtValue, obj.params.valueFontSize, obj.params.valueY);
+ }
+
+ //event fired on each animation frame
+ eve.on("raphael.anim.frame.*", onAnimate);
+
+ // animate gauge level
+ this.level.animate({pki: [this.config.value, this.config.min, this.config.max, this.params.widgetW, this.params.widgetH, this.params.dx, this.params.dy, this.config.gaugeWidthScale, this.config.donut]}, this.config.startAnimationTime, this.config.startAnimationType);
+
+ // animate value
+ this.txtValue.animate({"fill-opacity":"1"}, this.config.startAnimationTime, this.config.startAnimationType);
+
+ // animate label
+ this.txtLabel.animate({"fill-opacity":"1"}, this.config.startAnimationTime, this.config.startAnimationType);
+};
+
+/** Refresh gauge level */
+JustGage.prototype.refresh = function(val, max) {
+
+ var originalVal, displayVal, color, max = max || null;
+
+ // set new max
+ if(max !== null) {
+ this.config.max = max;
+
+ this.txtMaximum = this.config.max;
+ if( this.config.humanFriendly ) this.txtMaximum = humanFriendlyNumber( this.config.max, this.config.humanFriendlyDecimal );
+ this.txtMax.attr({"text" : this.config.max});
+ setDy(this.txtMax, this.params.maxFontSize, this.params.maxY);
+ }
+
+ // overflow values
+ originalVal = val;
+ displayVal = val;
+ if ((val * 1) > (this.config.max * 1)) {val = (this.config.max * 1);}
+ if ((val * 1) < (this.config.min * 1)) {val = (this.config.min * 1);}
+
+ color = getColor(val, (val - this.config.min) / (this.config.max - this.config.min), this.config.levelColors, this.config.noGradient, this.config.customSectors);
+
+ if(this.config.textRenderer) {
+ displayVal = this.config.textRenderer(displayVal);
+ } else if( this.config.humanFriendly ) {
+ displayVal = humanFriendlyNumber( displayVal, this.config.humanFriendlyDecimal ) + this.config.symbol;
+ } else {
+ displayVal = (displayVal * 1).toFixed(this.config.decimals) + this.config.symbol;
+ }
+
+ if(!this.config.counter) {
+ this.canvas.getById(this.config.id+"-txtvalue").attr({"text":displayVal});
+ setDy(this.canvas.getById(this.config.id+"-txtvalue"), this.params.valueFontSize, this.params.valueY);
+ }
+
+ this.canvas.getById(this.config.id+"-level").animate({pki: [val, this.config.min, this.config.max, this.params.widgetW, this.params.widgetH, this.params.dx, this.params.dy, this.config.gaugeWidthScale, this.config.donut], "fill":color}, this.config.refreshAnimationTime, this.config.refreshAnimationType);
+ this.config.value = val * 1;
+
+ // var clear
+ originalVal, displayVal, color, max = null;
+};
+
+/** Generate shadow */
+JustGage.prototype.generateShadow = function(svg, defs) {
+
+ var gaussFilter, feOffset, feGaussianBlur, feComposite1, feFlood, feComposite2, feComposite3;
+
+ // FILTER
+ gaussFilter=document.createElementNS(svg,"filter");
+ gaussFilter.setAttribute("id", this.config.id + "-inner-shadow");
+ defs.appendChild(gaussFilter);
+
+ // offset
+ feOffset = document.createElementNS(svg,"feOffset");
+ feOffset.setAttribute("dx", 0);
+ feOffset.setAttribute("dy", this.config.shadowVerticalOffset);
+ gaussFilter.appendChild(feOffset);
+
+ // blur
+ feGaussianBlur = document.createElementNS(svg,"feGaussianBlur");
+ feGaussianBlur.setAttribute("result","offset-blur");
+ feGaussianBlur.setAttribute("stdDeviation", this.config.shadowSize);
+ gaussFilter.appendChild(feGaussianBlur);
+
+ // composite 1
+ feComposite1 = document.createElementNS(svg,"feComposite");
+ feComposite1.setAttribute("operator","out");
+ feComposite1.setAttribute("in", "SourceGraphic");
+ feComposite1.setAttribute("in2","offset-blur");
+ feComposite1.setAttribute("result","inverse");
+ gaussFilter.appendChild(feComposite1);
+
+ // flood
+ feFlood = document.createElementNS(svg,"feFlood");
+ feFlood.setAttribute("flood-color","black");
+ feFlood.setAttribute("flood-opacity", this.config.shadowOpacity);
+ feFlood.setAttribute("result","color");
+ gaussFilter.appendChild(feFlood);
+
+ // composite 2
+ feComposite2 = document.createElementNS(svg,"feComposite");
+ feComposite2.setAttribute("operator","in");
+ feComposite2.setAttribute("in", "color");
+ feComposite2.setAttribute("in2","inverse");
+ feComposite2.setAttribute("result","shadow");
+ gaussFilter.appendChild(feComposite2);
+
+ // composite 3
+ feComposite3 = document.createElementNS(svg,"feComposite");
+ feComposite3.setAttribute("operator","over");
+ feComposite3.setAttribute("in", "shadow");
+ feComposite3.setAttribute("in2","SourceGraphic");
+ gaussFilter.appendChild(feComposite3);
+
+ // set shadow
+ if (!this.config.hideInnerShadow) {
+ this.canvas.canvas.childNodes[2].setAttribute("filter", "url(#" + this.config.id + "-inner-shadow)");
+ this.canvas.canvas.childNodes[3].setAttribute("filter", "url(#" + this.config.id + "-inner-shadow)");
+ }
+
+ // var clear
+ gaussFilter, feOffset, feGaussianBlur, feComposite1, feFlood, feComposite2, feComposite3 = null;
+
+};
+
+/** Get color for value */
+function getColor(val, pct, col, noGradient, custSec) {
+
+ var no, inc, colors, percentage, rval, gval, bval, lower, upper, range, rangePct, pctLower, pctUpper, color;
+ var noGradient = noGradient || custSec.length > 0;
+
+ if(custSec.length > 0) {
+ for(var i = 0; i < custSec.length; i++) {
+ if(val > custSec[i].lo && val <= custSec[i].hi) {
+ return custSec[i].color;
+ }
+ }
+ }
+
+ no = col.length;
+ if (no === 1) return col[0];
+ inc = (noGradient) ? (1 / no) : (1 / (no - 1));
+ colors = [];
+ for (var i = 0; i < col.length; i++) {
+ percentage = (noGradient) ? (inc * (i + 1)) : (inc * i);
+ rval = parseInt((cutHex(col[i])).substring(0,2),16);
+ gval = parseInt((cutHex(col[i])).substring(2,4),16);
+ bval = parseInt((cutHex(col[i])).substring(4,6),16);
+ colors[i] = { pct: percentage, color: { r: rval, g: gval, b: bval } };
+ }
+
+ if(pct === 0) {
+ return 'rgb(' + [colors[0].color.r, colors[0].color.g, colors[0].color.b].join(',') + ')';
+ }
+
+ for (var j = 0; j < colors.length; j++) {
+ if (pct <= colors[j].pct) {
+ if (noGradient) {
+ return 'rgb(' + [colors[j].color.r, colors[j].color.g, colors[j].color.b].join(',') + ')';
+ } else {
+ lower = colors[j - 1];
+ upper = colors[j];
+ range = upper.pct - lower.pct;
+ rangePct = (pct - lower.pct) / range;
+ pctLower = 1 - rangePct;
+ pctUpper = rangePct;
+ color = {
+ r: Math.floor(lower.color.r * pctLower + upper.color.r * pctUpper),
+ g: Math.floor(lower.color.g * pctLower + upper.color.g * pctUpper),
+ b: Math.floor(lower.color.b * pctLower + upper.color.b * pctUpper)
+ };
+ return 'rgb(' + [color.r, color.g, color.b].join(',') + ')';
+ }
+ }
+ }
+
+}
+
+/** Fix Raphael display:none tspan dy attribute bug */
+function setDy(elem, fontSize, txtYpos) {
+ if ((!ie || ie > 9) && (elem.node.firstChild.attributes.dy)) {
+ elem.node.firstChild.attributes.dy.value = 0;
+ }
+}
+
+/** Random integer */
+function getRandomInt (min, max) {
+ return Math.floor(Math.random() * (max - min + 1)) + min;
+}
+
+/** Cut hex */
+function cutHex(str) {
+ return (str.charAt(0)=="#") ? str.substring(1,7):str;
+}
+
+/** Human friendly number suffix - From: http://stackoverflow.com/questions/2692323/code-golf-friendly-number-abbreviator */
+function humanFriendlyNumber( n, d ) {
+ var p, d2, i, s;
+
+ p = Math.pow;
+ d2 = p(10, d);
+ i = 7;
+ while( i ) {
+ s = p(10,i--*3);
+ if( s <= n ) {
+ n = Math.round(n*d2/s)/d2+"KMGTPE"[i];
+ }
+ }
+ return n;
+}
+
+/** Get style */
+function getStyle(oElm, strCssRule){
+ var strValue = "";
+ if(document.defaultView && document.defaultView.getComputedStyle){
+ strValue = document.defaultView.getComputedStyle(oElm).getPropertyValue(strCssRule);
+ }
+ else if(oElm.currentStyle){
+ strCssRule = strCssRule.replace(/\-(\w)/g, function (strMatch, p1){
+ return p1.toUpperCase();
+ });
+ strValue = oElm.currentStyle[strCssRule];
+ }
+ return strValue;
+}
+
+/** Create Element NS Ready */
+function onCreateElementNsReady(func) {
+ if (document.createElementNS !== undefined) {
+ func();
+ } else {
+ setTimeout(function() { onCreateElementNsReady(func); }, 100);
+ }
+}
+
+/** Get IE version */
+// ----------------------------------------------------------
+// A short snippet for detecting versions of IE in JavaScript
+// without resorting to user-agent sniffing
+// ----------------------------------------------------------
+// If you're not in IE (or IE version is less than 5) then:
+// ie === undefined
+// If you're in IE (>=5) then you can determine which version:
+// ie === 7; // IE7
+// Thus, to detect IE:
+// if (ie) {}
+// And to detect the version:
+// ie === 6 // IE6
+// ie > 7 // IE8, IE9 ...
+// ie < 9 // Anything less than IE9
+// ----------------------------------------------------------
+// UPDATE: Now using Live NodeList idea from @jdalton
+var ie = (function(){
+
+ var undef,
+ v = 3,
+ div = document.createElement('div'),
+ all = div.getElementsByTagName('i');
+
+ while (
+ div.innerHTML = '',
+ all[0]
+ );
+ return v > 4 ? v : undef;
+}());
\ No newline at end of file
diff --git a/addons/sale_crm/static/src/js/sale_crm.js b/addons/sale_crm/static/src/js/sale_crm.js
new file mode 100644
index 00000000000..207ac959af3
--- /dev/null
+++ b/addons/sale_crm/static/src/js/sale_crm.js
@@ -0,0 +1,108 @@
+openerp.sale_crm = function(openerp) {
+var _t = openerp.web._t;
+
+openerp.sale_crm.GaugeWidget = openerp.web_kanban.AbstractField.extend({
+ className: "oe_gage",
+ start: function() {
+ var self = this;
+
+ var parent = this.getParent();
+ var max = this.options.max_field ? parent.record[this.options.max_field].raw_value : 100;
+ var label = this.options.label_field ? parent.record[this.options.label_field].raw_value : "";
+ var title = this.$node.html();
+ var val = this.field.value;
+ var value = _.isArray(val) && val.length ? val[val.length-1]['value'] : val;
+ var unique_id = _.uniqueId("JustGage");
+
+ this.$el.empty()
+ .attr('style', this.$node.attr('style') + ';position:relative; display:inline-block;')
+ .attr('id', unique_id);
+ this.gage = new JustGage({
+ id: unique_id,
+ node: this.$el[0],
+ title: title,
+ value: value,
+ min: 0,
+ max: max,
+ relativeGaugeSize: true,
+ humanFriendly: true,
+ titleFontColor: '#333333',
+ valueFontColor: '#333333',
+ labelFontColor: '#000',
+ label: label,
+ levelColors: [
+ "#ff0000",
+ "#f9c802",
+ "#a9d70b"
+ ],
+ });
+
+ var flag_open = false;
+ if (self.options.action_change) {
+ var $svg = self.$el.find('svg');
+ var css = {
+ 'text-align': 'center',
+ 'position': 'absolute',
+ 'width': self.$el.outerWidth() + 'px',
+ 'top': (self.$el.outerHeight()/2-5) + 'px'
+ };
+
+ self.$el.click(function (event) {
+ event.stopPropagation();
+ flag_open = false;
+ if (!parent.view.is_action_enabled('edit')) {
+ return;
+ }
+ if (!self.$el.find(".oe_justgage_edit").size()) {
+ $div = $('');
+ $div.css(css);
+ $input = $('').val(value);
+ $input.css({
+ 'text-align': 'center',
+ 'margin': 'auto',
+ 'width': ($svg.outerWidth()-40) + 'px'
+ });
+ $div.append($input);
+ self.$el.prepend($div)
+ $input.focus()
+ .keydown(function (event) {
+ event.stopPropagation();
+ if (event.keyCode == 13 || event.keyCode == 9) {
+ if ($input.val() != value) {
+ parent.view.dataset.call(self.options.action_change, [parent.id, $input.val()]).then(function () {
+ parent.do_reload();
+ });
+ } else {
+ $div.remove();
+ }
+ }
+ })
+ .click(function (event) {
+ event.stopPropagation();
+ flag_open = false;
+ })
+ .blur(function (event) {
+ if(!flag_open) {
+ self.$el.find(".oe_justgage_edit").remove();
+ } else {
+ flag_open = false;
+ setTimeout(function () {$input.focus();}, 0);
+ }
+ });
+ }
+ }).mousedown(function () {
+ flag_open = true;
+ });
+
+ if (!+value) {
+ $svg.fadeTo(0, 0.3);
+ $div = $('').text(_t("Click to change value"));
+ $div.css(css);
+ self.$el.append($div);
+ }
+ }
+ },
+});
+openerp.web_kanban.fields_registry.add("gage", "openerp.sale_crm.GaugeWidget");
+
+};
diff --git a/addons/sale_journal/i18n/ru.po b/addons/sale_journal/i18n/ru.po
index b4830dcfcd7..9a4370f5d61 100644
--- a/addons/sale_journal/i18n/ru.po
+++ b/addons/sale_journal/i18n/ru.po
@@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-12-21 17:06+0000\n"
-"PO-Revision-Date: 2011-01-20 08:56+0000\n"
+"PO-Revision-Date: 2013-06-05 11:29+0000\n"
"Last-Translator: Chertykov Denis \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-16 05:27+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-06-06 05:21+0000\n"
+"X-Generator: Launchpad (build 16667)\n"
#. module: sale_journal
#: field:sale_journal.invoice.type,note:0
@@ -31,6 +31,8 @@ msgstr "Способ выставления счета"
msgid ""
"This invoicing type will be used, by default, to invoice the current partner."
msgstr ""
+"Этот тип счета будет использоваться по умолчанию для выставления текущего "
+"счета партнера."
#. module: sale_journal
#: view:res.partner:0
@@ -45,7 +47,7 @@ msgstr "Выставление счета"
#. module: sale_journal
#: model:ir.model,name:sale_journal.model_stock_picking_in
msgid "Incoming Shipments"
-msgstr ""
+msgstr "Поступающие ТМЦ"
#. module: sale_journal
#: help:sale_journal.invoice.type,active:0
@@ -103,7 +105,7 @@ msgstr ""
#. module: sale_journal
#: help:sale.order,invoice_type_id:0
msgid "Generate invoice based on the selected option."
-msgstr ""
+msgstr "Генерировать счет на основе выбранного варианта."
#. module: sale_journal
#: view:sale.order:0
@@ -137,7 +139,7 @@ msgstr "Заказ продаж"
#. module: sale_journal
#: model:ir.model,name:sale_journal.model_stock_picking_out
msgid "Delivery Orders"
-msgstr ""
+msgstr "Заказы доставки"
#~ msgid "Monthly sales"
#~ msgstr "Продажи в месяце"
diff --git a/addons/sale_margin/i18n/ru.po b/addons/sale_margin/i18n/ru.po
index 7c764c89223..cac4fe13548 100644
--- a/addons/sale_margin/i18n/ru.po
+++ b/addons/sale_margin/i18n/ru.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2012-12-21 17:06+0000\n"
-"PO-Revision-Date: 2011-01-20 08:51+0000\n"
+"PO-Revision-Date: 2013-06-04 13:50+0000\n"
"Last-Translator: Chertykov Denis \n"
"Language-Team: Russian \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-16 05:40+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-06-05 05:32+0000\n"
+"X-Generator: Launchpad (build 16660)\n"
#. module: sale_margin
#: field:sale.order.line,purchase_price:0
@@ -44,6 +44,7 @@ msgid ""
"It gives profitability by calculating the difference between the Unit Price "
"and the cost price."
msgstr ""
+"Дает прибыльность как разницу между стоимостью единицы и себестоимостью."
#~ msgid "Customer Invoice"
#~ msgstr "Счета клиентам"
diff --git a/addons/sale_margin/sale_margin_view.xml b/addons/sale_margin/sale_margin_view.xml
index 88647ea3c46..be16429526a 100644
--- a/addons/sale_margin/sale_margin_view.xml
+++ b/addons/sale_margin/sale_margin_view.xml
@@ -9,7 +9,7 @@
-
diff --git a/addons/sale_stock/process/sale_stock_process.xml b/addons/sale_stock/process/sale_stock_process.xml
index c10b34c8866..1ebebec7809 100644
--- a/addons/sale_stock/process/sale_stock_process.xml
+++ b/addons/sale_stock/process/sale_stock_process.xml
@@ -72,40 +72,40 @@
Invoiced this month
+
+ Invoiced
+ Forecast
+
+
+
Define an invoicing target in the sales team settings to see the period's achievement and forecast at a glance.
diff --git a/addons/sale_crm/static/lib/justgage.js b/addons/sale_crm/static/lib/justgage.js
new file mode 100644
index 00000000000..52b5c6ea0c3
--- /dev/null
+++ b/addons/sale_crm/static/lib/justgage.js
@@ -0,0 +1,883 @@
+/**
+ * JustGage - this is work-in-progress, unreleased, unofficial code, so it might not work top-notch :)
+ * Check http://www.justgage.com for official releases
+ * Licensed under MIT.
+ * @author Bojan Djuricic (@Toorshia)
+ *
+ * LATEST UPDATES
+
+ * -----------------------------
+ * April 01, 2013.
+ * -----------------------------
+ * fix - https://github.com/toorshia/justgage/issues/46
+
+ * -----------------------------
+ * March 26, 2013.
+ * -----------------------------
+ * customSectors - define specific color for value range (0-10 : red, 10-30 : blue etc.)
+
+ * -----------------------------
+ * March 23, 2013.
+ * -----------------------------
+ * counter - option to animate value in counting fashion
+ * fix - https://github.com/toorshia/justgage/issues/45
+
+ * -----------------------------
+ * March 13, 2013.
+ * -----------------------------
+ * refresh method - added optional 'max' parameter to use when you need to update max value
+
+ * -----------------------------
+ * February 26, 2013.
+ * -----------------------------
+ * decimals - option to define/limit number of decimals when not using humanFriendly or customRenderer to display value
+ * fixed a missing parameters bug when calling generateShadow() for IE < 9
+
+ * -----------------------------
+ * December 31, 2012.
+ * -----------------------------
+ * fixed text y-position for hidden divs - workaround for Raphael Define an invoicing target in the sales team settings to see the period's achievement and forecast at a glance.