[PATCH] Upstream patch - 01062022

This commit is contained in:
Parthiv Patel
2022-06-01 08:34:34 +00:00
parent c10d1f1994
commit 9a87daad0c
11 changed files with 187 additions and 100 deletions

View File

@@ -99,21 +99,18 @@ class Attendee(models.Model):
ics_files = self.mapped('event_id')._get_ics_file()
# prepare rendering context for mail template
colors = {
'needsAction': 'grey',
'accepted': 'green',
'tentative': '#FFFF00',
'declined': 'red'
}
rendering_context = dict(self._context)
rendering_context.update({
'colors': colors,
'colors': self._prepare_notification_calendar_colors(),
'ignore_recurrence': ignore_recurrence,
'action_id': self.env['ir.actions.act_window'].sudo().search([('view_id', '=', calendar_view.id)], limit=1).id,
'dbname': self._cr.dbname,
'base_url': self.env['ir.config_parameter'].sudo().get_param('web.base.url', default='http://localhost:7073'),
})
self._notify_attendees(ics_files, invitation_template, rendering_context, force_send)
def _notify_attendees(self, ics_files, mail_template, rendering_context, force_send):
for attendee in self:
if attendee.email and attendee.partner_id != self.env.user.partner_id:
# FIXME: is ics_file text or bytes?
@@ -122,24 +119,20 @@ class Attendee(models.Model):
attachment_values = []
if ics_file:
attachment_values = [
(0, 0, {'name': 'invitation.ics',
'mimetype': 'text/calendar',
'datas': base64.b64encode(ics_file)})
]
attachment_values = attendee._prepare_notification_attachment_values(ics_file)
try:
body = invitation_template.with_context(rendering_context)._render_field(
body = mail_template.with_context(rendering_context)._render_field(
'body_html',
attendee.ids,
compute_lang=True,
post_process=True)[attendee.id]
except UserError: #TO BE REMOVED IN MASTER
body = invitation_template.sudo().with_context(rendering_context)._render_field(
except UserError: # TO BE REMOVED IN MASTER
body = mail_template.sudo().with_context(rendering_context)._render_field(
'body_html',
attendee.ids,
compute_lang=True,
post_process=True)[attendee.id]
subject = invitation_template._render_field(
subject = mail_template._render_field(
'subject',
attendee.ids,
compute_lang=True)[attendee.id]
@@ -153,6 +146,21 @@ class Attendee(models.Model):
attachment_ids=attachment_values,
force_send=force_send)
def _prepare_notification_calendar_colors(self):
return {
'needsAction': 'grey',
'accepted': 'green',
'tentative': '#FFFF00',
'declined': 'red'
}
def _prepare_notification_attachment_values(self, ics_file):
return [
(0, 0, {'name': 'invitation.ics',
'mimetype': 'text/calendar',
'datas': base64.b64encode(ics_file)})
]
def do_tentative(self):
""" Makes event invitation as Tentative. """
return self.write({'state': 'tentative'})

View File

@@ -266,9 +266,6 @@ class DeliveryCarrier(models.Model):
'error_message': _('Error: this delivery method is not available for this address.'),
'warning_message': False}
price = order.pricelist_id.get_product_price(self.product_id, 1.0, order.partner_id)
company = self.company_id or order.company_id or self.env.company
if company.currency_id and company.currency_id != order.currency_id:
price = company.currency_id._convert(price, order.currency_id, company, fields.Date.today())
return {'success': True,
'price': price,
'error_message': False,

View File

@@ -196,3 +196,45 @@ class TestDeliveryCost(common.TransactionCase):
('product_id', '=', self.normal_delivery.product_id.id)])
self.assertEqual(len(line), 1, "Delivery cost hasn't been added to SO")
self.assertEqual(line.price_subtotal, 5.0, "Delivery cost does not correspond to 5.0")
def test_02_delivery_cost_from_different_currency(self):
""" This test aims to validate the use of a pricelist using a different currency to compute the delivery cost in
the case the associated product of the shipping method is defined in the pricelist """
# Create pricelist with a custom price for the standard shipping method
my_pricelist = self.env['product.pricelist'].create({
'name': 'shipping_cost_change',
'item_ids': [(0, 0, {
'compute_price': 'fixed',
'fixed_price': 5,
'applied_on': '0_product_variant',
'product_id': self.normal_delivery.product_id.id,
})],
'currency_id': self.env.ref('base.EUR').id,
})
# Create sales order with Normal Delivery Charges
sale_pricelist_based_delivery_charges = self.SaleOrder.create({
'partner_id': self.partner_18.id,
'pricelist_id': my_pricelist.id,
'order_line': [(0, 0, {
'name': 'PC Assamble + 2GB RAM',
'product_id': self.product_4.id,
'product_uom_qty': 1,
'product_uom': self.product_uom_unit.id,
'price_unit': 750.00,
})],
})
# Add of delivery cost in Sales order
delivery_wizard = Form(self.env['choose.delivery.carrier'].with_context({
'default_order_id': sale_pricelist_based_delivery_charges.id,
'default_carrier_id': self.normal_delivery.id
}))
self.assertEqual(delivery_wizard.delivery_price, 5.0, "Delivery cost does not correspond to 5.0 in wizard")
delivery_wizard.save().button_confirm()
line = self.SaleOrderLine.search([('order_id', '=', sale_pricelist_based_delivery_charges.id),
('product_id', '=', self.normal_delivery.product_id.id)])
self.assertEqual(len(line), 1, "Delivery cost hasn't been added to SO")
self.assertEqual(line.price_subtotal, 5.0, "Delivery cost does not correspond to 5.0")

View File

@@ -13,5 +13,5 @@ class Routing(Home):
IrHttp = request.env['ir.http'].sudo()
modules = IrHttp.get_translation_frontend_modules()
if mods:
modules += mods
modules += mods.split(',') if isinstance(mods, str) else mods
return WebClient().translations(unique, mods=','.join(modules), lang=lang)

View File

@@ -51,17 +51,17 @@
"account_1920","1920","Pankkisaamiset, pankki2","account.data_account_type_liquidity","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_liquidity"
"account_1930","1930","Pankkisaamiset, pankki3","account.data_account_type_liquidity","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_liquidity"
"account_1940","1940","Pankkisaamiset, pankki4","account.data_account_type_liquidity","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_liquidity"
"account_1990","1990","Rahansiirrot ja täsmäytykset","account.data_account_type_liquidity","l10n_fi.fi_chart_template","False",
"account_2000","2000","Osakepääoma","account.data_account_type_equity","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_liquidity"
"account_1990","1990","Rahansiirrot ja täsmäytykset","account.data_account_type_liquidity","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_liquidity"
"account_2000","2000","Osakepääoma","account.data_account_type_equity","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_stock_capital"
"account_2010","2010","Osakeanti","account.data_account_type_equity","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_stock_capital"
"account_2020","2020","Ylikurssirahasto","account.data_account_type_equity","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_stock_capital"
"account_2030","2030","Arvonkorotusrahasto (oy)","account.data_account_type_equity","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_share_premium_account"
"account_2050","2050","Vararahasto (oy)","account.data_account_type_equity","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_revaluation_reserve"
"account_2060","2060","Sijoitetun vapaan oman pääoman rahasto","account.data_account_type_equity","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_reserve"
"account_2070","2070","Yhtiöjärjestyksen mukainen rahasto","account.data_account_type_equity","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_the_invested_unrestricted_equity_fund"
"account_2080","2080","Muut rahastot (oy)","account.data_account_type_equity","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_the_articles_of_association_or_fund_under_the_rules"
"account_2100","2100","Osuuspääoma","account.data_account_type_equity","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_other_reserves"
"account_2110","2110","Arvonkorotusrahasto (osk)","account.data_account_type_equity","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_stock_capital"
"account_2020","2020","Ylikurssirahasto","account.data_account_type_equity","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_share_premium_account"
"account_2030","2030","Arvonkorotusrahasto (oy)","account.data_account_type_equity","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_revaluation_reserve"
"account_2050","2050","Vararahasto (oy)","account.data_account_type_equity","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_reserve"
"account_2060","2060","Sijoitetun vapaan oman pääoman rahasto","account.data_account_type_equity","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_the_invested_unrestricted_equity_fund"
"account_2070","2070","Yhtiöjärjestyksen mukainen rahasto","account.data_account_type_equity","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_the_articles_of_association_or_fund_under_the_rules"
"account_2080","2080","Muut rahastot (oy)","account.data_account_type_equity","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_other_reserves"
"account_2100","2100","Osuuspääoma","account.data_account_type_equity","l10n_fi.fi_chart_template","False",
"account_2110","2110","Arvonkorotusrahasto (osk)","account.data_account_type_equity","l10n_fi.fi_chart_template","False",
"account_2120","2120","Vararahasto (osk)","account.data_account_type_equity","l10n_fi.fi_chart_template","False",
"account_2130","2130","Sääntöjen mukainen rahasto","account.data_account_type_equity","l10n_fi.fi_chart_template","False",
"account_2140","2140","Muut rahastot (osk)","account.data_account_type_equity","l10n_fi.fi_chart_template","False",
@@ -71,50 +71,50 @@
"account_2190","2190","Arvonkorotusrahasto (ky)","account.data_account_type_equity","l10n_fi.fi_chart_template","False",
"account_2200","2200","Peruspääoma","account.data_account_type_equity","l10n_fi.fi_chart_template","False",
"account_2210","2210","Arvonkorotusrahasto (tmi)","account.data_account_type_equity","l10n_fi.fi_chart_template","False",
"account_2250","2250","Edellisten tilikausien voitto / tappio","account.data_account_type_equity","l10n_fi.fi_chart_template","False",
"account_2250","2250","Edellisten tilikausien voitto / tappio","account.data_account_type_equity","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_retained_earnings"
"account_2330","2330","Pääomavajaus edellisiltä tilikausilta","account.data_account_type_equity","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_retained_earnings"
"account_2340","2340","Yksityistilit tilikaudella","account.data_account_type_equity","l10n_fi.fi_chart_template","False",
"account_2370","2370","Tilikauden tulos","account.data_unaffected_earnings","l10n_fi.fi_chart_template","False",
"account_2390","2390","Vähemmistöosuus","account.data_account_type_non_current_liabilities","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_profit_for_the_period"
"account_2400","2400","Poistoero","account.data_account_type_non_current_liabilities","l10n_fi.fi_chart_template","False",
"account_2450","2450","Verotusperusteiset varaukset","account.data_account_type_non_current_liabilities","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_depreciation_difference"
"account_2500","2500","Eläkevaraukset","account.data_account_type_non_current_liabilities","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_tax_based_reservations"
"account_2530","2530","Verovaraukset","account.data_account_type_non_current_liabilities","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_provisions_for_pensions"
"account_2550","2550","Muut pakolliset varaukset","account.data_account_type_non_current_liabilities","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_tax_provisions"
"account_2590","2590","Konsernireservi","account.data_account_type_non_current_liabilities","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_other_provisions"
"account_2600","2600","Pääomalainat, pitkäaikaiset","account.data_account_type_current_liabilities","l10n_fi.fi_chart_template","False",
"account_2610","2610","Joukkovelkakirjalainat, pitkäaikaiset","account.data_account_type_current_liabilities","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_subordinated_loans_long-term"
"account_2620","2620","Pitkäaikaiset vaihtovelkakirjalainat","account.data_account_type_current_liabilities","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_bonds_are_long-term"
"account_2630","2630","Lainat rahoituslaitoksilta","account.data_account_type_current_liabilities","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_convertible_bonds_long-term"
"account_2650","2650","Pitkäaikaiset takaisinlainat työeläkelaitoksilta","account.data_account_type_current_liabilities","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_loans_from_financial_institutions_long-term"
"account_2660","2660","Pitkäaikaiset saadut ennakot","account.data_account_type_current_liabilities","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_pension_loans_long-term"
"account_2670","2670","Ostovelat, pitkäaikaiset","account.data_account_type_payable","l10n_fi.fi_chart_template","True","l10n_fi.account_tag_advances_received_long-term"
"account_2690","2690","Pitkäaikaiset rahoitusvekselit","account.data_account_type_current_liabilities","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_accounts_payable-current"
"account_2700","2700","Velat saman konsernin yrityksille, pitkäaikaiset","account.data_account_type_payable","l10n_fi.fi_chart_template","True","l10n_fi.account_tag_bills_of_long-term"
"account_2710","2710","Velat omistusyhteysyrityksille, pitkäaikaiset","account.data_account_type_current_liabilities","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_consolidated_long-term_liabilities"
"account_2720","2720","Muut velat, pitkäaikaiset","account.data_account_type_current_liabilities","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_payables_to_associated_companies_non-current"
"account_2750","2750","Pitkäaikaiset siirtovelat","account.data_account_type_current_liabilities","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_other_long-term_liabilities"
"account_2770","2770","Pitkäaikaiset laskennalliset verovelat","account.data_account_type_current_liabilities","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_accrued_long-term"
"account_2800","2800","Pääomalainat, lyhytaikaiset","account.data_account_type_current_liabilities","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_deferred_tax_liabilities_are_long-term"
"account_2810","2810","Joukkovelkakirjalainat","account.data_account_type_current_liabilities","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_capital_loans_are_short-term"
"account_2820","2820","Vaihtovelkakirjalainat","account.data_account_type_current_liabilities","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_bonds_short-term"
"account_2830","2830","Lainat rahoituslaitoksilta","account.data_account_type_current_liabilities","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_convertible_bonds_short-term"
"account_2850","2850","Työeläkelaitoksien takaisinlainojen lyhennyserät","account.data_account_type_current_liabilities","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_loans_from_financial_institutions_short-term"
"account_2860","2860","Saadut ennakot","account.data_account_type_current_liabilities","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_pension_loans_short-term"
"account_2870","2870","Ostovelat","account.data_account_type_payable","l10n_fi.fi_chart_template","True","l10n_fi.account_tag_advances_received_short-term"
"account_2370","2370","Tilikauden tulos","account.data_unaffected_earnings","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_profit_for_the_period"
"account_2390","2390","Vähemmistöosuus","account.data_account_type_non_current_liabilities","l10n_fi.fi_chart_template","False",
"account_2400","2400","Poistoero","account.data_account_type_non_current_liabilities","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_depreciation_difference"
"account_2450","2450","Verotusperusteiset varaukset","account.data_account_type_non_current_liabilities","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_tax_based_reservations"
"account_2500","2500","Eläkevaraukset","account.data_account_type_non_current_liabilities","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_provisions_for_pensions"
"account_2530","2530","Verovaraukset","account.data_account_type_non_current_liabilities","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_tax_provisions"
"account_2550","2550","Muut pakolliset varaukset","account.data_account_type_non_current_liabilities","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_other_provisions"
"account_2590","2590","Konsernireservi","account.data_account_type_non_current_liabilities","l10n_fi.fi_chart_template","False",
"account_2600","2600","Pääomalainat, pitkäaikaiset","account.data_account_type_current_liabilities","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_subordinated_loans_long-term"
"account_2610","2610","Joukkovelkakirjalainat, pitkäaikaiset","account.data_account_type_current_liabilities","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_bonds_are_long-term"
"account_2620","2620","Pitkäaikaiset vaihtovelkakirjalainat","account.data_account_type_current_liabilities","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_convertible_bonds_long-term"
"account_2630","2630","Lainat rahoituslaitoksilta","account.data_account_type_current_liabilities","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_loans_from_financial_institutions_long-term"
"account_2650","2650","Pitkäaikaiset takaisinlainat työeläkelaitoksilta","account.data_account_type_current_liabilities","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_pension_loans_long-term"
"account_2660","2660","Pitkäaikaiset saadut ennakot","account.data_account_type_current_liabilities","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_advances_received_long-term"
"account_2670","2670","Ostovelat, pitkäaikaiset","account.data_account_type_payable","l10n_fi.fi_chart_template","True","l10n_fi.account_tag_accounts_payable-current"
"account_2690","2690","Pitkäaikaiset rahoitusvekselit","account.data_account_type_current_liabilities","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_bills_of_long-term"
"account_2700","2700","Velat saman konsernin yrityksille, pitkäaikaiset","account.data_account_type_payable","l10n_fi.fi_chart_template","True","l10n_fi.account_tag_consolidated_long-term_liabilities"
"account_2710","2710","Velat omistusyhteysyrityksille, pitkäaikaiset","account.data_account_type_current_liabilities","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_payables_to_associated_companies_non-current"
"account_2720","2720","Muut velat, pitkäaikaiset","account.data_account_type_current_liabilities","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_other_long-term_liabilities"
"account_2750","2750","Pitkäaikaiset siirtovelat","account.data_account_type_current_liabilities","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_accrued_long-term"
"account_2770","2770","Pitkäaikaiset laskennalliset verovelat","account.data_account_type_current_liabilities","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_deferred_tax_liabilities_are_long-term"
"account_2800","2800","Pääomalainat, lyhytaikaiset","account.data_account_type_current_liabilities","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_capital_loans_are_short-term"
"account_2810","2810","Joukkovelkakirjalainat","account.data_account_type_current_liabilities","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_bonds_short-term"
"account_2820","2820","Vaihtovelkakirjalainat","account.data_account_type_current_liabilities","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_convertible_bonds_short-term"
"account_2830","2830","Lainat rahoituslaitoksilta","account.data_account_type_current_liabilities","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_loans_from_financial_institutions_short-term"
"account_2850","2850","Työeläkelaitoksien takaisinlainojen lyhennyserät","account.data_account_type_current_liabilities","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_pension_loans_short-term"
"account_2860","2860","Saadut ennakot","account.data_account_type_current_liabilities","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_advances_received_short-term"
"account_2870","2870","Ostovelat","account.data_account_type_payable","l10n_fi.fi_chart_template","True","l10n_fi.account_tag_accounts_payable"
"account_2880","2880","Maksuliikennetili","account.data_account_type_payable","l10n_fi.fi_chart_template","True","l10n_fi.account_tag_accounts_payable"
"account_2890","2890","Rahoitusvekselit","account.data_account_type_current_liabilities","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_accounts_payable"
"account_2900","2900","Velat saman konsernin yrityksille","account.data_account_type_current_liabilities","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_bills_of_short-term"
"account_2910","2910","Velat omistusyhteysyrityksille","account.data_account_type_current_liabilities","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_group_short-term_liabilities"
"account_2920","2920","Ennakonpidätys- ja stm-velka","account.data_account_type_current_liabilities","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_payables_to_associated_companies"
"account_2890","2890","Rahoitusvekselit","account.data_account_type_current_liabilities","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_bills_of_short-term"
"account_2900","2900","Velat saman konsernin yrityksille","account.data_account_type_current_liabilities","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_group_short-term_liabilities"
"account_2910","2910","Velat omistusyhteysyrityksille","account.data_account_type_current_liabilities","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_payables_to_associated_companies"
"account_2920","2920","Ennakonpidätys- ja stm-velka","account.data_account_type_current_liabilities","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_other_short-term_liabilities"
"account_2930","2930","Suoritettava arvonlisävero","account.data_account_type_current_liabilities","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_other_short-term_liabilities"
"account_2935","2935","OmaVero-tapahtumat","account.data_account_type_current_liabilities","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_other_short-term_liabilities"
"account_2940","2940","Muut velat","account.data_account_type_current_liabilities","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_other_short-term_liabilities"
"account_2950","2950","Palkkojen siirtovelat","account.data_account_type_current_liabilities","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_other_short-term_liabilities"
"account_2950","2950","Palkkojen siirtovelat","account.data_account_type_current_liabilities","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_accrued_liabilities_short-term"
"account_2951","2951","Muut siirtovelat","account.data_account_type_current_liabilities","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_accrued_liabilities_short-term"
"account_2952","2952","Palkkojen jaksotus","account.data_account_type_current_liabilities","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_accrued_liabilities_short-term"
"account_2980","2980","Laskennalliset verovelat","account.data_account_type_current_liabilities","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_accrued_liabilities_short-term"
"account_3000","3000","Myynti","account.data_account_type_revenue","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_deferred_tax_liabilities_are_short-term"
"account_2980","2980","Laskennalliset verovelat","account.data_account_type_current_liabilities","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_deferred_tax_liabilities_are_short-term"
"account_3000","3000","Myynti","account.data_account_type_revenue","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_sales"
"account_3200","3200","Oheispalvelut","account.data_account_type_revenue","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_sales"
"account_3250","3250","Toimitusveloitukset ja osamaksulisät","account.data_account_type_revenue","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_sales"
"account_3300","3300","Komissiokauppa ja agentuuri","account.data_account_type_revenue","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_sales"
@@ -128,9 +128,9 @@
"account_3570","3570","Tulonsiirto- ja läpikulkuerät","account.data_account_type_revenue","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_sales_adjustment_items"
"account_3580","3580","Myynnin valuuttakurssierot","account.data_account_type_revenue","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_sales_adjustment_items"
"account_3590","3590","Muut myynnin oikaisuerät","account.data_account_type_revenue","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_sales_adjustment_items"
"account_3600","3600","Valmiiden ja keskeneräisten tuotteiden varastojen lisäys (+) tai vähennys (-)","account.data_account_type_direct_costs","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_sales_adjustment_items"
"account_3630","3630","Valmistus omaan käyttöön","account.data_account_type_direct_costs","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_manufacturing_warehouse_change"
"account_3650","3650","Myyntivoitot pysyvistä vastaavista","account.data_account_type_other_income","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_manufacturing_own_use"
"account_3600","3600","Valmiiden ja keskeneräisten tuotteiden varastojen lisäys (+) tai vähennys (-)","account.data_account_type_direct_costs","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_manufacturing_warehouse_change"
"account_3630","3630","Valmistus omaan käyttöön","account.data_account_type_direct_costs","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_manufacturing_own_use"
"account_3650","3650","Myyntivoitot pysyvistä vastaavista","account.data_account_type_other_income","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_income_other"
"account_3700","3700","Leasinghyvitykset","account.data_account_type_other_income","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_income_other"
"account_3710","3710","Keskeytys- ym. vakuuskorvaukset","account.data_account_type_other_income","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_income_other"
"account_3750","3750","Vuokratuotot","account.data_account_type_other_income","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_income_other"
@@ -138,24 +138,24 @@
"account_3850","3850","Palvelutuotot","account.data_account_type_other_income","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_income_other"
"account_3900","3900","Palkkiot ja korvaukset","account.data_account_type_other_income","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_income_other"
"account_3980","3980","Muut tuotot","account.data_account_type_other_income","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_income_other"
"account_4000","4000","Ostot","account.data_account_type_expenses","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_income_other"
"account_4000","4000","Ostot","account.data_account_type_expenses","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_purchases"
"account_4090","4090","Tavaraostot Ahvenanmaalta","account.data_account_type_expenses","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_purchases"
"account_4110","4110","Yhteisöhankinnat","account.data_account_type_expenses","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_purchases"
"account_4130","4130","Tuontiostot yhteisön ulkopuolelta","account.data_account_type_expenses","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_purchases"
"account_4150","4150","Ostot, käytetyt tavarat ja taide-, keräily- ja antiikkiesineet","account.data_account_type_expenses","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_purchases"
"account_4200","4200","Ostot, arvopaperit ja kiinteistöt","account.data_account_type_expenses","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_purchases"
"account_4230","4230","Ostojen alennukset","account.data_account_type_expenses","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_purchases"
"account_4230","4230","Ostojen alennukset","account.data_account_type_expenses","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_purchases_adjustment_items"
"account_4260","4260","Palautetut tavarat","account.data_account_type_expenses","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_purchases_adjustment_items"
"account_4270","4270","Saadut vahingonkorvaukset ja avustukset","account.data_account_type_expenses","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_purchases_adjustment_items"
"account_4290","4290","Rahdit, huolinta ja muut hankintakulut","account.data_account_type_expenses","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_purchases_adjustment_items"
"account_4340","4340","Siirrot muuhun kuin myyntitarkoitukseen","account.data_account_type_expenses","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_purchases_adjustment_items"
"account_4370","4370","Ostojen valuuttakurssierot","account.data_account_type_expenses","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_purchases_adjustment_items"
"account_4380","4380","Muut ostojen oikaisuerät","account.data_account_type_expenses","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_purchases_adjustment_items"
"account_4400","4400","Varastojen lisäys (+) tai vähennys (-)","account.data_account_type_expenses","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_purchases_adjustment_items"
"account_4450","4450","Alihankinta","account.data_account_type_expenses","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_change_in_inventories"
"account_4400","4400","Varastojen lisäys (+) tai vähennys (-)","account.data_account_type_expenses","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_change_in_inventories"
"account_4450","4450","Alihankinta","account.data_account_type_expenses","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_external_services"
"account_4480","4480","Vuokrattu työvoima","account.data_account_type_expenses","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_external_services"
"account_4490","4490","Muut ulkopuoliset palvelut","account.data_account_type_expenses","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_external_services"
"account_5000","5000","Työssäoloajan normaalipalkat","account.data_account_type_expenses","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_external_services"
"account_5000","5000","Työssäoloajan normaalipalkat","account.data_account_type_expenses","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_wages_and_salaries_in_production"
"account_5100","5100","Lisät ja korvaukset","account.data_account_type_expenses","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_wages_and_salaries_other"
"account_5200","5200","Palkkiot","account.data_account_type_expenses","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_wages_and_salaries_other"
"account_5300","5300","Loma-ajan ja sosiaalipalkat","account.data_account_type_expenses","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_wages_and_salaries_other"
@@ -169,35 +169,35 @@
"account_5900","5900","Osakkaiden ja omaisten luontoisedut","account.data_account_type_expenses","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_wages_and_salaries_other"
"account_5960","5960","Saadut korvaukset osakkaiden ja omaisten palkoista","account.data_account_type_expenses","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_wages_and_salaries_other"
"account_5990","5990","Luontoisetujen vastatili","account.data_account_type_expenses","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_wages_and_salaries_other"
"account_6000","6000","Maksetut eläkkeet","account.data_account_type_expenses","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_wages_and_salaries_other"
"account_6000","6000","Maksetut eläkkeet","account.data_account_type_expenses","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_pension_costs_of_production"
"account_6100","6100","Eläkevakuutusmaksut","account.data_account_type_expenses","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_pension_costs_other"
"account_6290","6290","Tilikauden aikainen jaksotus","account.data_account_type_expenses","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_pension_costs_other"
"account_6290","6290","Tilikauden aikainen jaksotus","account.data_account_type_expenses","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_other_additional_expenses_other"
"account_6300","6300","Sosiaaliturvamaksut","account.data_account_type_expenses","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_other_additional_expenses_other"
"account_6400","6400","Pakolliset vakuutusmaksut","account.data_account_type_expenses","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_other_additional_expenses_other"
"account_6500","6500","Muut henkilöstön vakuutusmaksut","account.data_account_type_expenses","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_other_additional_expenses_other"
"account_6690","6690","Tilikauden aikainen jaksotus","account.data_account_type_expenses","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_other_additional_expenses_other"
"account_6800","6800","Suunnitelman mukaiset poistot","account.data_account_type_expenses","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_other_additional_expenses_other"
"account_6930","6930","Konserniliikearvon poisto ja konsenireservin vähennys","account.data_account_type_expenses","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_depreciation_according_to_plan"
"account_6950","6950","Arvonalentumiset pysyvien vastaavien hyödykkeistä","account.data_account_type_expenses","l10n_fi.fi_chart_template","False",
"account_6990","6990","Vaihtuvien vastaavien poikkeukselliset arvonalentumiset","account.data_account_type_expenses","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_impairment_of_fixed_assets"
"account_7000","7000","Vapaaehtoiset henkilösivukulut","account.data_account_type_expenses","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_impairment_losses_financial_assets_current_assets"
"account_7200","7200","Toimitilakulut","account.data_account_type_expenses","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_personnel_other"
"account_6800","6800","Suunnitelman mukaiset poistot","account.data_account_type_expenses","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_depreciation_according_to_plan"
"account_6930","6930","Konserniliikearvon poisto ja konsenireservin vähennys","account.data_account_type_expenses","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_change_in_depreciation_difference"
"account_6950","6950","Arvonalentumiset pysyvien vastaavien hyödykkeistä","account.data_account_type_expenses","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_impairment_of_fixed_assets"
"account_6990","6990","Vaihtuvien vastaavien poikkeukselliset arvonalentumiset","account.data_account_type_expenses","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_impairment_losses_financial_assets_current_assets"
"account_7000","7000","Vapaaehtoiset henkilösivukulut","account.data_account_type_expenses","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_personnel_other"
"account_7200","7200","Toimitilakulut","account.data_account_type_expenses","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_premises_costs"
"account_7230","7230","Toimitilavuokrat","account.data_account_type_expenses","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_premises_costs"
"account_7250","7250","Varastovuokrat","account.data_account_type_expenses","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_premises_costs"
"account_7270","7270","Autotalli- ja autopaikkavuokrat","account.data_account_type_expenses","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_premises_costs"
"account_7500","7500","Ajoneuvokulut","account.data_account_type_expenses","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_premises_costs"
"account_7500","7500","Ajoneuvokulut","account.data_account_type_expenses","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_vehicle_expenses"
"account_7520","7520","Ajoneuvovuokrat","account.data_account_type_expenses","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_vehicle_expenses"
"account_7640","7640","Atk-laite ja -ohjelmakulut","account.data_account_type_expenses","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_vehicle_expenses"
"account_7640","7640","Atk-laite ja -ohjelmakulut","account.data_account_type_expenses","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_it_expenses"
"account_7650","7650","Atk-laite ja ohjelm. vuokrat","account.data_account_type_expenses","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_it_expenses"
"account_7710","7710","Kone- ja kalustokulut","account.data_account_type_expenses","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_it_expenses"
"account_7710","7710","Kone- ja kalustokulut","account.data_account_type_expenses","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_in_machinery_and_equipment_expenses"
"account_7720","7720","Kone- ja kalustovuokrat","account.data_account_type_expenses","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_in_machinery_and_equipment_expenses"
"account_7800","7800","Matkakulut","account.data_account_type_expenses","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_in_machinery_and_equipment_expenses"
"account_7950","7950","Edustuskulut","account.data_account_type_expenses","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_travelling"
"account_8000","8000","Myyntikulut","account.data_account_type_expenses","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_representation"
"account_8050","8050","Markkinointikulut","account.data_account_type_expenses","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_selling_expenses"
"account_8300","8300","Tutkimus- ja kehityskulut","account.data_account_type_expenses","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_marketing_expenses"
"account_8370","8370","Ostetut hallintopalvelut","account.data_account_type_expenses","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_research_and_development"
"account_8450","8450","Muut hallintokulut","account.data_account_type_expenses","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_administrative_services"
"account_7800","7800","Matkakulut","account.data_account_type_expenses","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_travelling"
"account_7950","7950","Edustuskulut","account.data_account_type_expenses","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_representation"
"account_8000","8000","Myyntikulut","account.data_account_type_expenses","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_selling_expenses"
"account_8050","8050","Markkinointikulut","account.data_account_type_expenses","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_marketing_expenses"
"account_8300","8300","Tutkimus- ja kehityskulut","account.data_account_type_expenses","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_research_and_development"
"account_8370","8370","Ostetut hallintopalvelut","account.data_account_type_expenses","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_administrative_services"
"account_8450","8450","Muut hallintokulut","account.data_account_type_expenses","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_other_administrative_expenses"
"account_8451","8451","Puhelin- ja tietoliikennekulut","account.data_account_type_expenses","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_it_expenses"
"account_8452","8452","Vakuutukset ja vahingonkorvaukset","account.data_account_type_expenses","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_other_fixed_costs"
"account_8453","8453","Toimisto- ja hallintokulut","account.data_account_type_expenses","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_other_administrative_expenses"
@@ -210,9 +210,9 @@
"account_8890","8890","Täsmäytyserot","account.data_account_type_expenses","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_other_fixed_costs"
"account_8990","8990","Osuus osakkuusyritysten tuloksesta","account.data_account_type_expenses","l10n_fi.fi_chart_template","False",
"account_9000","9000","Tuotot osuuksista saman konsernin yrityksissä","account.data_account_type_other_income","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_income_from_shares_in_group"
"account_9030","9030","Osuus osakkuusyritysten voitosta (tappiosta)","account.data_account_type_other_income","l10n_fi.fi_chart_template","False",
"account_9040","9040","Tuotot osuuksista omistusyhteysyrityksissä","account.data_account_type_other_income","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_income_from_associated_company"
"account_9070","9070","Tuotot osuuksista muissa omistusyhteysyrityksissä","account.data_account_type_other_income","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_income_from_associated_company"
"account_9030","9030","Osuus osakkuusyritysten voitosta (tappiosta)","account.data_account_type_other_income","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_income_from_associated_company"
"account_9040","9040","Tuotot osuuksista omistusyhteysyrityksissä","account.data_account_type_other_income","l10n_fi.fi_chart_template","False",
"account_9070","9070","Tuotot osuuksista muissa omistusyhteysyrityksissä","account.data_account_type_other_income","l10n_fi.fi_chart_template","False",
"account_9080","9080","Sijoitustuotot pysyvien vastaavien sijoituksista, konserni","account.data_account_type_other_income","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_investment_income_other_current_assets_group"
"account_9090","9090","Sijoitustuotot pysyvien vastaavien sijoituksista, muut","account.data_account_type_other_income","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_other_investment_income_from_fixed_assets"
"account_9150","9150","Muut korko- ja rahoitustuotot, konserni","account.data_account_type_other_income","l10n_fi.fi_chart_template","False","l10n_fi.account_tag_interest_and_financial_income_from_group"
1 id code name user_type_id/id chart_template_id/id reconcile tag_ids/id
51 account_1920 1920 Pankkisaamiset, pankki2 account.data_account_type_liquidity l10n_fi.fi_chart_template False l10n_fi.account_tag_liquidity
52 account_1930 1930 Pankkisaamiset, pankki3 account.data_account_type_liquidity l10n_fi.fi_chart_template False l10n_fi.account_tag_liquidity
53 account_1940 1940 Pankkisaamiset, pankki4 account.data_account_type_liquidity l10n_fi.fi_chart_template False l10n_fi.account_tag_liquidity
54 account_1990 1990 Rahansiirrot ja täsmäytykset account.data_account_type_liquidity l10n_fi.fi_chart_template False l10n_fi.account_tag_liquidity
55 account_2000 2000 Osakepääoma account.data_account_type_equity l10n_fi.fi_chart_template False l10n_fi.account_tag_liquidity l10n_fi.account_tag_stock_capital
56 account_2010 2010 Osakeanti account.data_account_type_equity l10n_fi.fi_chart_template False l10n_fi.account_tag_stock_capital
57 account_2020 2020 Ylikurssirahasto account.data_account_type_equity l10n_fi.fi_chart_template False l10n_fi.account_tag_stock_capital l10n_fi.account_tag_share_premium_account
58 account_2030 2030 Arvonkorotusrahasto (oy) account.data_account_type_equity l10n_fi.fi_chart_template False l10n_fi.account_tag_share_premium_account l10n_fi.account_tag_revaluation_reserve
59 account_2050 2050 Vararahasto (oy) account.data_account_type_equity l10n_fi.fi_chart_template False l10n_fi.account_tag_revaluation_reserve l10n_fi.account_tag_reserve
60 account_2060 2060 Sijoitetun vapaan oman pääoman rahasto account.data_account_type_equity l10n_fi.fi_chart_template False l10n_fi.account_tag_reserve l10n_fi.account_tag_the_invested_unrestricted_equity_fund
61 account_2070 2070 Yhtiöjärjestyksen mukainen rahasto account.data_account_type_equity l10n_fi.fi_chart_template False l10n_fi.account_tag_the_invested_unrestricted_equity_fund l10n_fi.account_tag_the_articles_of_association_or_fund_under_the_rules
62 account_2080 2080 Muut rahastot (oy) account.data_account_type_equity l10n_fi.fi_chart_template False l10n_fi.account_tag_the_articles_of_association_or_fund_under_the_rules l10n_fi.account_tag_other_reserves
63 account_2100 2100 Osuuspääoma account.data_account_type_equity l10n_fi.fi_chart_template False l10n_fi.account_tag_other_reserves
64 account_2110 2110 Arvonkorotusrahasto (osk) account.data_account_type_equity l10n_fi.fi_chart_template False l10n_fi.account_tag_stock_capital
65 account_2120 2120 Vararahasto (osk) account.data_account_type_equity l10n_fi.fi_chart_template False
66 account_2130 2130 Sääntöjen mukainen rahasto account.data_account_type_equity l10n_fi.fi_chart_template False
67 account_2140 2140 Muut rahastot (osk) account.data_account_type_equity l10n_fi.fi_chart_template False
71 account_2190 2190 Arvonkorotusrahasto (ky) account.data_account_type_equity l10n_fi.fi_chart_template False
72 account_2200 2200 Peruspääoma account.data_account_type_equity l10n_fi.fi_chart_template False
73 account_2210 2210 Arvonkorotusrahasto (tmi) account.data_account_type_equity l10n_fi.fi_chart_template False
74 account_2250 2250 Edellisten tilikausien voitto / tappio account.data_account_type_equity l10n_fi.fi_chart_template False l10n_fi.account_tag_retained_earnings
75 account_2330 2330 Pääomavajaus edellisiltä tilikausilta account.data_account_type_equity l10n_fi.fi_chart_template False l10n_fi.account_tag_retained_earnings
76 account_2340 2340 Yksityistilit tilikaudella account.data_account_type_equity l10n_fi.fi_chart_template False
77 account_2370 2370 Tilikauden tulos account.data_unaffected_earnings l10n_fi.fi_chart_template False l10n_fi.account_tag_profit_for_the_period
78 account_2390 2390 Vähemmistöosuus account.data_account_type_non_current_liabilities l10n_fi.fi_chart_template False l10n_fi.account_tag_profit_for_the_period
79 account_2400 2400 Poistoero account.data_account_type_non_current_liabilities l10n_fi.fi_chart_template False l10n_fi.account_tag_depreciation_difference
80 account_2450 2450 Verotusperusteiset varaukset account.data_account_type_non_current_liabilities l10n_fi.fi_chart_template False l10n_fi.account_tag_depreciation_difference l10n_fi.account_tag_tax_based_reservations
81 account_2500 2500 Eläkevaraukset account.data_account_type_non_current_liabilities l10n_fi.fi_chart_template False l10n_fi.account_tag_tax_based_reservations l10n_fi.account_tag_provisions_for_pensions
82 account_2530 2530 Verovaraukset account.data_account_type_non_current_liabilities l10n_fi.fi_chart_template False l10n_fi.account_tag_provisions_for_pensions l10n_fi.account_tag_tax_provisions
83 account_2550 2550 Muut pakolliset varaukset account.data_account_type_non_current_liabilities l10n_fi.fi_chart_template False l10n_fi.account_tag_tax_provisions l10n_fi.account_tag_other_provisions
84 account_2590 2590 Konsernireservi account.data_account_type_non_current_liabilities l10n_fi.fi_chart_template False l10n_fi.account_tag_other_provisions
85 account_2600 2600 Pääomalainat, pitkäaikaiset account.data_account_type_current_liabilities l10n_fi.fi_chart_template False l10n_fi.account_tag_subordinated_loans_long-term
86 account_2610 2610 Joukkovelkakirjalainat, pitkäaikaiset account.data_account_type_current_liabilities l10n_fi.fi_chart_template False l10n_fi.account_tag_subordinated_loans_long-term l10n_fi.account_tag_bonds_are_long-term
87 account_2620 2620 Pitkäaikaiset vaihtovelkakirjalainat account.data_account_type_current_liabilities l10n_fi.fi_chart_template False l10n_fi.account_tag_bonds_are_long-term l10n_fi.account_tag_convertible_bonds_long-term
88 account_2630 2630 Lainat rahoituslaitoksilta account.data_account_type_current_liabilities l10n_fi.fi_chart_template False l10n_fi.account_tag_convertible_bonds_long-term l10n_fi.account_tag_loans_from_financial_institutions_long-term
89 account_2650 2650 Pitkäaikaiset takaisinlainat työeläkelaitoksilta account.data_account_type_current_liabilities l10n_fi.fi_chart_template False l10n_fi.account_tag_loans_from_financial_institutions_long-term l10n_fi.account_tag_pension_loans_long-term
90 account_2660 2660 Pitkäaikaiset saadut ennakot account.data_account_type_current_liabilities l10n_fi.fi_chart_template False l10n_fi.account_tag_pension_loans_long-term l10n_fi.account_tag_advances_received_long-term
91 account_2670 2670 Ostovelat, pitkäaikaiset account.data_account_type_payable l10n_fi.fi_chart_template True l10n_fi.account_tag_advances_received_long-term l10n_fi.account_tag_accounts_payable-current
92 account_2690 2690 Pitkäaikaiset rahoitusvekselit account.data_account_type_current_liabilities l10n_fi.fi_chart_template False l10n_fi.account_tag_accounts_payable-current l10n_fi.account_tag_bills_of_long-term
93 account_2700 2700 Velat saman konsernin yrityksille, pitkäaikaiset account.data_account_type_payable l10n_fi.fi_chart_template True l10n_fi.account_tag_bills_of_long-term l10n_fi.account_tag_consolidated_long-term_liabilities
94 account_2710 2710 Velat omistusyhteysyrityksille, pitkäaikaiset account.data_account_type_current_liabilities l10n_fi.fi_chart_template False l10n_fi.account_tag_consolidated_long-term_liabilities l10n_fi.account_tag_payables_to_associated_companies_non-current
95 account_2720 2720 Muut velat, pitkäaikaiset account.data_account_type_current_liabilities l10n_fi.fi_chart_template False l10n_fi.account_tag_payables_to_associated_companies_non-current l10n_fi.account_tag_other_long-term_liabilities
96 account_2750 2750 Pitkäaikaiset siirtovelat account.data_account_type_current_liabilities l10n_fi.fi_chart_template False l10n_fi.account_tag_other_long-term_liabilities l10n_fi.account_tag_accrued_long-term
97 account_2770 2770 Pitkäaikaiset laskennalliset verovelat account.data_account_type_current_liabilities l10n_fi.fi_chart_template False l10n_fi.account_tag_accrued_long-term l10n_fi.account_tag_deferred_tax_liabilities_are_long-term
98 account_2800 2800 Pääomalainat, lyhytaikaiset account.data_account_type_current_liabilities l10n_fi.fi_chart_template False l10n_fi.account_tag_deferred_tax_liabilities_are_long-term l10n_fi.account_tag_capital_loans_are_short-term
99 account_2810 2810 Joukkovelkakirjalainat account.data_account_type_current_liabilities l10n_fi.fi_chart_template False l10n_fi.account_tag_capital_loans_are_short-term l10n_fi.account_tag_bonds_short-term
100 account_2820 2820 Vaihtovelkakirjalainat account.data_account_type_current_liabilities l10n_fi.fi_chart_template False l10n_fi.account_tag_bonds_short-term l10n_fi.account_tag_convertible_bonds_short-term
101 account_2830 2830 Lainat rahoituslaitoksilta account.data_account_type_current_liabilities l10n_fi.fi_chart_template False l10n_fi.account_tag_convertible_bonds_short-term l10n_fi.account_tag_loans_from_financial_institutions_short-term
102 account_2850 2850 Työeläkelaitoksien takaisinlainojen lyhennyserät account.data_account_type_current_liabilities l10n_fi.fi_chart_template False l10n_fi.account_tag_loans_from_financial_institutions_short-term l10n_fi.account_tag_pension_loans_short-term
103 account_2860 2860 Saadut ennakot account.data_account_type_current_liabilities l10n_fi.fi_chart_template False l10n_fi.account_tag_pension_loans_short-term l10n_fi.account_tag_advances_received_short-term
104 account_2870 2870 Ostovelat account.data_account_type_payable l10n_fi.fi_chart_template True l10n_fi.account_tag_advances_received_short-term l10n_fi.account_tag_accounts_payable
105 account_2880 2880 Maksuliikennetili account.data_account_type_payable l10n_fi.fi_chart_template True l10n_fi.account_tag_accounts_payable
106 account_2890 2890 Rahoitusvekselit account.data_account_type_current_liabilities l10n_fi.fi_chart_template False l10n_fi.account_tag_accounts_payable l10n_fi.account_tag_bills_of_short-term
107 account_2900 2900 Velat saman konsernin yrityksille account.data_account_type_current_liabilities l10n_fi.fi_chart_template False l10n_fi.account_tag_bills_of_short-term l10n_fi.account_tag_group_short-term_liabilities
108 account_2910 2910 Velat omistusyhteysyrityksille account.data_account_type_current_liabilities l10n_fi.fi_chart_template False l10n_fi.account_tag_group_short-term_liabilities l10n_fi.account_tag_payables_to_associated_companies
109 account_2920 2920 Ennakonpidätys- ja stm-velka account.data_account_type_current_liabilities l10n_fi.fi_chart_template False l10n_fi.account_tag_payables_to_associated_companies l10n_fi.account_tag_other_short-term_liabilities
110 account_2930 2930 Suoritettava arvonlisävero account.data_account_type_current_liabilities l10n_fi.fi_chart_template False l10n_fi.account_tag_other_short-term_liabilities
111 account_2935 2935 OmaVero-tapahtumat account.data_account_type_current_liabilities l10n_fi.fi_chart_template False l10n_fi.account_tag_other_short-term_liabilities
112 account_2940 2940 Muut velat account.data_account_type_current_liabilities l10n_fi.fi_chart_template False l10n_fi.account_tag_other_short-term_liabilities
113 account_2950 2950 Palkkojen siirtovelat account.data_account_type_current_liabilities l10n_fi.fi_chart_template False l10n_fi.account_tag_other_short-term_liabilities l10n_fi.account_tag_accrued_liabilities_short-term
114 account_2951 2951 Muut siirtovelat account.data_account_type_current_liabilities l10n_fi.fi_chart_template False l10n_fi.account_tag_accrued_liabilities_short-term
115 account_2952 2952 Palkkojen jaksotus account.data_account_type_current_liabilities l10n_fi.fi_chart_template False l10n_fi.account_tag_accrued_liabilities_short-term
116 account_2980 2980 Laskennalliset verovelat account.data_account_type_current_liabilities l10n_fi.fi_chart_template False l10n_fi.account_tag_accrued_liabilities_short-term l10n_fi.account_tag_deferred_tax_liabilities_are_short-term
117 account_3000 3000 Myynti account.data_account_type_revenue l10n_fi.fi_chart_template False l10n_fi.account_tag_deferred_tax_liabilities_are_short-term l10n_fi.account_tag_sales
118 account_3200 3200 Oheispalvelut account.data_account_type_revenue l10n_fi.fi_chart_template False l10n_fi.account_tag_sales
119 account_3250 3250 Toimitusveloitukset ja osamaksulisät account.data_account_type_revenue l10n_fi.fi_chart_template False l10n_fi.account_tag_sales
120 account_3300 3300 Komissiokauppa ja agentuuri account.data_account_type_revenue l10n_fi.fi_chart_template False l10n_fi.account_tag_sales
128 account_3570 3570 Tulonsiirto- ja läpikulkuerät account.data_account_type_revenue l10n_fi.fi_chart_template False l10n_fi.account_tag_sales_adjustment_items
129 account_3580 3580 Myynnin valuuttakurssierot account.data_account_type_revenue l10n_fi.fi_chart_template False l10n_fi.account_tag_sales_adjustment_items
130 account_3590 3590 Muut myynnin oikaisuerät account.data_account_type_revenue l10n_fi.fi_chart_template False l10n_fi.account_tag_sales_adjustment_items
131 account_3600 3600 Valmiiden ja keskeneräisten tuotteiden varastojen lisäys (+) tai vähennys (-) account.data_account_type_direct_costs l10n_fi.fi_chart_template False l10n_fi.account_tag_sales_adjustment_items l10n_fi.account_tag_manufacturing_warehouse_change
132 account_3630 3630 Valmistus omaan käyttöön account.data_account_type_direct_costs l10n_fi.fi_chart_template False l10n_fi.account_tag_manufacturing_warehouse_change l10n_fi.account_tag_manufacturing_own_use
133 account_3650 3650 Myyntivoitot pysyvistä vastaavista account.data_account_type_other_income l10n_fi.fi_chart_template False l10n_fi.account_tag_manufacturing_own_use l10n_fi.account_tag_income_other
134 account_3700 3700 Leasinghyvitykset account.data_account_type_other_income l10n_fi.fi_chart_template False l10n_fi.account_tag_income_other
135 account_3710 3710 Keskeytys- ym. vakuuskorvaukset account.data_account_type_other_income l10n_fi.fi_chart_template False l10n_fi.account_tag_income_other
136 account_3750 3750 Vuokratuotot account.data_account_type_other_income l10n_fi.fi_chart_template False l10n_fi.account_tag_income_other
138 account_3850 3850 Palvelutuotot account.data_account_type_other_income l10n_fi.fi_chart_template False l10n_fi.account_tag_income_other
139 account_3900 3900 Palkkiot ja korvaukset account.data_account_type_other_income l10n_fi.fi_chart_template False l10n_fi.account_tag_income_other
140 account_3980 3980 Muut tuotot account.data_account_type_other_income l10n_fi.fi_chart_template False l10n_fi.account_tag_income_other
141 account_4000 4000 Ostot account.data_account_type_expenses l10n_fi.fi_chart_template False l10n_fi.account_tag_income_other l10n_fi.account_tag_purchases
142 account_4090 4090 Tavaraostot Ahvenanmaalta account.data_account_type_expenses l10n_fi.fi_chart_template False l10n_fi.account_tag_purchases
143 account_4110 4110 Yhteisöhankinnat account.data_account_type_expenses l10n_fi.fi_chart_template False l10n_fi.account_tag_purchases
144 account_4130 4130 Tuontiostot yhteisön ulkopuolelta account.data_account_type_expenses l10n_fi.fi_chart_template False l10n_fi.account_tag_purchases
145 account_4150 4150 Ostot, käytetyt tavarat ja taide-, keräily- ja antiikkiesineet account.data_account_type_expenses l10n_fi.fi_chart_template False l10n_fi.account_tag_purchases
146 account_4200 4200 Ostot, arvopaperit ja kiinteistöt account.data_account_type_expenses l10n_fi.fi_chart_template False l10n_fi.account_tag_purchases
147 account_4230 4230 Ostojen alennukset account.data_account_type_expenses l10n_fi.fi_chart_template False l10n_fi.account_tag_purchases l10n_fi.account_tag_purchases_adjustment_items
148 account_4260 4260 Palautetut tavarat account.data_account_type_expenses l10n_fi.fi_chart_template False l10n_fi.account_tag_purchases_adjustment_items
149 account_4270 4270 Saadut vahingonkorvaukset ja avustukset account.data_account_type_expenses l10n_fi.fi_chart_template False l10n_fi.account_tag_purchases_adjustment_items
150 account_4290 4290 Rahdit, huolinta ja muut hankintakulut account.data_account_type_expenses l10n_fi.fi_chart_template False l10n_fi.account_tag_purchases_adjustment_items
151 account_4340 4340 Siirrot muuhun kuin myyntitarkoitukseen account.data_account_type_expenses l10n_fi.fi_chart_template False l10n_fi.account_tag_purchases_adjustment_items
152 account_4370 4370 Ostojen valuuttakurssierot account.data_account_type_expenses l10n_fi.fi_chart_template False l10n_fi.account_tag_purchases_adjustment_items
153 account_4380 4380 Muut ostojen oikaisuerät account.data_account_type_expenses l10n_fi.fi_chart_template False l10n_fi.account_tag_purchases_adjustment_items
154 account_4400 4400 Varastojen lisäys (+) tai vähennys (-) account.data_account_type_expenses l10n_fi.fi_chart_template False l10n_fi.account_tag_purchases_adjustment_items l10n_fi.account_tag_change_in_inventories
155 account_4450 4450 Alihankinta account.data_account_type_expenses l10n_fi.fi_chart_template False l10n_fi.account_tag_change_in_inventories l10n_fi.account_tag_external_services
156 account_4480 4480 Vuokrattu työvoima account.data_account_type_expenses l10n_fi.fi_chart_template False l10n_fi.account_tag_external_services
157 account_4490 4490 Muut ulkopuoliset palvelut account.data_account_type_expenses l10n_fi.fi_chart_template False l10n_fi.account_tag_external_services
158 account_5000 5000 Työssäoloajan normaalipalkat account.data_account_type_expenses l10n_fi.fi_chart_template False l10n_fi.account_tag_external_services l10n_fi.account_tag_wages_and_salaries_in_production
159 account_5100 5100 Lisät ja korvaukset account.data_account_type_expenses l10n_fi.fi_chart_template False l10n_fi.account_tag_wages_and_salaries_other
160 account_5200 5200 Palkkiot account.data_account_type_expenses l10n_fi.fi_chart_template False l10n_fi.account_tag_wages_and_salaries_other
161 account_5300 5300 Loma-ajan ja sosiaalipalkat account.data_account_type_expenses l10n_fi.fi_chart_template False l10n_fi.account_tag_wages_and_salaries_other
169 account_5900 5900 Osakkaiden ja omaisten luontoisedut account.data_account_type_expenses l10n_fi.fi_chart_template False l10n_fi.account_tag_wages_and_salaries_other
170 account_5960 5960 Saadut korvaukset osakkaiden ja omaisten palkoista account.data_account_type_expenses l10n_fi.fi_chart_template False l10n_fi.account_tag_wages_and_salaries_other
171 account_5990 5990 Luontoisetujen vastatili account.data_account_type_expenses l10n_fi.fi_chart_template False l10n_fi.account_tag_wages_and_salaries_other
172 account_6000 6000 Maksetut eläkkeet account.data_account_type_expenses l10n_fi.fi_chart_template False l10n_fi.account_tag_wages_and_salaries_other l10n_fi.account_tag_pension_costs_of_production
173 account_6100 6100 Eläkevakuutusmaksut account.data_account_type_expenses l10n_fi.fi_chart_template False l10n_fi.account_tag_pension_costs_other
174 account_6290 6290 Tilikauden aikainen jaksotus account.data_account_type_expenses l10n_fi.fi_chart_template False l10n_fi.account_tag_pension_costs_other l10n_fi.account_tag_other_additional_expenses_other
175 account_6300 6300 Sosiaaliturvamaksut account.data_account_type_expenses l10n_fi.fi_chart_template False l10n_fi.account_tag_other_additional_expenses_other
176 account_6400 6400 Pakolliset vakuutusmaksut account.data_account_type_expenses l10n_fi.fi_chart_template False l10n_fi.account_tag_other_additional_expenses_other
177 account_6500 6500 Muut henkilöstön vakuutusmaksut account.data_account_type_expenses l10n_fi.fi_chart_template False l10n_fi.account_tag_other_additional_expenses_other
178 account_6690 6690 Tilikauden aikainen jaksotus account.data_account_type_expenses l10n_fi.fi_chart_template False l10n_fi.account_tag_other_additional_expenses_other
179 account_6800 6800 Suunnitelman mukaiset poistot account.data_account_type_expenses l10n_fi.fi_chart_template False l10n_fi.account_tag_other_additional_expenses_other l10n_fi.account_tag_depreciation_according_to_plan
180 account_6930 6930 Konserniliikearvon poisto ja konsenireservin vähennys account.data_account_type_expenses l10n_fi.fi_chart_template False l10n_fi.account_tag_depreciation_according_to_plan l10n_fi.account_tag_change_in_depreciation_difference
181 account_6950 6950 Arvonalentumiset pysyvien vastaavien hyödykkeistä account.data_account_type_expenses l10n_fi.fi_chart_template False l10n_fi.account_tag_impairment_of_fixed_assets
182 account_6990 6990 Vaihtuvien vastaavien poikkeukselliset arvonalentumiset account.data_account_type_expenses l10n_fi.fi_chart_template False l10n_fi.account_tag_impairment_of_fixed_assets l10n_fi.account_tag_impairment_losses_financial_assets_current_assets
183 account_7000 7000 Vapaaehtoiset henkilösivukulut account.data_account_type_expenses l10n_fi.fi_chart_template False l10n_fi.account_tag_impairment_losses_financial_assets_current_assets l10n_fi.account_tag_personnel_other
184 account_7200 7200 Toimitilakulut account.data_account_type_expenses l10n_fi.fi_chart_template False l10n_fi.account_tag_personnel_other l10n_fi.account_tag_premises_costs
185 account_7230 7230 Toimitilavuokrat account.data_account_type_expenses l10n_fi.fi_chart_template False l10n_fi.account_tag_premises_costs
186 account_7250 7250 Varastovuokrat account.data_account_type_expenses l10n_fi.fi_chart_template False l10n_fi.account_tag_premises_costs
187 account_7270 7270 Autotalli- ja autopaikkavuokrat account.data_account_type_expenses l10n_fi.fi_chart_template False l10n_fi.account_tag_premises_costs
188 account_7500 7500 Ajoneuvokulut account.data_account_type_expenses l10n_fi.fi_chart_template False l10n_fi.account_tag_premises_costs l10n_fi.account_tag_vehicle_expenses
189 account_7520 7520 Ajoneuvovuokrat account.data_account_type_expenses l10n_fi.fi_chart_template False l10n_fi.account_tag_vehicle_expenses
190 account_7640 7640 Atk-laite ja -ohjelmakulut account.data_account_type_expenses l10n_fi.fi_chart_template False l10n_fi.account_tag_vehicle_expenses l10n_fi.account_tag_it_expenses
191 account_7650 7650 Atk-laite ja ohjelm. vuokrat account.data_account_type_expenses l10n_fi.fi_chart_template False l10n_fi.account_tag_it_expenses
192 account_7710 7710 Kone- ja kalustokulut account.data_account_type_expenses l10n_fi.fi_chart_template False l10n_fi.account_tag_it_expenses l10n_fi.account_tag_in_machinery_and_equipment_expenses
193 account_7720 7720 Kone- ja kalustovuokrat account.data_account_type_expenses l10n_fi.fi_chart_template False l10n_fi.account_tag_in_machinery_and_equipment_expenses
194 account_7800 7800 Matkakulut account.data_account_type_expenses l10n_fi.fi_chart_template False l10n_fi.account_tag_in_machinery_and_equipment_expenses l10n_fi.account_tag_travelling
195 account_7950 7950 Edustuskulut account.data_account_type_expenses l10n_fi.fi_chart_template False l10n_fi.account_tag_travelling l10n_fi.account_tag_representation
196 account_8000 8000 Myyntikulut account.data_account_type_expenses l10n_fi.fi_chart_template False l10n_fi.account_tag_representation l10n_fi.account_tag_selling_expenses
197 account_8050 8050 Markkinointikulut account.data_account_type_expenses l10n_fi.fi_chart_template False l10n_fi.account_tag_selling_expenses l10n_fi.account_tag_marketing_expenses
198 account_8300 8300 Tutkimus- ja kehityskulut account.data_account_type_expenses l10n_fi.fi_chart_template False l10n_fi.account_tag_marketing_expenses l10n_fi.account_tag_research_and_development
199 account_8370 8370 Ostetut hallintopalvelut account.data_account_type_expenses l10n_fi.fi_chart_template False l10n_fi.account_tag_research_and_development l10n_fi.account_tag_administrative_services
200 account_8450 8450 Muut hallintokulut account.data_account_type_expenses l10n_fi.fi_chart_template False l10n_fi.account_tag_administrative_services l10n_fi.account_tag_other_administrative_expenses
201 account_8451 8451 Puhelin- ja tietoliikennekulut account.data_account_type_expenses l10n_fi.fi_chart_template False l10n_fi.account_tag_it_expenses
202 account_8452 8452 Vakuutukset ja vahingonkorvaukset account.data_account_type_expenses l10n_fi.fi_chart_template False l10n_fi.account_tag_other_fixed_costs
203 account_8453 8453 Toimisto- ja hallintokulut account.data_account_type_expenses l10n_fi.fi_chart_template False l10n_fi.account_tag_other_administrative_expenses
210 account_8890 8890 Täsmäytyserot account.data_account_type_expenses l10n_fi.fi_chart_template False l10n_fi.account_tag_other_fixed_costs
211 account_8990 8990 Osuus osakkuusyritysten tuloksesta account.data_account_type_expenses l10n_fi.fi_chart_template False
212 account_9000 9000 Tuotot osuuksista saman konsernin yrityksissä account.data_account_type_other_income l10n_fi.fi_chart_template False l10n_fi.account_tag_income_from_shares_in_group
213 account_9030 9030 Osuus osakkuusyritysten voitosta (tappiosta) account.data_account_type_other_income l10n_fi.fi_chart_template False l10n_fi.account_tag_income_from_associated_company
214 account_9040 9040 Tuotot osuuksista omistusyhteysyrityksissä account.data_account_type_other_income l10n_fi.fi_chart_template False l10n_fi.account_tag_income_from_associated_company
215 account_9070 9070 Tuotot osuuksista muissa omistusyhteysyrityksissä account.data_account_type_other_income l10n_fi.fi_chart_template False l10n_fi.account_tag_income_from_associated_company
216 account_9080 9080 Sijoitustuotot pysyvien vastaavien sijoituksista, konserni account.data_account_type_other_income l10n_fi.fi_chart_template False l10n_fi.account_tag_investment_income_other_current_assets_group
217 account_9090 9090 Sijoitustuotot pysyvien vastaavien sijoituksista, muut account.data_account_type_other_income l10n_fi.fi_chart_template False l10n_fi.account_tag_other_investment_income_from_fixed_assets
218 account_9150 9150 Muut korko- ja rahoitustuotot, konserni account.data_account_type_other_income l10n_fi.fi_chart_template False l10n_fi.account_tag_interest_and_financial_income_from_group

View File

@@ -91,9 +91,26 @@ def get_records_pager(ids, current):
if current.id in ids and (hasattr(current, 'website_url') or hasattr(current, 'access_url')):
attr_name = 'access_url' if hasattr(current, 'access_url') else 'website_url'
idx = ids.index(current.id)
prev_record = idx != 0 and current.browse(ids[idx - 1])
next_record = idx < len(ids) - 1 and current.browse(ids[idx + 1])
if prev_record and prev_record[attr_name] and attr_name == "access_url":
prev_url = '%s?access_token=%s' % (prev_record[attr_name], prev_record._portal_ensure_token())
elif prev_record and prev_record[attr_name]:
prev_url = prev_record[attr_name]
else:
prev_url = prev_record
if next_record and next_record[attr_name] and attr_name == "access_url":
next_url = '%s?access_token=%s' % (next_record[attr_name], next_record._portal_ensure_token())
elif next_record and next_record[attr_name]:
next_url = next_record[attr_name]
else:
next_url = next_record
return {
'prev_record': idx != 0 and getattr(current.browse(ids[idx - 1]), attr_name),
'next_record': idx < len(ids) - 1 and getattr(current.browse(ids[idx + 1]), attr_name),
'prev_record': prev_url,
'next_record': next_url,
}
return {}

View File

@@ -0,0 +1,18 @@
flectra.define('pos_hr.PaymentScreen', function (require) {
'use strict';
const PaymentScreen = require('point_of_sale.PaymentScreen');
const Registries = require('point_of_sale.Registries');
const PosHrPaymentScreen = (PaymentScreen_) =>
class extends PaymentScreen_ {
async _finalizeValidation() {
this.currentOrder.employee = this.env.pos.get_cashier();
await super._finalizeValidation();
}
};
Registries.Component.extend(PaymentScreen, PosHrPaymentScreen);
return PaymentScreen;
});

View File

@@ -10,6 +10,7 @@
<script type="text/javascript" src="/pos_hr/static/src/js/HeaderLockButton.js"></script>
<script type="text/javascript" src="/pos_hr/static/src/js/CashierName.js"></script>
<script type="text/javascript" src="/pos_hr/static/src/js/LoginScreen.js"></script>
<script type="text/javascript" src="/pos_hr/static/src/js/PaymentScreen.js"></script>
</xpath>
</template>

View File

@@ -18,7 +18,7 @@ class WebsiteSnippetFilter(models.Model):
_description = 'Website Snippet Filter'
_order = 'name ASC'
name = fields.Char(required=True)
name = fields.Char(required=True, translate=True)
action_server_id = fields.Many2one('ir.actions.server', 'Server Action', ondelete='cascade')
field_names = fields.Char(help="A list of comma-separated field names", required=True)
filter_id = fields.Many2one('ir.filters', 'Filter', ondelete='cascade')

View File

@@ -51,7 +51,11 @@ class Lead(models.Model):
request.website.crm_default_team_id.id
values['user_id'] = values.get('user_id') or \
request.website.crm_default_user_id.id
values['type'] = 'lead' if self.with_user(SUPERUSER_ID).env['res.users'].has_group('crm.group_use_lead') else 'opportunity'
if values.get('team_id'):
values['type'] = 'lead' if self.env['crm.team'].sudo().browse(values['team_id']).use_leads else 'opportunity'
else:
values['type'] = 'lead' if self.with_user(SUPERUSER_ID).env['res.users'].has_group('crm.group_use_lead') else 'opportunity'
return values

View File

@@ -466,7 +466,7 @@ class Post(models.Model):
match = re.escape(match) # replace parenthesis or special char in regex
content = re.sub(match, match[:3] + 'rel="nofollow" ' + match[3:], content)
if self.env.user.karma <= forum.karma_editor:
if self.env.user.karma < forum.karma_editor:
filter_regexp = r'(<img.*?>)|(<a[^>]*?href[^>]*?>)|(<[a-z|A-Z]+[^>]*style\s*=\s*[\'"][^\'"]*\s*background[^:]*:[^url;]*url)'
content_match = re.search(filter_regexp, content, re.I)
if content_match: