- Hi Deco Addict,
+ Hi Acme Corporation,
Welcome to My Company (San Francisco).
It's great to meet you! Now that you're on board, you'll discover what My Company (San Francisco) has to offer. My name is Marc Demo and I'll help you get the most out of Odoo. Could we plan a quick demo soon?
Feel free to reach out at any time!
diff --git a/addons/crm/tests/test_crm_lead_convert_mass.py b/addons/crm/tests/test_crm_lead_convert_mass.py
index a39dec8e28548..b15f37a9e1113 100644
--- a/addons/crm/tests/test_crm_lead_convert_mass.py
+++ b/addons/crm/tests/test_crm_lead_convert_mass.py
@@ -24,7 +24,7 @@ def test_assignment_salesmen(self):
with self.assertQueryCount(user_sales_manager=0):
test_leads = self.env['crm.lead'].browse(test_leads.ids)
- with self.assertQueryCount(user_sales_manager=543): # crm 537 / com 543 / ent 537
+ with self.assertQueryCount(user_sales_manager=597): # crm 537 / com 543 / ent 591
test_leads._handle_salesmen_assignment(user_ids=user_ids, team_id=False)
self.assertEqual(test_leads.team_id, self.sales_team_convert | self.sales_team_1)
@@ -42,7 +42,7 @@ def test_assignment_salesmen_wteam(self):
with self.assertQueryCount(user_sales_manager=0):
test_leads = self.env['crm.lead'].browse(test_leads.ids)
- with self.assertQueryCount(user_sales_manager=524): # crm 521 / com 524
+ with self.assertQueryCount(user_sales_manager=544): # crm 521 / com 544
test_leads._handle_salesmen_assignment(user_ids=user_ids, team_id=team_id)
self.assertEqual(test_leads.team_id, self.sales_team_convert)
@@ -167,7 +167,7 @@ def test_mass_convert_performances(self):
user_ids = self.assign_users.ids
# randomness: at least 1 query
- with self.assertQueryCount(user_sales_manager=1704): # crm 1410 / com 1697
+ with self.assertQueryCount(user_sales_manager=1754): # crm 1410 / com 1697
mass_convert = self.env['crm.lead2opportunity.partner.mass'].with_context({
'active_model': 'crm.lead',
'active_ids': test_leads.ids,
diff --git a/addons/l10n_account_edi_ubl_cii_tests/tests/test_files/from_odoo/bis3_out_invoice_gln.xml b/addons/l10n_account_edi_ubl_cii_tests/tests/test_files/from_odoo/bis3_out_invoice_gln.xml
new file mode 100644
index 0000000000000..9e0e092ac0f66
--- /dev/null
+++ b/addons/l10n_account_edi_ubl_cii_tests/tests/test_files/from_odoo/bis3_out_invoice_gln.xml
@@ -0,0 +1,129 @@
+
+
+ urn:cen.eu:en16931:2017#compliant#urn:fdc:peppol.eu:2017:poacc:billing:3.0
+ urn:fdc:peppol.eu:2017:poacc:billing:01:1.0
+ ___ignore___
+ 2017-01-01
+ 2017-02-28
+ 380
+ test narration
+ USD
+ ref_partner_2
+
+ ref_move
+
+
+
+ BE0202239951
+
+ partner_1
+
+
+ Chaussée de Namur 40
+ Ramillies
+ 1367
+
+ BE
+
+
+
+ BE0202239951
+
+ VAT
+
+
+
+ partner_1
+ BE0202239951
+
+
+ partner_1
+
+
+
+
+
+ BE0477472701
+
+ partner_2
+
+
+ Rue des Bourlottes 9
+ Ramillies
+ 1367
+
+ BE
+
+
+
+ BE0477472701
+
+ VAT
+
+
+
+ partner_2
+ BE0477472701
+
+
+ partner_2
+
+
+
+
+
+ 222222222222
+
+
+
+ 30
+ ___ignore___
+
+ BE15001559627230
+
+
+
+ Payment terms: 30% Advance End of Following Month
+
+
+ 0.00
+
+ 990.00
+ 0.00
+
+ E
+ 0.0
+ Articles 226 items 11 to 15 Directive 2006/112/EN
+
+ VAT
+
+
+
+
+
+ 990.00
+ 990.00
+ 990.00
+ 0.00
+ 990.00
+
+
+ 1
+ 1.0
+ 990.00
+
+ product_a
+ product_a
+
+ E
+ 0.0
+
+ VAT
+
+
+
+
+ 990.0
+
+
+
diff --git a/addons/l10n_account_edi_ubl_cii_tests/tests/test_xml_ubl_be.py b/addons/l10n_account_edi_ubl_cii_tests/tests/test_xml_ubl_be.py
index 89035abef3e5b..634fcc6014d48 100644
--- a/addons/l10n_account_edi_ubl_cii_tests/tests/test_xml_ubl_be.py
+++ b/addons/l10n_account_edi_ubl_cii_tests/tests/test_xml_ubl_be.py
@@ -547,6 +547,26 @@ def test_export_tax_exempt(self):
)
self._assert_invoice_attachment(invoice, None, 'from_odoo/bis3_out_invoice_tax_exempt.xml')
+ def test_export_gln(self):
+ """ GLN was added in a fixup module account_add_gln. """
+ # TODO master: clean that skiptest, when the module account_add_gln is merged with account
+ if 'global_location_number' not in self.partner_2._fields:
+ self.skipTest("Fixup module with GLN not installed.")
+ self.partner_2.global_location_number = "222222222222"
+ invoice = self._generate_move(
+ self.partner_1,
+ self.partner_2,
+ move_type='out_invoice',
+ invoice_line_ids=[
+ {
+ 'product_id': self.product_a.id,
+ 'price_unit': 990.0,
+ 'tax_ids': [(6, 0, self.tax_0.ids)],
+ },
+ ],
+ )
+ self._assert_invoice_attachment(invoice, None, 'from_odoo/bis3_out_invoice_gln.xml')
+
####################################################
# Test import
####################################################
diff --git a/addons/l10n_fr_fec/__init__.py b/addons/l10n_fr_fec/__init__.py
index 58d2359634e5a..3efd90457dc09 100644
--- a/addons/l10n_fr_fec/__init__.py
+++ b/addons/l10n_fr_fec/__init__.py
@@ -3,4 +3,5 @@
# Copyright (C) 2013-2015 Akretion (http://www.akretion.com)
+from . import controllers
from . import wizard
diff --git a/addons/l10n_fr_fec/controllers/__init__.py b/addons/l10n_fr_fec/controllers/__init__.py
new file mode 100644
index 0000000000000..12a7e529b6741
--- /dev/null
+++ b/addons/l10n_fr_fec/controllers/__init__.py
@@ -0,0 +1 @@
+from . import main
diff --git a/addons/l10n_fr_fec/controllers/main.py b/addons/l10n_fr_fec/controllers/main.py
new file mode 100644
index 0000000000000..bb62897877c99
--- /dev/null
+++ b/addons/l10n_fr_fec/controllers/main.py
@@ -0,0 +1,14 @@
+from odoo import http
+from odoo.http import request
+
+
+class FecDownloadController(http.Controller):
+ @http.route('/download/fec_file/ ', type='http', auth='user')
+ def download_fec(self, wizard_id):
+ wizard = request.env['account.fr.fec'].browse(wizard_id)
+ content = wizard._get_fec_stream()
+
+ return request.make_response(content, [
+ ('Content-Type', 'text/csv'),
+ ('Content-Disposition', f'attachment; filename={wizard.filename};')
+ ])
diff --git a/addons/l10n_fr_fec/tests/test_wizard.py b/addons/l10n_fr_fec/tests/test_wizard.py
index ca5ed6aab38d5..92c9788be12a1 100644
--- a/addons/l10n_fr_fec/tests/test_wizard.py
+++ b/addons/l10n_fr_fec/tests/test_wizard.py
@@ -1,7 +1,6 @@
# -*- coding: utf-8 -*-
# Part of Odoo. See LICENSE file for full copyright and licensing details.
-import base64
from datetime import timedelta
from freezegun import freeze_time
@@ -67,7 +66,6 @@ def setUpClass(cls, chart_template_ref='l10n_fr.l10n_fr_pcg_chart_template'):
cls.invoice_a.action_post()
def test_generate_fec_sanitize_pieceref(self):
- self.wizard.generate_fec()
expected_content = (
"JournalCode|JournalLib|EcritureNum|EcritureDate|CompteNum|CompteLib|CompAuxNum|CompAuxLib|PieceRef|PieceDate|EcritureLib|Debit|Credit|EcritureLet|DateLet|ValidDate|Montantdevise|Idevise\r\n"
"INV|Customer Invoices|INV/2021/00001|20210502|701000|Ventes de produits finis|||-|20210502|Hello Darkness|0,00| 000000000001437,12|||20210502|-000000000001437,12|EUR\r\n"
@@ -76,5 +74,7 @@ def test_generate_fec_sanitize_pieceref(self):
"INV|Customer Invoices|INV/2021/00001|20210502|445710|TVA collectée|||-|20210502|TVA 20,0%|0,00| 000000000001293,41|||20210502|-000000000001293,41|EUR\r\n"
f"INV|Customer Invoices|INV/2021/00001|20210502|411100|Clients - Ventes de biens ou de prestations de services|{self.partner_a.id}|partner_a|-|20210502|INV/2021/00001| 000000000007760,45|0,00|||20210502| 000000000007760,45|EUR"
)
- content = base64.b64decode(self.wizard.fec_data).decode()
+ data_generator = self.wizard.with_context(fec_test_mode=True)._get_fec_stream()
+ content_bytes = b''.join(list(data_generator))
+ content = content_bytes.decode('utf-8')
self.assertEqual(expected_content, content)
diff --git a/addons/l10n_fr_fec/wizard/account_fr_fec.py b/addons/l10n_fr_fec/wizard/account_fr_fec.py
index 77b88b3250fa4..51055cf4d4d42 100644
--- a/addons/l10n_fr_fec/wizard/account_fr_fec.py
+++ b/addons/l10n_fr_fec/wizard/account_fr_fec.py
@@ -3,11 +3,14 @@
# Copyright (C) 2013-2015 Akretion (http://www.akretion.com)
-import base64
+import contextlib
+import csv
import io
+from itertools import chain
from odoo import api, fields, models, _
from odoo.exceptions import UserError, AccessDenied
+from odoo.modules.registry import Registry
from odoo.tools import float_is_zero, pycompat
from odoo.tools.misc import get_lang
from stdnum.fr import siren
@@ -19,7 +22,7 @@ class AccountFrFec(models.TransientModel):
date_from = fields.Date(string='Start Date', required=True)
date_to = fields.Date(string='End Date', required=True)
- fec_data = fields.Binary('FEC File', readonly=True)
+ fec_data = fields.Binary('FEC File', readonly=True) # This field is not used anymore.
filename = fields.Char(string='Filename', size=256, readonly=True)
test_file = fields.Boolean()
export_type = fields.Selection([
@@ -102,26 +105,8 @@ def _get_company_legal_data(self, company):
else:
return company.vat
- def generate_fec(self):
- self.ensure_one()
- if not (self.env.is_admin() or self.env.user.has_group('account.group_account_user')):
- raise AccessDenied()
- # We choose to implement the flat file instead of the XML
- # file for 2 reasons :
- # 1) the XSD file impose to have the label on the account.move
- # but Odoo has the label on the account.move.line, so that's a
- # problem !
- # 2) CSV files are easier to read/use for a regular accountant.
- # So it will be easier for the accountant to check the file before
- # sending it to the fiscal administration
- today = fields.Date.today()
- if self.date_from > today or self.date_to > today:
- raise UserError(_('You could not set the start date or the end date in the future.'))
- if self.date_from >= self.date_to:
- raise UserError(_('The start date must be inferior to the end date.'))
-
- company = self.env.company
- company_legal_data = self._get_company_legal_data(company)
+ def _get_fec_stream(self):
+ company_id = self.env.company.id
header = [
u'JournalCode', # 0
@@ -144,269 +129,317 @@ def generate_fec(self):
u'Idevise', # 17
]
- rows_to_write = [header]
- # INITIAL BALANCE
- unaffected_earnings_account = self.env['account.account'].search([
- ('account_type', '=', 'equity_unaffected'),
- ('company_id', '=', company.id)
- ], limit=1)
- unaffected_earnings_line = True # used to make sure that we add the unaffected earning initial balance only once
- if unaffected_earnings_account:
- #compute the benefit/loss of last year to add in the initial balance of the current year earnings account
- unaffected_earnings_results = self._do_query_unaffected_earnings()
- unaffected_earnings_line = False
-
if self.pool['account.account'].name.translate:
lang = self.env.user.lang or get_lang(self.env).code
aa_name = f"COALESCE(aa.name->>'{lang}', aa.name->>'en_US')"
else:
aa_name = "aa.name"
- sql_query = f'''
- SELECT
- 'OUV' AS JournalCode,
- 'Balance initiale' AS JournalLib,
- 'OUVERTURE/' || %s AS EcritureNum,
- %s AS EcritureDate,
- MIN(aa.code) AS CompteNum,
- replace(replace(MIN({aa_name}), '|', '/'), '\t', '') AS CompteLib,
- '' AS CompAuxNum,
- '' AS CompAuxLib,
- '-' AS PieceRef,
- %s AS PieceDate,
- '/' AS EcritureLib,
- replace(CASE WHEN sum(aml.balance) <= 0 THEN '0,00' ELSE to_char(SUM(aml.balance), '000000000000000D99') END, '.', ',') AS Debit,
- replace(CASE WHEN sum(aml.balance) >= 0 THEN '0,00' ELSE to_char(-SUM(aml.balance), '000000000000000D99') END, '.', ',') AS Credit,
- '' AS EcritureLet,
- '' AS DateLet,
- %s AS ValidDate,
- '' AS Montantdevise,
- '' AS Idevise,
- MIN(aa.id) AS CompteID
- FROM
- account_move_line aml
- LEFT JOIN account_move am ON am.id=aml.move_id
- JOIN account_account aa ON aa.id = aml.account_id
- WHERE
- am.date < %s
- AND am.company_id = %s
- AND aa.include_initial_balance = 't'
- '''
-
- # For official report: only use posted entries
- if self.export_type == "official":
- sql_query += '''
- AND am.state = 'posted'
- '''
-
- sql_query += '''
- GROUP BY aml.account_id, aa.account_type
- HAVING aa.account_type not in ('asset_receivable', 'liability_payable') AND round(sum(aml.balance), %s) != 0
- '''
- formatted_date_from = fields.Date.to_string(self.date_from).replace('-', '')
- date_from = self.date_from
- formatted_date_year = date_from.year
- currency_digits = 2
-
- self._cr.execute(
- sql_query, (formatted_date_year, formatted_date_from, formatted_date_from, formatted_date_from, self.date_from, company.id,
- currency_digits))
-
- for row in self._cr.fetchall():
- listrow = list(row)
- account_id = listrow.pop()
- if not unaffected_earnings_line:
- account = self.env['account.account'].browse(account_id)
- if account.account_type == 'equity_unaffected':
- #add the benefit/loss of previous fiscal year to the first unaffected earnings account found.
- unaffected_earnings_line = True
- current_amount = float(listrow[11].replace(',', '.')) - float(listrow[12].replace(',', '.'))
- unaffected_earnings_amount = float(unaffected_earnings_results[11].replace(',', '.')) - float(unaffected_earnings_results[12].replace(',', '.'))
- listrow_amount = current_amount + unaffected_earnings_amount
- if float_is_zero(listrow_amount, precision_digits=currency_digits):
- continue
- if listrow_amount > 0:
- listrow[11] = str(listrow_amount).replace('.', ',')
- listrow[12] = '0,00'
- else:
- listrow[11] = '0,00'
- listrow[12] = str(-listrow_amount).replace('.', ',')
- rows_to_write.append(listrow)
-
- #if the unaffected earnings account wasn't in the selection yet: add it manually
- if (not unaffected_earnings_line
- and unaffected_earnings_results
- and (unaffected_earnings_results[11] != '0,00'
- or unaffected_earnings_results[12] != '0,00')):
- #search an unaffected earnings account
- unaffected_earnings_account = self.env['account.account'].search([('account_type', '=', 'equity_unaffected'),
- ('company_id', '=', company.id)], limit=1)
- if unaffected_earnings_account:
- unaffected_earnings_results[4] = unaffected_earnings_account.code
- unaffected_earnings_results[5] = unaffected_earnings_account.name
- rows_to_write.append(unaffected_earnings_results)
-
- # INITIAL BALANCE - receivable/payable
- sql_query = f'''
- SELECT
- 'OUV' AS JournalCode,
- 'Balance initiale' AS JournalLib,
- 'OUVERTURE/' || %s AS EcritureNum,
- %s AS EcritureDate,
- MIN(aa.code) AS CompteNum,
- replace(MIN({aa_name}), '|', '/') AS CompteLib,
- CASE WHEN MIN(aa.account_type) IN ('asset_receivable', 'liability_payable')
- THEN
- CASE WHEN rp.ref IS null OR rp.ref = ''
- THEN rp.id::text
- ELSE replace(rp.ref, '|', '/')
- END
- ELSE ''
- END
- AS CompAuxNum,
- CASE WHEN aa.account_type IN ('asset_receivable', 'liability_payable')
- THEN COALESCE(replace(rp.name, '|', '/'), '')
- ELSE ''
- END AS CompAuxLib,
- '-' AS PieceRef,
- %s AS PieceDate,
- '/' AS EcritureLib,
- replace(CASE WHEN sum(aml.balance) <= 0 THEN '0,00' ELSE to_char(SUM(aml.balance), '000000000000000D99') END, '.', ',') AS Debit,
- replace(CASE WHEN sum(aml.balance) >= 0 THEN '0,00' ELSE to_char(-SUM(aml.balance), '000000000000000D99') END, '.', ',') AS Credit,
- '' AS EcritureLet,
- '' AS DateLet,
- %s AS ValidDate,
- '' AS Montantdevise,
- '' AS Idevise,
- MIN(aa.id) AS CompteID
- FROM
- account_move_line aml
- LEFT JOIN account_move am ON am.id=aml.move_id
- LEFT JOIN res_partner rp ON rp.id=aml.partner_id
- JOIN account_account aa ON aa.id = aml.account_id
- WHERE
- am.date < %s
- AND am.company_id = %s
- AND aa.include_initial_balance = 't'
- '''
- # For official report: only use posted entries
- if self.export_type == "official":
- sql_query += '''
- AND am.state = 'posted'
- '''
+ def format_row(row):
+ with io.StringIO() as buf:
+ writer = csv.writer(buf, delimiter='|', lineterminator='\r\n')
+ writer.writerow(row)
+ return buf.getvalue().encode()
+
+ @contextlib.contextmanager
+ def get_cursor():
+ if self.env.context.get('fec_test_mode'):
+ yield self.env.cr
+ else:
+ with Registry(self.env.cr.dbname).cursor() as cr:
+ yield cr
+
+ def stream_header():
+ yield format_row(header)
+
+ def stream_initial_balance():
+ with get_cursor() as cr:
+ fec = self.with_env(self.env(cr=cr))
+ unaffected_earnings_account = fec.env['account.account'].search([
+ ('account_type', '=', 'equity_unaffected'),
+ ('company_id', '=', company_id)
+ ], limit=1)
+ unaffected_earnings_line = True # used to make sure that we add the unaffected earning initial balance only once
+ if unaffected_earnings_account:
+ # compute the benefit/loss of last year to add in the initial balance of the current year earnings account
+ unaffected_earnings_results = fec._do_query_unaffected_earnings()
+ unaffected_earnings_line = False
+
+ sql_query = f'''
+ SELECT
+ 'OUV' AS JournalCode,
+ 'Balance initiale' AS JournalLib,
+ 'OUVERTURE/' || %s AS EcritureNum,
+ %s AS EcritureDate,
+ MIN(aa.code) AS CompteNum,
+ replace(replace(MIN({aa_name}), '|', '/'), '\t', '') AS CompteLib,
+ '' AS CompAuxNum,
+ '' AS CompAuxLib,
+ '-' AS PieceRef,
+ %s AS PieceDate,
+ '/' AS EcritureLib,
+ replace(CASE WHEN sum(aml.balance) <= 0 THEN '0,00' ELSE to_char(SUM(aml.balance), '000000000000000D99') END, '.', ',') AS Debit,
+ replace(CASE WHEN sum(aml.balance) >= 0 THEN '0,00' ELSE to_char(-SUM(aml.balance), '000000000000000D99') END, '.', ',') AS Credit,
+ '' AS EcritureLet,
+ '' AS DateLet,
+ %s AS ValidDate,
+ '' AS Montantdevise,
+ '' AS Idevise,
+ MIN(aa.id) AS CompteID
+ FROM
+ account_move_line aml
+ LEFT JOIN account_move am ON am.id=aml.move_id
+ JOIN account_account aa ON aa.id = aml.account_id
+ WHERE
+ am.date < %s
+ AND am.company_id = %s
+ AND aa.include_initial_balance = 't'
+ '''
+
+ # For official report: only use posted entries
+ if fec.export_type == "official":
+ sql_query += '''
+ AND am.state = 'posted'
+ '''
+
+ sql_query += '''
+ GROUP BY aml.account_id, aa.account_type
+ HAVING aa.account_type not in ('asset_receivable', 'liability_payable') AND round(sum(aml.balance), %s) != 0
+ '''
+ formatted_date_from = fields.Date.to_string(fec.date_from).replace('-', '')
+ date_from = fec.date_from
+ formatted_date_year = date_from.year
+ currency_digits = 2
+
+ fec._cr.execute(
+ sql_query, (formatted_date_year, formatted_date_from, formatted_date_from, formatted_date_from, fec.date_from, company_id,
+ currency_digits))
+
+ for row in fec._cr.fetchall():
+ listrow = list(row)
+ account_id = listrow.pop()
+ if not unaffected_earnings_line:
+ account = fec.env['account.account'].browse(account_id)
+ if account.account_type == 'equity_unaffected':
+ # add the benefit/loss of previous fiscal year to the first unaffected earnings account found.
+ unaffected_earnings_line = True
+ current_amount = float(listrow[11].replace(',', '.')) - float(listrow[12].replace(',', '.'))
+ unaffected_earnings_amount = float(unaffected_earnings_results[11].replace(',', '.')) - float(unaffected_earnings_results[12].replace(',', '.'))
+ listrow_amount = current_amount + unaffected_earnings_amount
+ if float_is_zero(listrow_amount, precision_digits=currency_digits):
+ continue
+ if listrow_amount > 0:
+ listrow[11] = str(listrow_amount).replace('.', ',')
+ listrow[12] = '0,00'
+ else:
+ listrow[11] = '0,00'
+ listrow[12] = str(-listrow_amount).replace('.', ',')
+ yield format_row(listrow)
+
+ # if the unaffected earnings account wasn't in the selection yet: add it manually
+ if (not unaffected_earnings_line
+ and unaffected_earnings_results
+ and (unaffected_earnings_results[11] != '0,00'
+ or unaffected_earnings_results[12] != '0,00')):
+ # search an unaffected earnings account
+ unaffected_earnings_account = fec.env['account.account'].search([('account_type', '=', 'equity_unaffected'),
+ ('company_id', '=', company_id)], limit=1)
+ if unaffected_earnings_account:
+ unaffected_earnings_results[4] = unaffected_earnings_account.code
+ unaffected_earnings_results[5] = unaffected_earnings_account.name
+ yield format_row(unaffected_earnings_results)
+
+ # INITIAL BALANCE - receivable/payable
+ sql_query = f'''
+ SELECT
+ 'OUV' AS JournalCode,
+ 'Balance initiale' AS JournalLib,
+ 'OUVERTURE/' || %s AS EcritureNum,
+ %s AS EcritureDate,
+ MIN(aa.code) AS CompteNum,
+ replace(MIN({aa_name}), '|', '/') AS CompteLib,
+ CASE WHEN MIN(aa.account_type) IN ('asset_receivable', 'liability_payable')
+ THEN
+ CASE WHEN rp.ref IS null OR rp.ref = ''
+ THEN rp.id::text
+ ELSE replace(rp.ref, '|', '/')
+ END
+ ELSE ''
+ END
+ AS CompAuxNum,
+ CASE WHEN aa.account_type IN ('asset_receivable', 'liability_payable')
+ THEN COALESCE(replace(rp.name, '|', '/'), '')
+ ELSE ''
+ END AS CompAuxLib,
+ '-' AS PieceRef,
+ %s AS PieceDate,
+ '/' AS EcritureLib,
+ replace(CASE WHEN sum(aml.balance) <= 0 THEN '0,00' ELSE to_char(SUM(aml.balance), '000000000000000D99') END, '.', ',') AS Debit,
+ replace(CASE WHEN sum(aml.balance) >= 0 THEN '0,00' ELSE to_char(-SUM(aml.balance), '000000000000000D99') END, '.', ',') AS Credit,
+ '' AS EcritureLet,
+ '' AS DateLet,
+ %s AS ValidDate,
+ '' AS Montantdevise,
+ '' AS Idevise,
+ MIN(aa.id) AS CompteID
+ FROM
+ account_move_line aml
+ LEFT JOIN account_move am ON am.id=aml.move_id
+ LEFT JOIN res_partner rp ON rp.id=aml.partner_id
+ JOIN account_account aa ON aa.id = aml.account_id
+ WHERE
+ am.date < %s
+ AND am.company_id = %s
+ AND aa.include_initial_balance = 't'
+ '''
+
+ # For official report: only use posted entries
+ if fec.export_type == "official":
+ sql_query += '''
+ AND am.state = 'posted'
+ '''
+
+ sql_query += '''
+ GROUP BY aml.account_id, aa.account_type, rp.ref, rp.id
+ HAVING aa.account_type in ('asset_receivable', 'liability_payable') AND round(sum(aml.balance), %s) != 0
+ '''
+ fec._cr.execute(
+ sql_query, (formatted_date_year, formatted_date_from, formatted_date_from, formatted_date_from, fec.date_from, company_id,
+ currency_digits))
+
+ for row in fec._cr.fetchall():
+ listrow = list(row)
+ account_id = listrow.pop()
+ yield format_row(listrow)
+
+ def stream_lines():
+ with get_cursor() as cr:
+ fec = self.with_env(self.env(cr=cr))
+ if fec.pool['account.journal'].name.translate:
+ lang = fec.env.user.lang or get_lang(fec.env).code
+ aj_name = f"COALESCE(aj.name->>'{lang}', aj.name->>'en_US')"
+ else:
+ aj_name = "aj.name"
+
+ query_limit = int(fec.env['ir.config_parameter'].sudo().get_param('l10n_fr_fec.batch_size', 500000)) # To prevent memory errors when fetching the results
+
+ sql_query = f'''
+ SELECT
+ REGEXP_REPLACE(replace(aj.code, '|', '/'), '[\\t\\r\\n]', ' ', 'g') AS JournalCode,
+ REGEXP_REPLACE(replace({aj_name}, '|', '/'), '[\\t\\r\\n]', ' ', 'g') AS JournalLib,
+ REGEXP_REPLACE(replace(am.name, '|', '/'), '[\\t\\r\\n]', ' ', 'g') AS EcritureNum,
+ TO_CHAR(am.date, 'YYYYMMDD') AS EcritureDate,
+ aa.code AS CompteNum,
+ REGEXP_REPLACE(replace({aa_name}, '|', '/'), '[\\t\\r\\n]', ' ', 'g') AS CompteLib,
+ CASE WHEN aa.account_type IN ('asset_receivable', 'liability_payable')
+ THEN
+ CASE WHEN rp.ref IS null OR rp.ref = ''
+ THEN rp.id::text
+ ELSE replace(rp.ref, '|', '/')
+ END
+ ELSE ''
+ END
+ AS CompAuxNum,
+ CASE WHEN aa.account_type IN ('asset_receivable', 'liability_payable')
+ THEN COALESCE(REGEXP_REPLACE(replace(rp.name, '|', '/'), '[\\t\\r\\n]', ' ', 'g'), '')
+ ELSE ''
+ END AS CompAuxLib,
+ CASE WHEN am.ref IS null OR am.ref = ''
+ THEN '-'
+ ELSE REGEXP_REPLACE(replace(am.ref, '|', '/'), '[\\t\\r\\n]', ' ', 'g')
+ END
+ AS PieceRef,
+ TO_CHAR(COALESCE(am.invoice_date, am.date), 'YYYYMMDD') AS PieceDate,
+ CASE WHEN aml.name IS NULL OR aml.name = '' THEN '/'
+ WHEN aml.name SIMILAR TO '[\\t|\\s|\\n]*' THEN '/'
+ ELSE REGEXP_REPLACE(replace(aml.name, '|', '/'), '[\\t\\n\\r]', ' ', 'g') END AS EcritureLib,
+ replace(CASE WHEN aml.debit = 0 THEN '0,00' ELSE to_char(aml.debit, '000000000000000D99') END, '.', ',') AS Debit,
+ replace(CASE WHEN aml.credit = 0 THEN '0,00' ELSE to_char(aml.credit, '000000000000000D99') END, '.', ',') AS Credit,
+ CASE WHEN rec.name IS NULL THEN '' ELSE rec.name END AS EcritureLet,
+ CASE WHEN aml.full_reconcile_id IS NULL THEN '' ELSE TO_CHAR(rec.create_date, 'YYYYMMDD') END AS DateLet,
+ TO_CHAR(am.date, 'YYYYMMDD') AS ValidDate,
+ CASE
+ WHEN aml.amount_currency IS NULL OR aml.amount_currency = 0 THEN ''
+ ELSE replace(to_char(aml.amount_currency, '000000000000000D99'), '.', ',')
+ END AS Montantdevise,
+ CASE WHEN aml.currency_id IS NULL THEN '' ELSE rc.name END AS Idevise
+ FROM
+ account_move_line aml
+ LEFT JOIN account_move am ON am.id=aml.move_id
+ LEFT JOIN res_partner rp ON rp.id=aml.partner_id
+ JOIN account_journal aj ON aj.id = am.journal_id
+ JOIN account_account aa ON aa.id = aml.account_id
+ LEFT JOIN res_currency rc ON rc.id = aml.currency_id
+ LEFT JOIN account_full_reconcile rec ON rec.id = aml.full_reconcile_id
+ WHERE
+ am.date >= %s
+ AND am.date <= %s
+ AND am.company_id = %s
+ {"AND am.state = 'posted'" if fec.export_type == 'official' else ""}
+ ORDER BY
+ am.date,
+ am.name,
+ aml.id
+ LIMIT %s
+ OFFSET %s
+ '''
+
+ query_offset = 0
+ has_more_results = True
+ while has_more_results:
+ fec._cr.execute(
+ sql_query,
+ (fec.date_from, fec.date_to, company_id, query_limit + 1, query_offset)
+ )
+ query_offset += query_limit
+ has_more_results = fec._cr.rowcount > query_limit # we load one more result than the limit to check if there is more
+ query_results = fec._cr.fetchall()
+ for row in query_results[:query_limit]:
+ row = list(row)
+ yield format_row(row)
- sql_query += '''
- GROUP BY aml.account_id, aa.account_type, rp.ref, rp.id
- HAVING aa.account_type in ('asset_receivable', 'liability_payable') AND round(sum(aml.balance), %s) != 0
- '''
- self._cr.execute(
- sql_query, (formatted_date_year, formatted_date_from, formatted_date_from, formatted_date_from, self.date_from, company.id,
- currency_digits))
+ def remove_trailing_newline(rows_iterator):
+ """
+ Remove the trailing newline characters (\r\n) from the last row.
- for row in self._cr.fetchall():
- listrow = list(row)
- account_id = listrow.pop()
- rows_to_write.append(listrow)
+ Each row in the iterator ends with '\r\n', but the FEC file format
+ requires no trailing newline after the final row. This function
+ yields all rows unchanged except the last one, which has its
+ trailing 2 characters (the \r\n) stripped.
+ """
+ try:
+ current_row = next(rows_iterator)
+ except StopIteration:
+ return
- # LINES
- if self.pool['account.journal'].name.translate:
- lang = self.env.user.lang or get_lang(self.env).code
- aj_name = f"COALESCE(aj.name->>'{lang}', aj.name->>'en_US')"
- else:
- aj_name = "aj.name"
+ for next_row in rows_iterator:
+ yield current_row
+ current_row = next_row
- query_limit = int(self.env['ir.config_parameter'].sudo().get_param('l10n_fr_fec.batch_size', 500000)) # To prevent memory errors when fetching the results
+ yield current_row[:-2]
- sql_query = f'''
- SELECT
- REGEXP_REPLACE(replace(aj.code, '|', '/'), '[\\t\\r\\n]', ' ', 'g') AS JournalCode,
- REGEXP_REPLACE(replace({aj_name}, '|', '/'), '[\\t\\r\\n]', ' ', 'g') AS JournalLib,
- REGEXP_REPLACE(replace(am.name, '|', '/'), '[\\t\\r\\n]', ' ', 'g') AS EcritureNum,
- TO_CHAR(am.date, 'YYYYMMDD') AS EcritureDate,
- aa.code AS CompteNum,
- REGEXP_REPLACE(replace({aa_name}, '|', '/'), '[\\t\\r\\n]', ' ', 'g') AS CompteLib,
- CASE WHEN aa.account_type IN ('asset_receivable', 'liability_payable')
- THEN
- CASE WHEN rp.ref IS null OR rp.ref = ''
- THEN rp.id::text
- ELSE replace(rp.ref, '|', '/')
- END
- ELSE ''
- END
- AS CompAuxNum,
- CASE WHEN aa.account_type IN ('asset_receivable', 'liability_payable')
- THEN COALESCE(REGEXP_REPLACE(replace(rp.name, '|', '/'), '[\\t\\r\\n]', ' ', 'g'), '')
- ELSE ''
- END AS CompAuxLib,
- CASE WHEN am.ref IS null OR am.ref = ''
- THEN '-'
- ELSE REGEXP_REPLACE(replace(am.ref, '|', '/'), '[\\t\\r\\n]', ' ', 'g')
- END
- AS PieceRef,
- TO_CHAR(COALESCE(am.invoice_date, am.date), 'YYYYMMDD') AS PieceDate,
- CASE WHEN aml.name IS NULL OR aml.name = '' THEN '/'
- WHEN aml.name SIMILAR TO '[\\t|\\s|\\n]*' THEN '/'
- ELSE REGEXP_REPLACE(replace(aml.name, '|', '/'), '[\\t\\n\\r]', ' ', 'g') END AS EcritureLib,
- replace(CASE WHEN aml.debit = 0 THEN '0,00' ELSE to_char(aml.debit, '000000000000000D99') END, '.', ',') AS Debit,
- replace(CASE WHEN aml.credit = 0 THEN '0,00' ELSE to_char(aml.credit, '000000000000000D99') END, '.', ',') AS Credit,
- CASE WHEN rec.name IS NULL THEN '' ELSE rec.name END AS EcritureLet,
- CASE WHEN aml.full_reconcile_id IS NULL THEN '' ELSE TO_CHAR(rec.create_date, 'YYYYMMDD') END AS DateLet,
- TO_CHAR(am.date, 'YYYYMMDD') AS ValidDate,
- CASE
- WHEN aml.amount_currency IS NULL OR aml.amount_currency = 0 THEN ''
- ELSE replace(to_char(aml.amount_currency, '000000000000000D99'), '.', ',')
- END AS Montantdevise,
- CASE WHEN aml.currency_id IS NULL THEN '' ELSE rc.name END AS Idevise
- FROM
- account_move_line aml
- LEFT JOIN account_move am ON am.id=aml.move_id
- LEFT JOIN res_partner rp ON rp.id=aml.partner_id
- JOIN account_journal aj ON aj.id = am.journal_id
- JOIN account_account aa ON aa.id = aml.account_id
- LEFT JOIN res_currency rc ON rc.id = aml.currency_id
- LEFT JOIN account_full_reconcile rec ON rec.id = aml.full_reconcile_id
- WHERE
- am.date >= %s
- AND am.date <= %s
- AND am.company_id = %s
- {"AND am.state = 'posted'" if self.export_type == 'official' else ""}
- ORDER BY
- am.date,
- am.name,
- aml.id
- LIMIT %s
- OFFSET %s
- '''
+ return remove_trailing_newline(chain(stream_header(), stream_initial_balance(), stream_lines()))
- with io.BytesIO() as fecfile:
- csv_writer = pycompat.csv_writer(fecfile, delimiter='|', lineterminator='')
-
- # Write header and initial balances
- for initial_row in rows_to_write:
- initial_row = list(initial_row)
- # We don't skip \n at then end of the file if there are only initial balances, for simplicity. An empty period export shouldn't happen IRL.
- initial_row[-1] += u'\r\n'
- csv_writer.writerow(initial_row)
-
- # Write current period's data
- query_offset = 0
- has_more_results = True
- while has_more_results:
- self._cr.execute(
- sql_query,
- (self.date_from, self.date_to, company.id, query_limit + 1, query_offset)
- )
- query_offset += query_limit
- has_more_results = self._cr.rowcount > query_limit # we load one more result than the limit to check if there is more
- query_results = self._cr.fetchall()
- for i, row in enumerate(query_results[:query_limit]):
- if i < len(query_results) - 1:
- # The file is not allowed to end with an empty line, so we can't use lineterminator on the writer
- row = list(row)
- row[-1] += u'\r\n'
- csv_writer.writerow(row)
+ def generate_fec(self):
+ self.ensure_one()
+ if not (self.env.is_admin() or self.env.user.has_group('account.group_account_user')):
+ raise AccessDenied()
+ # We choose to implement the flat file instead of the XML
+ # file for 2 reasons :
+ # 1) the XSD file impose to have the label on the account.move
+ # but Odoo has the label on the account.move.line, so that's a
+ # problem !
+ # 2) CSV files are easier to read/use for a regular accountant.
+ # So it will be easier for the accountant to check the file before
+ # sending it to the fiscal administration
+ today = fields.Date.today()
+ if self.date_from > today or self.date_to > today:
+ raise UserError(_('You could not set the start date or the end date in the future.'))
+ if self.date_from >= self.date_to:
+ raise UserError(_('The start date must be inferior to the end date.'))
- base64_result = base64.encodebytes(fecfile.getvalue())
+ company = self.env.company
+ company_legal_data = self._get_company_legal_data(company)
end_date = fields.Date.to_string(self.date_to).replace('-', '')
suffix = ''
@@ -414,7 +447,6 @@ def generate_fec(self):
suffix = '-NONOFFICIAL'
self.write({
- 'fec_data': base64_result,
# Filename = FECYYYYMMDD where YYYMMDD is the closing date
'filename': '%sFEC%s%s.csv' % (company_legal_data, end_date, suffix),
})
@@ -426,7 +458,7 @@ def generate_fec(self):
return {
'name': 'FEC',
'type': 'ir.actions.act_url',
- 'url': "web/content/?model=account.fr.fec&id=" + str(self.id) + "&filename_field=filename&field=fec_data&download=true&filename=" + self.filename,
+ 'url': f'/download/fec_file/{self.id}',
'target': 'self',
}
diff --git a/addons/l10n_it_edi/models/account_edi_format.py b/addons/l10n_it_edi/models/account_edi_format.py
index 2a13c63bf13ab..fe507d017e3d1 100644
--- a/addons/l10n_it_edi/models/account_edi_format.py
+++ b/addons/l10n_it_edi/models/account_edi_format.py
@@ -1215,7 +1215,7 @@ def _post_invoice_edi(self, invoices):
def _get_proxy_identification(self, company):
if self.code != 'fattura_pa':
- return super()._get_proxy_identification()
+ return super()._get_proxy_identification(company)
if not company.l10n_it_codice_fiscale:
raise UserError(_('Please fill your codice fiscale to be able to receive invoices from FatturaPA'))
diff --git a/addons/l10n_ma/__init__.py b/addons/l10n_ma/__init__.py
index 67dee8c60dbf8..be9f4fab00ae2 100644
--- a/addons/l10n_ma/__init__.py
+++ b/addons/l10n_ma/__init__.py
@@ -1,2 +1,3 @@
# -*- coding: utf-8 -*-
# Part of Odoo. See LICENSE file for full copyright and licensing details.
+from . import models
diff --git a/addons/l10n_ma/__manifest__.py b/addons/l10n_ma/__manifest__.py
index c792c5022e037..e996de567278b 100644
--- a/addons/l10n_ma/__manifest__.py
+++ b/addons/l10n_ma/__manifest__.py
@@ -24,6 +24,8 @@
'data/account_tax_report_data.xml',
'data/account_tax_data.xml',
'data/account_chart_template_data.xml',
+ 'views/res_partner_views.xml',
+ 'views/res_company_views.xml',
],
'license': 'LGPL-3',
}
diff --git a/addons/l10n_ma/models/__init__.py b/addons/l10n_ma/models/__init__.py
new file mode 100644
index 0000000000000..89926f8b3be44
--- /dev/null
+++ b/addons/l10n_ma/models/__init__.py
@@ -0,0 +1,2 @@
+from . import base_document_layout
+from . import res_partner
diff --git a/addons/l10n_ma/models/base_document_layout.py b/addons/l10n_ma/models/base_document_layout.py
new file mode 100644
index 0000000000000..c78f94a651001
--- /dev/null
+++ b/addons/l10n_ma/models/base_document_layout.py
@@ -0,0 +1,15 @@
+from markupsafe import Markup
+
+from odoo import api, models
+
+
+class BaseDocumentLayout(models.TransientModel):
+ _inherit = 'base.document.layout'
+
+ @api.model
+ def _default_company_details(self):
+ # OVERRIDE web/models/base_document_layout
+ company_details = super()._default_company_details()
+ if self.env.company.country_code == 'MA':
+ company_details += Markup('
ICE: %s') % self.env.company.company_registry
+ return company_details
diff --git a/addons/l10n_ma/models/res_partner.py b/addons/l10n_ma/models/res_partner.py
new file mode 100644
index 0000000000000..4aefc07a6ec31
--- /dev/null
+++ b/addons/l10n_ma/models/res_partner.py
@@ -0,0 +1,12 @@
+from odoo import api, models, _
+from odoo.exceptions import ValidationError
+
+
+class ResPartner(models.Model):
+ _inherit = ['res.partner']
+
+ @api.constrains('company_registry', 'country_id')
+ def _check_company_registry_ma(self):
+ for record in self:
+ if record.country_code == 'MA' and record.company_registry and (len(record.company_registry) != 15 or not record.company_registry.isdigit()):
+ raise ValidationError(_("ICE number should have exactly 15 digits."))
diff --git a/addons/l10n_ma/views/res_company_views.xml b/addons/l10n_ma/views/res_company_views.xml
new file mode 100644
index 0000000000000..5f334e819247d
--- /dev/null
+++ b/addons/l10n_ma/views/res_company_views.xml
@@ -0,0 +1,17 @@
+
+
+
+ res.company.form.inherit.l10n_ma
+ res.company
+
+
+
+ 1
+
+
+
+
+
+
+
+
diff --git a/addons/l10n_ma/views/res_partner_views.xml b/addons/l10n_ma/views/res_partner_views.xml
new file mode 100644
index 0000000000000..aacf0fcc9c2c2
--- /dev/null
+++ b/addons/l10n_ma/views/res_partner_views.xml
@@ -0,0 +1,13 @@
+
+
+
+ res.partner.form.inherit.l10n_ma
+ res.partner
+
+
+
+
+
+
+
+
diff --git a/addons/mail/models/mail_activity.py b/addons/mail/models/mail_activity.py
index 048f7ed748b8b..b027348317eba 100644
--- a/addons/mail/models/mail_activity.py
+++ b/addons/mail/models/mail_activity.py
@@ -567,6 +567,7 @@ def _action_done(self, feedback=False, attachment_ids=None):
for model, activity_data in self._classify_by_model().items():
records = self.env[model].browse(activity_data['record_ids'])
+ existing = records.exists() # in case record was cascade-deleted in DB, skipping unlink override
for record, activity in zip(records, activity_data['activities']):
# extract value to generate next activities
if activity.chaining_type == 'trigger':
@@ -574,22 +575,25 @@ def _action_done(self, feedback=False, attachment_ids=None):
next_activities_values.append(vals)
# post message on activity, before deleting it
- activity_message = record.message_post_with_view(
- 'mail.message_activity_done',
- values={
- 'activity': activity,
- 'feedback': feedback,
- 'display_assignee': activity.user_id != self.env.user
- },
- subtype_id=self.env['ir.model.data']._xmlid_to_res_id('mail.mt_activities'),
- mail_activity_type_id=activity.activity_type_id.id,
- attachment_ids=[Command.link(attachment_id) for attachment_id in attachment_ids] if attachment_ids else [],
- )
+ if record in existing:
+ activity_message = record.message_post_with_view(
+ 'mail.message_activity_done',
+ values={
+ 'activity': activity,
+ 'feedback': feedback,
+ 'display_assignee': activity.user_id != self.env.user
+ },
+ subtype_id=self.env['ir.model.data']._xmlid_to_res_id('mail.mt_activities'),
+ mail_activity_type_id=activity.activity_type_id.id,
+ attachment_ids=[Command.link(attachment_id) for attachment_id in attachment_ids] if attachment_ids else [],
+ )
+ else:
+ activity_message = self.env['mail.message']
# Moving the attachments in the message
# TODO: Fix void res_id on attachment when you create an activity with an image
# directly, see route /web_editor/attachment/add
- if activity_attachments[activity.id]:
+ if activity_attachments[activity.id] and activity_message:
message_attachments = self.env['ir.attachment'].browse(activity_attachments[activity.id])
if message_attachments:
message_attachments.write({
@@ -597,6 +601,9 @@ def _action_done(self, feedback=False, attachment_ids=None):
'res_model': activity_message._name,
})
activity_message.attachment_ids = message_attachments
+ # removing attachments linked to activity if record is missing
+ elif activity_attachments[activity.id]:
+ self.env['ir.attachment'].browse(activity_attachments[activity.id]).unlink()
messages += activity_message
next_activities = self.env['mail.activity']
diff --git a/addons/mail/models/mail_message.py b/addons/mail/models/mail_message.py
index 6fe334bed9aca..8d523cf1e3456 100644
--- a/addons/mail/models/mail_message.py
+++ b/addons/mail/models/mail_message.py
@@ -8,7 +8,7 @@
from collections import defaultdict
from odoo import _, api, Command, fields, models, modules, tools
-from odoo.exceptions import AccessError
+from odoo.exceptions import AccessError, MissingError
from odoo.osv import expression
from odoo.tools.misc import clean_context
@@ -563,6 +563,10 @@ def _generate_model_record_ids(msg_val, msg_ids):
def create(self, values_list):
tracking_values_list = []
for values in values_list:
+ if not (self.env.su or self.env.user.has_group('base.group_user')):
+ values.pop('author_id', None)
+ values.pop('email_from', None)
+ self = self.with_context({k: v for k, v in self.env.context.items() if k not in ['default_author_id', 'default_email_from']}) # noqa: PLW0642
if 'email_from' not in values: # needed to compute reply_to
_author_id, email_from = self.env['mail.thread']._message_compute_author(values.get('author_id'), email_from=None, raise_on_email=False)
values['email_from'] = email_from
@@ -664,6 +668,9 @@ def read(self, fields=None, load='_classic_read'):
return super(Message, self).read(fields=fields, load=load)
def write(self, vals):
+ if not (self.env.su or self.env.user.has_group('base.group_user')):
+ vals.pop('author_id', None)
+ vals.pop('email_from', None)
record_changed = 'model' in vals or 'res_id' in vals
if record_changed or 'message_type' in vals:
self._invalidate_documents()
@@ -846,6 +853,9 @@ def _message_format(self, fnames, format_reply=True, legacy=False):
for message in self:
if message.model and message.res_id:
thread_ids_by_model_name[message.model].add(message.res_id)
+ # filter missing records
+ for model_name, record_ids in thread_ids_by_model_name.items():
+ thread_ids_by_model_name[model_name] = self.env[model_name].browse(record_ids).exists().ids
for vals in vals_list:
message_sudo = self.browse(vals['id']).sudo().with_prefetch(self.ids)
@@ -857,7 +867,7 @@ def _message_format(self, fnames, format_reply=True, legacy=False):
'id': message_sudo.author_guest_id.id,
'name': message_sudo.author_guest_id.name,
} if message_sudo.author_guest_id else [('clear',)]
- if message_sudo.model and message_sudo.res_id:
+ if message_sudo.model and message_sudo.res_id and message_sudo.res_id in thread_ids_by_model_name[message_sudo.model]:
record_name = self.env[message_sudo.model].browse(message_sudo.res_id).sudo().with_prefetch(thread_ids_by_model_name[message_sudo.model]).display_name
else:
record_name = False
@@ -1011,7 +1021,9 @@ def _notify_message_notification_update(self):
try:
record.check_access_rights('read')
record.check_access_rule('read')
- except AccessError:
+ except (MissingError, AccessError):
+ # record has been removed from db without cascading notif -> avoid crash at least
+ # access error -> just skip
continue
else:
messages += message
diff --git a/addons/mail/models/mail_message_schedule.py b/addons/mail/models/mail_message_schedule.py
index e8fa207404ba5..beed2df8d3061 100644
--- a/addons/mail/models/mail_message_schedule.py
+++ b/addons/mail/models/mail_message_schedule.py
@@ -64,10 +64,14 @@ def _send_notifications(self, default_notify_kwargs=None):
for model, schedules in self._group_by_model().items():
if model:
records = self.env[model].browse(schedules.mapped('mail_message_id.res_id'))
+ existing = records.exists()
else:
records = [self.env['mail.thread']] * len(schedules)
+ existing = records
for record, schedule in zip(records, schedules):
+ if record not in existing:
+ continue
notify_kwargs = dict(default_notify_kwargs or {}, skip_existing=True)
try:
schedule_notify_kwargs = json.loads(schedule.notification_parameters)
diff --git a/addons/mail/models/mail_thread.py b/addons/mail/models/mail_thread.py
index 00dee035e72c3..7d5babc44f39b 100644
--- a/addons/mail/models/mail_thread.py
+++ b/addons/mail/models/mail_thread.py
@@ -1437,6 +1437,9 @@ def _message_parse_extract_payload(self, message, save_original=False):
if part.get_content_type() == 'binary/octet-stream':
_logger.warning("Message containing an unexpected Content-Type 'binary/octet-stream', assuming 'application/octet-stream'")
part.replace_header('Content-Type', 'application/octet-stream')
+ if part.get_content_type() == '*/*':
+ _logger.warning("Message containing an unexpected Content-Type '*/*', assuming 'application/octet-stream'")
+ part.replace_header('Content-Type', 'application/octet-stream')
if part.get_content_type() == 'multipart/alternative':
alternative = True
if part.get_content_type() == 'multipart/mixed':
diff --git a/addons/mail/models/res_partner.py b/addons/mail/models/res_partner.py
index ba4a4f85c0036..d5e874ad24f67 100644
--- a/addons/mail/models/res_partner.py
+++ b/addons/mail/models/res_partner.py
@@ -3,6 +3,7 @@
from odoo import _, api, fields, models, tools
from odoo.osv import expression
+from collections import defaultdict
class Partner(models.Model):
@@ -141,7 +142,23 @@ def _message_fetch_failed(self):
('mail_message_id.model', '!=', False),
('mail_message_id.res_id', '!=', 0),
], limit=100)
- return notifications.mail_message_id._message_notification_format()
+ found = defaultdict(list)
+ for message in notifications.mail_message_id:
+ found[message.model].append(message.res_id)
+ existing = {
+ model: set(self.env[model].browse(ids).exists().ids)
+ for model, ids in found.items()
+ }
+ valid = notifications.filtered(
+ lambda n: (
+ not n.mail_message_id.model or not n.mail_message_id.res_id or
+ n.mail_message_id.res_id in existing[n.mail_message_id.model]
+ )
+ )
+ lost = notifications - valid
+ if lost:
+ lost.sudo().unlink() # no unlink right except admin, ok to remove as lost anyway
+ return valid.mail_message_id._message_notification_format()
def _get_channels_as_member(self):
"""Returns the channels of the partner."""
diff --git a/addons/mail/tests/common.py b/addons/mail/tests/common.py
index 7362b41bc272b..dc7886c1706eb 100644
--- a/addons/mail/tests/common.py
+++ b/addons/mail/tests/common.py
@@ -1004,13 +1004,18 @@ def assertMailNotifications(self, messages, recipients_info):
mbody in message.body and message.message_type == mtype and
message.subtype_id == msubtype
))
+ debug_info = '\n'.join(
+ f'Msg: message_type {message.message_type}, subtype {message.subtype_id.name}, content {message.body}'
+ for message in messages
+ )
else:
message = self.env['mail.message'].sudo().search([
('body', 'ilike', mbody),
('message_type', '=', mtype),
('subtype_id', '=', msubtype.id)
], limit=1, order='id DESC')
- self.assertTrue(message, 'Mail: not found message (content: %s, message_type: %s, subtype: %s)' % (mbody, mtype, msubtype.name))
+ debug_info = ''
+ self.assertTrue(message, 'Mail: not found message (content: %s, message_type: %s, subtype: %s\n%s)' % (mbody, mtype, msubtype.name, debug_info))
# check message values
message_values = message_info.get('message_values', {})
diff --git a/addons/mail_plugin/controllers/authenticate.py b/addons/mail_plugin/controllers/authenticate.py
index 190ff2b720bc6..96b2c9664588b 100644
--- a/addons/mail_plugin/controllers/authenticate.py
+++ b/addons/mail_plugin/controllers/authenticate.py
@@ -53,6 +53,12 @@ def auth_confirm(self, scope, friendlyname, redirect, info=None, do=None, **kw):
updated_redirect = parsed_redirect.replace(query=werkzeug.urls.url_encode(params))
return request.redirect(updated_redirect.to_url(), local=False)
+ @http.route(['/mail_plugin/auth/check_version'], type='json', auth="none", cors="*",
+ methods=['POST', 'OPTIONS'])
+ def auth_check_version(self):
+ """Allow to know if the module is installed and which addin version is supported."""
+ return 1
+
# In this case, an exception will be thrown in case of preflight request if only POST is allowed.
@http.route(['/mail_client_extension/auth/access_token', '/mail_plugin/auth/access_token'], type='json', auth="none", cors="*",
methods=['POST', 'OPTIONS'])
diff --git a/addons/mass_mailing/static/tests/mass_mailing_favourite_filter_tests.js b/addons/mass_mailing/static/tests/mass_mailing_favourite_filter_tests.js
index ea65727313818..27e1b8cde16e0 100644
--- a/addons/mass_mailing/static/tests/mass_mailing_favourite_filter_tests.js
+++ b/addons/mass_mailing/static/tests/mass_mailing_favourite_filter_tests.js
@@ -237,7 +237,7 @@ QUnit.module('favorite filter widget', (hooks) => {
},
records: [
{id: 1, name: 'Azure Interior'},
- {id: 2, name: 'Deco Addict'},
+ {id: 2, name: 'Acme Corporation'},
{id: 3, name: 'Marc Demo'},
]
};
diff --git a/addons/mrp/__init__.py b/addons/mrp/__init__.py
index 4e423d2b936c7..eb561a39ed4d1 100644
--- a/addons/mrp/__init__.py
+++ b/addons/mrp/__init__.py
@@ -19,9 +19,11 @@ def _pre_init_mrp(cr):
cr.execute("""ALTER TABLE "stock_move" ADD COLUMN "is_done" bool;""")
cr.execute("""UPDATE stock_move
SET is_done=COALESCE(state in ('done', 'cancel'), FALSE);""")
- cr.execute("""ALTER TABLE "stock_move" ADD COLUMN "unit_factor" double precision;""")
- cr.execute("""UPDATE stock_move
- SET unit_factor=1;""")
+ cr.execute('ALTER TABLE stock_move ADD COLUMN IF NOT EXISTS unit_factor double precision DEFAULT 1')
+ # `stock.move.bom_line_id` is created in this module, so its default value will be NULL.
+ # `stock.move._is_manual_consumption` always returns False when there is no `bom_line_id`;
+ # therefore, we can just initialize `manual_consumption` to FALSE by default.
+ cr.execute('ALTER TABLE stock_move ADD COLUMN IF NOT EXISTS manual_consumption bool DEFAULT FALSE')
def _create_warehouse_data(cr, registry):
""" This hook is used to add a default manufacture_pull_id, manufacture
diff --git a/addons/mrp/security/mrp_security.xml b/addons/mrp/security/mrp_security.xml
index 1618df9034168..260836d0a6e3f 100644
--- a/addons/mrp/security/mrp_security.xml
+++ b/addons/mrp/security/mrp_security.xml
@@ -47,9 +47,6 @@
-
-
-
mrp_production multi-company
diff --git a/addons/payment_ogone/models/__init__.py b/addons/payment_ogone/models/__init__.py
index 08dfb8af3427c..6b48b38cae362 100644
--- a/addons/payment_ogone/models/__init__.py
+++ b/addons/payment_ogone/models/__init__.py
@@ -1,4 +1,5 @@
# Part of Odoo. See LICENSE file for full copyright and licensing details.
from . import payment_provider
+from . import payment_token
from . import payment_transaction
diff --git a/addons/payment_ogone/models/payment_provider.py b/addons/payment_ogone/models/payment_provider.py
index d5a971bfe5d1b..11e828fb0baac 100644
--- a/addons/payment_ogone/models/payment_provider.py
+++ b/addons/payment_ogone/models/payment_provider.py
@@ -44,6 +44,22 @@ def _compute_feature_support_fields(self):
'support_tokenization': True,
})
+ # === ACTION METHODS === #
+
+ def action_open_worldline_provider(self):
+ """Open the Worldline module form."""
+ worldline_module = self.env['ir.module.module'].search([
+ ('name', '=', 'payment_worldline'),
+ ])
+ return worldline_module and {
+ 'type': 'ir.actions.act_window',
+ 'res_model': 'ir.module.module',
+ 'res_id': worldline_module.id,
+ 'view_mode': 'form',
+ 'view_id': self.env.ref('base.module_form').id,
+ 'target': 'current',
+ }
+
#=== BUSINESS METHODS ===#
@api.model
diff --git a/addons/payment_ogone/models/payment_token.py b/addons/payment_ogone/models/payment_token.py
new file mode 100644
index 0000000000000..53bdcdaa5f302
--- /dev/null
+++ b/addons/payment_ogone/models/payment_token.py
@@ -0,0 +1,18 @@
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from odoo import models
+
+
+class PaymentToken(models.Model):
+ _inherit = 'payment.token'
+
+ def write(self, values):
+ """Override to prevent archiving of tokens during Ogone to Worldline migration.
+
+ :param dict values: The values to write on the record.
+ :return: None if the write is skipped, otherwise the result of the parent write.
+ :rtype: bool or None
+ """
+ if self.env.context.get('skip_token_archival') and 'active' in values:
+ values.pop('active')
+ return super().write(values)
diff --git a/addons/payment_ogone/views/payment_provider_views.xml b/addons/payment_ogone/views/payment_provider_views.xml
index a85182a2d3312..5ece6ae9880a8 100644
--- a/addons/payment_ogone/views/payment_provider_views.xml
+++ b/addons/payment_ogone/views/payment_provider_views.xml
@@ -11,7 +11,12 @@
role="alert"
attrs="{'invisible': [('code', '!=', 'ogone')]}">
This provider is deprecated.
- Consider disabling it and moving to Stripe.
+ Please install
+
+ the Worldline provider
+
+ as a drop-in replacement. Your data and payment tokens will be automatically
+ migrated from Ogone to Worldline.
Test ',
- message_type='comment',
- subject='Subject',
- subtype_xmlid='mail.mt_comment',
- scheduled_date=scheduled_datetime,
- )
- self.assertEqual(capt.records.call_at, scheduled_datetime,
- msg='Should have created a cron trigger for the scheduled sending')
+ for test_record in test_records:
+ messages += test_record.message_post(
+ body=f'Test on {test_record.name} ',
+ message_type='comment',
+ subject=f'Subject for {test_record.name}',
+ subtype_xmlid='mail.mt_comment',
+ scheduled_date=scheduled_datetime,
+ )
+ self.assertEqual(
+ capt.records.mapped('call_at'), [scheduled_datetime] * 3,
+ msg='Should have created a cron trigger / scheduled post')
self.assertFalse(self._new_mails)
self.assertFalse(self._mails)
- schedules = self.env['mail.message.schedule'].sudo().search([('mail_message_id', '=', msg.id)])
- self.assertEqual(len(schedules), 1, msg='Should have scheduled the message')
- self.assertEqual(schedules.scheduled_datetime, scheduled_datetime)
+ schedules = self.env['mail.message.schedule'].sudo().search([('mail_message_id', 'in', messages.ids)])
+ self.assertEqual(len(schedules), 3, msg='Should have one scheduled record / message to post')
+ self.assertEqual(schedules.mapped('scheduled_datetime'), [scheduled_datetime] * 3)
# trigger cron now -> should not sent as in future
with freeze_time(now):
self.env['mail.message.schedule'].sudo()._send_notifications_cron()
- self.assertTrue(schedules.exists(), msg='Should not have sent the message')
+ self.assertTrue(schedules.exists(), msg='Should not have sent the messages')
+
+ # In the mean time, some FK deletes the record where the message is
+ # # scheduled, skipping its unlink() override
+ test_record_names = test_records.mapped('name')
+ self.env.cr.execute(
+ f"DELETE FROM {test_records._table} WHERE id = %s", (deleted_record.id,)
+ )
+ test_records.invalidate_recordset()
# Send the scheduled message from the cron at right date
with freeze_time(now + timedelta(days=5)), self.mock_mail_gateway(mail_unlink_sent=True):
self.env['mail.message.schedule'].sudo()._send_notifications_cron()
- self.assertFalse(schedules.exists(), msg='Should have sent the message')
+ self.assertFalse(schedules.exists(), msg='Should have sent the messages')
+
# check notifications have been sent
- recipients_info = [{'content': 'Test ', 'notif': [
- {'partner': self.partner_admin, 'type': 'inbox'},
- {'partner': self.partner_1, 'type': 'email'},
- ]}]
- self.assertMailNotifications(msg, recipients_info)
+ for msg, test_record, test_record_name in zip(messages, test_records, test_record_names):
+ with self.subTest(test_record_name=test_record_name):
+ if test_record != deleted_record:
+ # unlinked record -> skip notification
+ self.assertMailNotifications(msg, [{
+ 'content': f'Test on {test_record_name}',
+ 'email_values': {
+ 'subject': f'Subject for {test_record_name}',
+ },
+ 'notif': [
+ {'partner': self.partner_admin, 'type': 'inbox'},
+ {'partner': self.partner_1, 'type': 'email'},
+ ],
+ }])
+ self.assertEqual(len(self._new_mails), len(remaining_records), 'Should have skipped unlinked record')
# manually create a new schedule date, resend it -> should not crash (aka
# don't create duplicate notifications, ...)
@@ -932,7 +961,7 @@ def test_message_post_schedule(self):
with freeze_time(now), \
self.mock_mail_gateway(mail_unlink_sent=False), \
self.capture_triggers(cron_id) as capt:
- msg = test_record.message_post(
+ msg = test_records[0].message_post(
body='Test ',
message_type='comment',
subject='Subject',
diff --git a/addons/test_mail/tests/test_performance.py b/addons/test_mail/tests/test_performance.py
index f892f7f1730cd..bc7de09e29b9a 100644
--- a/addons/test_mail/tests/test_performance.py
+++ b/addons/test_mail/tests/test_performance.py
@@ -272,7 +272,7 @@ def test_adv_activity_full(self):
# voip module read activity_type during create leading to one less query in enterprise on action_feedback
_category = activity.activity_type_id.category
- with self.assertQueryCount(admin=15, employee=15):
+ with self.assertQueryCount(admin=16, employee=16):
activity.action_feedback(feedback='Zizisse Done !')
@warmup
@@ -307,7 +307,7 @@ def test_adv_activity_mixin(self):
record.write({'name': 'Dupe write'})
- with self.assertQueryCount(admin=17, employee=17):
+ with self.assertQueryCount(admin=18, employee=18):
record.action_close('Dupe feedback')
self.assertEqual(record.activity_ids, self.env['mail.activity'])
@@ -333,7 +333,7 @@ def test_adv_activity_mixin_w_attachments(self):
record.write({'name': 'Dupe write'})
- with self.assertQueryCount(admin=21, employee=21): # com+tm 20/20
+ with self.assertQueryCount(admin=22, employee=22): # com+tm 20/20
record.action_close('Dupe feedback', attachment_ids=attachments.ids)
# notifications
@@ -404,7 +404,7 @@ def test_mail_composer_form_attachments(self):
composer_form.attachment_ids.add(attachment)
composer = composer_form.save()
- with self.assertQueryCount(admin=54, employee=54): # tm+com 47/47
+ with self.assertQueryCount(admin=55, employee=55): # tm+com 47/47
composer._action_send_mail()
# notifications
@@ -525,7 +525,7 @@ def test_mail_composer_w_template_form(self):
)
composer = composer_form.save()
- with self.assertQueryCount(admin=50, employee=50):
+ with self.assertQueryCount(admin=51, employee=51):
composer._action_send_mail()
# notifications
@@ -555,7 +555,7 @@ def test_mail_composer_w_template_form_attachments(self):
)
composer = composer_form.save()
- with self.assertQueryCount(admin=71, employee=71):
+ with self.assertQueryCount(admin=72, employee=72):
composer._action_send_mail()
# notifications
@@ -585,7 +585,7 @@ def test_message_assignation_email(self):
@warmup
def test_message_assignation_inbox(self):
record = self.env['mail.test.track'].create({'name': 'Test'})
- with self.assertQueryCount(admin=20, employee=20):
+ with self.assertQueryCount(admin=21, employee=21):
record.write({
'user_id': self.user_test.id,
})
@@ -635,7 +635,7 @@ def test_message_log_with_view(self):
def test_message_log_with_post(self):
record = self.env['mail.test.simple'].create({'name': 'Test'})
- with self.assertQueryCount(admin=7, employee=7):
+ with self.assertQueryCount(admin=8, employee=8):
record.message_post(
body='Test message_post as log ',
subtype_xmlid='mail.mt_note',
@@ -646,7 +646,7 @@ def test_message_log_with_post(self):
def test_message_post_no_notification(self):
record = self.env['mail.test.simple'].create({'name': 'Test'})
- with self.assertQueryCount(admin=7, employee=7):
+ with self.assertQueryCount(admin=8, employee=8):
record.message_post(
body='Test Post Performances basic ',
partner_ids=[],
@@ -671,7 +671,7 @@ def test_message_post_one_email_notification(self):
def test_message_post_one_inbox_notification(self):
record = self.env['mail.test.simple'].create({'name': 'Test'})
- with self.assertQueryCount(admin=18, employee=18):
+ with self.assertQueryCount(admin=20, employee=20):
record.message_post(
body='Test Post Performances with an inbox ping ',
partner_ids=self.user_test.partner_id.ids,
@@ -902,7 +902,7 @@ def test_complex_message_post_view(self):
}).create({})
composer._onchange_template_id_wrapper()
- with self.assertQueryCount(admin=141, employee=141):
+ with self.assertQueryCount(admin=151, employee=151):
messages_as_sudo = test_records.message_post_with_view(
'test_mail.mail_template_simple_test',
values={'partner': self.user_test.partner_id},
@@ -1204,7 +1204,7 @@ def test_message_format(self):
]
}])
- with self.assertQueryCount(employee=6):
+ with self.assertQueryCount(employee=7):
res = messages.message_format()
self.assertEqual(len(res), 2)
for message in res:
@@ -1213,7 +1213,7 @@ def test_message_format(self):
self.env.flush_all()
self.env.invalidate_all()
- with self.assertQueryCount(employee=19):
+ with self.assertQueryCount(employee=20):
res = messages.message_format()
self.assertEqual(len(res), 2)
for message in res:
@@ -1234,14 +1234,14 @@ def test_message_format_group_thread_name_by_model(self):
'res_id': record.id
} for record in records])
- with self.assertQueryCount(employee=5):
+ with self.assertQueryCount(employee=7):
res = messages.message_format()
self.assertEqual(len(res), 6)
self.env.flush_all()
self.env.invalidate_all()
- with self.assertQueryCount(employee=14):
+ with self.assertQueryCount(employee=16):
res = messages.message_format()
self.assertEqual(len(res), 6)
diff --git a/addons/test_mail_full/tests/test_mail_performance.py b/addons/test_mail_full/tests/test_mail_performance.py
index 0d37eb0254822..82ad20615ebde 100644
--- a/addons/test_mail_full/tests/test_mail_performance.py
+++ b/addons/test_mail_full/tests/test_mail_performance.py
@@ -81,7 +81,7 @@ def test_message_post_w_followers(self):
record_ticket = self.env['mail.test.ticket.mc'].browse(self.record_ticket.ids)
attachments = self.env['ir.attachment'].create(self.test_attachments_vals)
- with self.assertQueryCount(employee=91): # tmf: 60
+ with self.assertQueryCount(employee=92): # tmf: 60
new_message = record_ticket.message_post(
attachment_ids=attachments.ids,
body='Test Content ',
diff --git a/addons/test_mail_full/tests/test_rating.py b/addons/test_mail_full/tests/test_rating.py
index 057dc73ebb7f0..55206bcf27e29 100644
--- a/addons/test_mail_full/tests/test_rating.py
+++ b/addons/test_mail_full/tests/test_rating.py
@@ -141,7 +141,7 @@ def test_rating_last_value_perfs(self):
partners = self.env['res.partner'].sudo().create([
{'name': 'Jean-Luc %s' % (idx), 'email': 'jean-luc-%s@opoo.com' % (idx)} for idx in range(RECORD_COUNT)])
- with self.assertQueryCount(employee=1516): # tmf 1516 / com 5510
+ with self.assertQueryCount(employee=1614): # tmf 1614
record_ratings = self.env['mail.test.rating'].create([{
'customer_id': partners[idx].id,
'name': 'Test Rating',
@@ -149,13 +149,13 @@ def test_rating_last_value_perfs(self):
} for idx in range(RECORD_COUNT)])
self.flush_tracking()
- with self.assertQueryCount(employee=2004): # tmf 2004
+ with self.assertQueryCount(employee=2104): # tmf 2104
for record in record_ratings:
access_token = record._rating_get_access_token()
record.rating_apply(1, token=access_token)
self.flush_tracking()
- with self.assertQueryCount(employee=2003): # tmf 2003
+ with self.assertQueryCount(employee=2103): # tmf 2103
for record in record_ratings:
access_token = record._rating_get_access_token()
record.rating_apply(5, token=access_token)
diff --git a/addons/web/controllers/database.py b/addons/web/controllers/database.py
index 7168a5d2eebdf..ddafd973e8fd4 100644
--- a/addons/web/controllers/database.py
+++ b/addons/web/controllers/database.py
@@ -126,6 +126,8 @@ def backup(self, master_pwd, name, backup_format='zip'):
dispatch_rpc('db', 'change_admin_password', ["admin", master_pwd])
try:
odoo.service.db.check_super(master_pwd)
+ if name not in http.db_list():
+ raise Exception("Database %r is not known" % name)
ts = datetime.datetime.utcnow().strftime("%Y-%m-%d_%H-%M-%S")
filename = "%s_%s.%s" % (name, ts, backup_format)
headers = [
diff --git a/addons/web/controllers/pivot.py b/addons/web/controllers/pivot.py
index 331daee43487b..1404afaf97046 100644
--- a/addons/web/controllers/pivot.py
+++ b/addons/web/controllers/pivot.py
@@ -30,8 +30,8 @@ def export_xlsx(self, data, **kw):
header_plain = workbook.add_format({'pattern': 1, 'bg_color': '#AAAAAA'})
bold = workbook.add_format({'bold': True})
- measure_count = jdata['measure_count']
- origin_count = jdata['origin_count']
+ measure_count = min(jdata['measure_count'], 100000)
+ origin_count = min(jdata['origin_count'], 100000)
# Step 1: writing col group headers
col_group_headers = jdata['col_group_headers']
@@ -50,11 +50,12 @@ def export_xlsx(self, data, **kw):
if cell['height'] > 1:
carry.append({'x': x, 'height': cell['height'] - 1})
x = x + measure_count * (2 * origin_count - 1)
- for j in range(header['width']):
+ width = min(header['width'], 100000)
+ for j in range(width):
worksheet.write(y, x + j, header['title'] if j == 0 else '', header_plain)
if header['height'] > 1:
carry.append({'x': x, 'height': header['height'] - 1})
- x = x + header['width']
+ x = x + width
while (carry and carry[0]['x'] == x):
cell = carry.popleft()
for j in range(measure_count * (2 * origin_count - 1)):
diff --git a/addons/web/static/src/views/fields/many2many_binary/many2many_binary_field.js b/addons/web/static/src/views/fields/many2many_binary/many2many_binary_field.js
index 0397ee08d18e1..21a68e2cbb298 100644
--- a/addons/web/static/src/views/fields/many2many_binary/many2many_binary_field.js
+++ b/addons/web/static/src/views/fields/many2many_binary/many2many_binary_field.js
@@ -16,7 +16,18 @@ export class Many2ManyBinaryField extends Component {
}
get files() {
- return this.props.value.records.map((record) => record.data);
+ const attachments = this.props.value.records.map((record) => record.data);
+ const attachmentsNotSupported = this.props.record.data[this.props.attachmentsNotSupportedField]
+
+ if (this.props.record.resModel == 'account.invoice.send' && attachmentsNotSupported) {
+ for (const attachment of attachments) {
+ if (attachment.id && attachment.id in attachmentsNotSupported) {
+ attachment.tooltip = attachmentsNotSupported[attachment.id];
+ }
+ }
+ }
+
+ return attachments;
}
getUrl(id) {
@@ -52,6 +63,7 @@ Many2ManyBinaryField.components = {
Many2ManyBinaryField.props = {
...standardFieldProps,
acceptedFileExtensions: { type: String, optional: true },
+ attachmentsNotSupportedField: { type: String, optional: true },
className: { type: String, optional: true },
uploadText: { type: String, optional: true },
};
@@ -65,6 +77,7 @@ Many2ManyBinaryField.isEmpty = () => false;
Many2ManyBinaryField.extractProps = ({ attrs, field }) => {
return {
acceptedFileExtensions: attrs.options.accepted_file_extensions,
+ attachmentsNotSupportedField: attrs.options.attachments_not_supported_field,
className: attrs.class,
uploadText: field.string,
};
diff --git a/addons/web/static/src/views/fields/many2many_binary/many2many_binary_field.xml b/addons/web/static/src/views/fields/many2many_binary/many2many_binary_field.xml
index c92e670dfb672..1567acb77e2b4 100644
--- a/addons/web/static/src/views/fields/many2many_binary/many2many_binary_field.xml
+++ b/addons/web/static/src/views/fields/many2many_binary/many2many_binary_field.xml
@@ -26,7 +26,7 @@
-
+
diff --git a/addons/web/static/src/webclient/barcode/crop_overlay.js b/addons/web/static/src/webclient/barcode/crop_overlay.js
index 7b38ac4e162d9..5bd4c93b13f45 100644
--- a/addons/web/static/src/webclient/barcode/crop_overlay.js
+++ b/addons/web/static/src/webclient/barcode/crop_overlay.js
@@ -2,6 +2,7 @@
import { Component, useRef, onPatched } from "@odoo/owl";
import { browser } from "@web/core/browser/browser";
+import { isIOS } from "@web/core/browser/feature_detection";
import { clamp } from "@web/core/utils/numbers";
export class CropOverlay extends Component {
@@ -17,6 +18,7 @@ export class CropOverlay extends Component {
onPatched(() => {
this.setupCropRect();
});
+ this.isIOS = isIOS();
}
setupCropRect() {
diff --git a/addons/web/static/src/webclient/barcode/crop_overlay.scss b/addons/web/static/src/webclient/barcode/crop_overlay.scss
index 132ba6e7a73cd..a6d83ef103fec 100644
--- a/addons/web/static/src/webclient/barcode/crop_overlay.scss
+++ b/addons/web/static/src/webclient/barcode/crop_overlay.scss
@@ -6,13 +6,16 @@
grid-column: 1 / -1;
}
- .o_crop_overlay {
+ .o_crop_overlay::after {
+ content: '';
+ display: block;
+ }
+
+ .o_crop_overlay:not(.o_crop_overlay_ios) {
background-color: RGB(0 0 0 / 0.75);
mix-blend-mode: darken;
&::after {
- content: '';
- display: block;
height: 100%;
width: 100%;
clip-path: inset(var(--o-crop-y, 0px) var(--o-crop-x, 0px));
@@ -20,6 +23,16 @@
}
}
+ .o_crop_overlay.o_crop_overlay_ios {
+ position: relative;
+
+ &::after {
+ position: absolute;
+ inset: var(--o-crop-y, 0px) var(--o-crop-x, 0px);
+ border: 1px solid black;
+ }
+ }
+
.o_crop_icon {
--o-crop-icon-width: 20px;
--o-crop-icon-height: 20px;
diff --git a/addons/web/static/src/webclient/barcode/crop_overlay.xml b/addons/web/static/src/webclient/barcode/crop_overlay.xml
index 60001068eef44..907954b104e4a 100644
--- a/addons/web/static/src/webclient/barcode/crop_overlay.xml
+++ b/addons/web/static/src/webclient/barcode/crop_overlay.xml
@@ -9,7 +9,7 @@
>
-
+
diff --git a/addons/web/static/tests/legacy/control_panel/control_panel_tests.js b/addons/web/static/tests/legacy/control_panel/control_panel_tests.js
index 5b23b59774304..c1b3e213376de 100644
--- a/addons/web/static/tests/legacy/control_panel/control_panel_tests.js
+++ b/addons/web/static/tests/legacy/control_panel/control_panel_tests.js
@@ -55,7 +55,7 @@ odoo.define('web.control_panel_tests', function (require) {
env: {
session: {
async rpc() {
- return [[10, "Deco Addict"]];
+ return [[10, "Acme Corporation"]];
},
},
},
@@ -65,8 +65,8 @@ odoo.define('web.control_panel_tests', function (require) {
assert.deepEqual(
cpHelpers.getFacetTexts(controlPanel).map(t => t.replace(/\s/g, "")),
[
- "BarDecoAddict",
- "BarOpDecoAddict",
+ "BarAcmeCorporation",
+ "BarOpAcmeCorporation",
"Foofoo",
"FooOpfoo_op",
"SelecRed"
diff --git a/addons/web/views/report_templates.xml b/addons/web/views/report_templates.xml
index 40e3d13fae1c7..7d223e4ece8e6 100644
--- a/addons/web/views/report_templates.xml
+++ b/addons/web/views/report_templates.xml
@@ -113,7 +113,7 @@
- Deco Addict
+ Acme Corporation
diff --git a/addons/web_editor/static/src/js/editor/odoo-editor/src/OdooEditor.js b/addons/web_editor/static/src/js/editor/odoo-editor/src/OdooEditor.js
index 8898148786224..eca11f48b9c79 100644
--- a/addons/web_editor/static/src/js/editor/odoo-editor/src/OdooEditor.js
+++ b/addons/web_editor/static/src/js/editor/odoo-editor/src/OdooEditor.js
@@ -3552,7 +3552,23 @@ export class OdooEditor extends EventTarget {
this._compositionStep();
this.historyRollback();
ev.preventDefault();
- getDeepRange(this.editable, { select: true, correctTripleClick: true });
+ const deepRange = getDeepRange(this.editable, { correctTripleClick: true });
+ const startEl = deepRange && closestElement(deepRange.startContainer);
+ const endEl = deepRange && closestElement(deepRange.endContainer);
+ if (startEl && endEl && startEl.isContentEditable && endEl.isContentEditable) {
+ const { startContainer, startOffset, endContainer, endOffset } = deepRange;
+ const direction = getCursorDirection(
+ newSelection.anchorNode,
+ newSelection.anchorOffset,
+ newSelection.focusNode,
+ newSelection.focusOffset
+ );
+ if (direction === DIRECTIONS.RIGHT) {
+ setSelection(startContainer, startOffset, endContainer, endOffset);
+ } else {
+ setSelection(endContainer, endOffset, startContainer, startOffset);
+ }
+ }
// To remove only the anchor cell's content when multiple table cells are selected on Enter,
// we need to change the selection to focus only on the anchor cell. This can't be done in `oEnter`
// because `deleteRange` responsible for removing content, execute before `oEnter` in `_applyRawCommand`.
diff --git a/addons/web_editor/static/src/js/editor/odoo-editor/src/commands/deleteBackward.js b/addons/web_editor/static/src/js/editor/odoo-editor/src/commands/deleteBackward.js
index 78cd048316479..b3a945184ad6a 100644
--- a/addons/web_editor/static/src/js/editor/odoo-editor/src/commands/deleteBackward.js
+++ b/addons/web_editor/static/src/js/editor/odoo-editor/src/commands/deleteBackward.js
@@ -63,7 +63,9 @@ HTMLElement.prototype.oDeleteBackward = function (offset, alreadyMoved = false,
if (
isDeletable(leftNode)
) {
+ const parentEl = leftNode.parentElement;
leftNode.remove();
+ fillEmpty(parentEl);
return;
}
if (!isBlock(leftNode) || isVisibleEmpty(leftNode)) {
diff --git a/addons/web_editor/static/src/js/editor/odoo-editor/src/commands/deleteForward.js b/addons/web_editor/static/src/js/editor/odoo-editor/src/commands/deleteForward.js
index a50634a4228bb..ca37db7229e3b 100644
--- a/addons/web_editor/static/src/js/editor/odoo-editor/src/commands/deleteForward.js
+++ b/addons/web_editor/static/src/js/editor/odoo-editor/src/commands/deleteForward.js
@@ -146,12 +146,14 @@ HTMLElement.prototype.oDeleteForward = function (offset) {
if (firstLeafNode && (isFontAwesome(firstLeafNode) || isNotEditableNode(firstLeafNode))) {
const nextSibling = firstLeafNode.nextSibling;
const nextSiblingText = nextSibling ? nextSibling.textContent : '';
+ const parentEl = firstLeafNode.parentElement;
firstLeafNode.remove();
if (isEditorTab(firstLeafNode) && nextSiblingText[0] === '\u200B') {
// When deleting an editor tab, we need to ensure it's related ZWS
// il deleted as well.
nextSibling.textContent = nextSiblingText.replace('\u200B', '');
}
+ fillEmpty(parentEl);
return;
}
if (
diff --git a/addons/web_editor/static/src/js/editor/odoo-editor/test/spec/editor.test.js b/addons/web_editor/static/src/js/editor/odoo-editor/test/spec/editor.test.js
index 14d6e9c7e63f6..9aa1d986995c5 100644
--- a/addons/web_editor/static/src/js/editor/odoo-editor/test/spec/editor.test.js
+++ b/addons/web_editor/static/src/js/editor/odoo-editor/test/spec/editor.test.js
@@ -1151,6 +1151,13 @@ X[]
contentAfter: unformat(` a[]d `),
});
});
+ it('should fill empty block with a ', async () => {
+ await testEditor(BasicEditor, {
+ contentBefore: ' [] ',
+ stepFunction: deleteForward,
+ contentAfter: ' []
',
+ });
+ });
});
});
describe('Selection not collapsed', () => {
@@ -2791,6 +2798,11 @@ X[]
stepFunction: deleteBackward,
contentAfter: ' []
',
});
+ await testEditor(BasicEditor, {
+ contentBefore: ' [] ',
+ stepFunction: deleteBackward,
+ contentAfter: ' []
',
+ });
});
it('should merge a paragraph with text into a paragraph with text removing spaces', async () => {
await testEditor(BasicEditor, {
@@ -3686,6 +3698,15 @@ X[]
contentAfter: ' abc []
',
});
});
+ it('inserts an empty paragraph when Enter is pressed before a non-editable element', async () => {
+ await testEditor(BasicEditor, {
+ contentBefore: ' [] ',
+ stepFunction: async editor => {
+ await triggerEvent(editor.editable, 'input', { data: 'Enter', inputType: 'insertParagraph' });
+ },
+ contentAfter: '
[] ',
+ });
+ });
});
describe('Pre', () => {
it('should insert a line break within the pre', async () => {
@@ -4342,6 +4363,15 @@ X[]
contentAfter: ' abc
[]
',
});
});
+ it('inserts a when a line break is inserted before a non-editable element', async () => {
+ await testEditor(BasicEditor, {
+ contentBefore: ' [] ',
+ stepFunction: async editor => {
+ await triggerEvent(editor.editable, 'input', { data: 'Enter', inputType: 'insertLineBreak' });
+ },
+ contentAfter: '
[]
',
+ });
+ });
});
describe('Consecutive', () => {
it('should insert two at the beggining of an empty paragraph', async () => {
diff --git a/addons/web_editor/static/src/js/wysiwyg/widgets/link_popover_widget.js b/addons/web_editor/static/src/js/wysiwyg/widgets/link_popover_widget.js
index dd28b24c964ed..def4a63b560b4 100644
--- a/addons/web_editor/static/src/js/wysiwyg/widgets/link_popover_widget.js
+++ b/addons/web_editor/static/src/js/wysiwyg/widgets/link_popover_widget.js
@@ -24,6 +24,7 @@ const LinkPopoverWidget = Widget.extend({
this.$target = $(target);
this.container = this.options.container || this.target.ownerDocument.body;
this.href = this.$target.attr('href'); // for template
+ this.isDocument = !!$(target).attr("data-mimetype");
this._dp = new DropPrevious();
},
/**
diff --git a/addons/web_editor/static/src/js/wysiwyg/wysiwyg.js b/addons/web_editor/static/src/js/wysiwyg/wysiwyg.js
index 31e9c917ff54a..b61cd025b309b 100644
--- a/addons/web_editor/static/src/js/wysiwyg/wysiwyg.js
+++ b/addons/web_editor/static/src/js/wysiwyg/wysiwyg.js
@@ -432,11 +432,10 @@ const Wysiwyg = Widget.extend({
if ($target.is(this.customizableLinksSelector)
&& $target.is('a')
- && $target[0].isContentEditable
+ && ($target[0].isContentEditable || $target.attr("data-mimetype"))
&& !$target.attr('data-oe-model')
&& !$target.find('> [data-oe-model]').length
- && !$target[0].closest('.o_extra_menu_items')
- && $target[0].isContentEditable) {
+ && !$target[0].closest('.o_extra_menu_items')) {
if (ev.ctrlKey || ev.metaKey) {
window.open($target[0].href, '_blank');
}
@@ -1967,23 +1966,28 @@ const Wysiwyg = Widget.extend({
// Unselect all media.
this.$editable.find('.o_we_selected_image').removeClass('o_we_selected_image');
if (isInMedia) {
- this.odooEditor.automaticStepSkipStack();
- // Select the media in the DOM.
- const selection = this.odooEditor.document.getSelection();
- const range = this.odooEditor.document.createRange();
- range.selectNode(this.lastMediaClicked);
- selection.removeAllRanges();
- selection.addRange(range);
- // Toggle the 'active' class on the active image tool buttons.
- for (const button of this.toolbar.$el.find('#image-shape div, #fa-spin')) {
- button.classList.toggle('active', $(e.target).hasClass(button.id));
- }
- for (const button of this.toolbar.$el.find('#image-width div')) {
- button.classList.toggle('active', e.target.style.width === button.id);
+ // Hide the toolbar if the media has a data-mimetype (e.g. attachment).
+ if ($target.attr("data-mimetype")) {
+ this.odooEditor.toolbarHide();
+ } else {
+ this.odooEditor.automaticStepSkipStack();
+ // Select the media in the DOM.
+ const selection = this.odooEditor.document.getSelection();
+ const range = this.odooEditor.document.createRange();
+ range.selectNode(this.lastMediaClicked);
+ selection.removeAllRanges();
+ selection.addRange(range);
+ // Toggle the 'active' class on the active image tool buttons.
+ for (const button of this.toolbar.$el.find('#image-shape div, #fa-spin')) {
+ button.classList.toggle('active', $(e.target).hasClass(button.id));
+ }
+ for (const button of this.toolbar.$el.find('#image-width div')) {
+ button.classList.toggle('active', e.target.style.width === button.id);
+ }
+ this.toolbar.el.querySelector('#image-transform').classList.toggle('active', e.target.matches('[style*="transform"]'));
+ this._updateMediaJustifyButton();
+ this._updateFaResizeButtons();
}
- this.toolbar.el.querySelector('#image-transform').classList.toggle('active', e.target.matches('[style*="transform"]'));
- this._updateMediaJustifyButton();
- this._updateFaResizeButtons();
}
if (isInMedia) {
// Handle the media/link's tooltip.
@@ -2518,7 +2522,7 @@ const Wysiwyg = Widget.extend({
if (
isVisible &&
(
- (this.options.autohideToolbar && !this.odooEditor.document.getSelection().isCollapsed) ||
+ (this.options.autohideToolbar && !this.odooEditor.document.getSelection().isCollapsed && !this.linkPopover.$target.attr("data-mimetype")) ||
!selectionInLink
)
) {
diff --git a/addons/web_editor/static/src/xml/wysiwyg.xml b/addons/web_editor/static/src/xml/wysiwyg.xml
index 1cf6ac024e55e..325a7e59c5e1e 100644
--- a/addons/web_editor/static/src/xml/wysiwyg.xml
+++ b/addons/web_editor/static/src/xml/wysiwyg.xml
@@ -173,14 +173,14 @@
-
+
-
+
- Deco Addict designs, develops, integrates and supports HR and Supply
+ Acme Corporation designs, develops, integrates and supports HR and Supply
Chain processes in order to make our customers more productive,
responsive and profitable.
@@ -17,7 +17,7 @@
installed IT software into account. That is why Idealis
Consulting delivers excellence in HR and SC Management.
- Deco Addict integrates ERP for Global Companies and supports PME
+ Acme Corporation integrates ERP for Global Companies and supports PME
with Open Sources software to manage their businesses. Our
consultants are experts in the following areas:
@@ -62,10 +62,10 @@
- Deco Addict designs, develops, integrates and supports HR and Supply Chain processes in order to make our customers more productive, responsive and profitable.
+ Acme Corporation designs, develops, integrates and supports HR and Supply Chain processes in order to make our customers more productive, responsive and profitable.
- Deco Addict designs, develops, integrates and supports HR and Supply
+ Acme Corporation designs, develops, integrates and supports HR and Supply
Chain processes in order to make our customers more productive,
responsive and profitable.
@@ -75,7 +75,7 @@
installed IT software into account. That is why Idealis
Consulting delivers excellence in HR and SC Management.
- Deco Addict integrates ERP for Global Companies and supports PME
+ Acme Corporation integrates ERP for Global Companies and supports PME
with Open Sources software to manage their businesses. Our
consultants are experts in the following areas:
diff --git a/addons/website_event/data/res_partner_demo.xml b/addons/website_event/data/res_partner_demo.xml
index c6bae7b287e1f..54ff9e77de941 100644
--- a/addons/website_event/data/res_partner_demo.xml
+++ b/addons/website_event/data/res_partner_demo.xml
@@ -23,7 +23,7 @@
True
- Deco Addict brings honesty and seriousness to wood industry while helping customers deal with trees, flowers and fungi.
+ Acme Corporation brings honesty and seriousness to wood industry while helping customers deal with trees, flowers and fungi.
@@ -276,10 +276,10 @@
-
+
True
- Douglas Fletcher is a mighty functional consultant at Deco Addict
+ Douglas Fletcher is a mighty functional consultant at Acme Corporation
Douglas Fletcher works in IT sector since 10 years. He is known
@@ -289,7 +289,7 @@
True
- Floyd Steward is a mighty analyst at Deco Addict.
+ Floyd Steward is a mighty analyst at Acme Corporation.
Floyd Steward works in IT sector since 10 years. He is known
@@ -299,7 +299,7 @@
True
- Addison Olson is a mighty sales representative at Deco Addict.
+ Addison Olson is a mighty sales representative at Acme Corporation.
Addison Olson works in IT sector since 10 years. He is known
diff --git a/addons/website_event/static/src/js/website_event.js b/addons/website_event/static/src/js/website_event.js
index bfd6f75ad85bd..35e85c4d4f722 100644
--- a/addons/website_event/static/src/js/website_event.js
+++ b/addons/website_event/static/src/js/website_event.js
@@ -71,18 +71,7 @@ var EventRegistrationForm = Widget.extend({
$button.attr('disabled', true);
var action = $form.data('action') || $form.attr('action');
var self = this;
- return ajax.jsonRpc(action, 'call', post).then(async function (modal) {
- const tokenObj = await self._recaptcha.getToken('website_event_registration');
- if (tokenObj.error) {
- self.displayNotification({
- type: 'danger',
- title: _t('Error'),
- message: tokenObj.error,
- sticky: true,
- });
- $button.prop('disabled', false);
- return false;
- }
+ return ajax.jsonRpc(action, 'call', post).then(function (modal) {
var $modal = $(modal);
$modal.find('.modal-body > div').removeClass('container'); // retrocompatibility - REMOVE ME in master / saas-19
$modal.appendTo(document.body);
@@ -96,12 +85,29 @@ var EventRegistrationForm = Widget.extend({
$modal.on('click', '.btn-close', function () {
$button.prop('disabled', false);
});
- $modal.on('submit', 'form', function (ev) {
+ $modal.on('submit', 'form', async function (ev) {
+ if (!self._recaptcha._publicKey) {
+ return;
+ }
+
+ ev.preventDefault();
+ const tokenObj = await self._recaptcha.getToken("website_event_registration");
+ if (tokenObj.error) {
+ $button.prop('disabled', false);
+ self.displayNotification({
+ type: 'danger',
+ title: _t('Error'),
+ message: tokenObj.error,
+ sticky: true,
+ });
+ return;
+ }
const tokenInput = document.createElement('input');
tokenInput.setAttribute('name', 'recaptcha_token_response');
tokenInput.setAttribute('type', 'hidden');
tokenInput.setAttribute('value', tokenObj.token);
ev.currentTarget.appendChild(tokenInput);
+ ev.currentTarget.submit();
})
});
}
diff --git a/addons/website_event_exhibitor/data/event_sponsor_demo.xml b/addons/website_event_exhibitor/data/event_sponsor_demo.xml
index 6bb840446eb07..5d0b84a66827b 100644
--- a/addons/website_event_exhibitor/data/event_sponsor_demo.xml
+++ b/addons/website_event_exhibitor/data/event_sponsor_demo.xml
@@ -37,7 +37,7 @@
- http://www.deco-addict.example.com
+ http://www.acme-corp.example.com
You won't believe this sponsor
sponsor
diff --git a/addons/website_sale_loyalty/tests/__init__.py b/addons/website_sale_loyalty/tests/__init__.py
index eeb2997e6de5e..656ff20aa930f 100644
--- a/addons/website_sale_loyalty/tests/__init__.py
+++ b/addons/website_sale_loyalty/tests/__init__.py
@@ -1,6 +1,7 @@
# Part of Odoo. See LICENSE file for full copyright and licensing details.
from . import test_apply_pending_coupon
+from . import test_concurrent_promo_code
from . import test_free_product_reward
from . import test_sale_coupon_multiwebsite
from . import test_shop_loyalty_payment
diff --git a/addons/website_sale_loyalty/tests/test_concurrent_promo_code.py b/addons/website_sale_loyalty/tests/test_concurrent_promo_code.py
new file mode 100644
index 0000000000000..3be37736fd7d1
--- /dev/null
+++ b/addons/website_sale_loyalty/tests/test_concurrent_promo_code.py
@@ -0,0 +1,132 @@
+import threading
+import time
+from concurrent.futures import ThreadPoolExecutor
+from psycopg2 import OperationalError
+
+from odoo import SUPERUSER_ID, api, registry
+from odoo.tests import tagged
+from odoo.tests.common import BaseCase, get_db_name
+from odoo.tools import mute_logger
+
+
+@tagged('-standard', '-at_install', 'post_install', 'database_breaking')
+class TestConcurrencyPromoCode(BaseCase):
+
+ @classmethod
+ def setUpClass(cls):
+ super().setUpClass()
+
+ cls.registry = registry(get_db_name())
+
+ with cls.registry.cursor() as cr:
+ env = api.Environment(cr, SUPERUSER_ID, {})
+
+ cls.promo_code = "AZERTY123456"
+ cls.promo_code_program = env['loyalty.program'].create({
+ 'name': 'FREE FOR ONE',
+ 'program_type': 'promo_code',
+ 'limit_usage': True,
+ 'max_usage': 1,
+ 'rule_ids': [(0, 0, {
+ 'minimum_qty': 0,
+ 'code': cls.promo_code,
+ })],
+ 'reward_ids': [(0, 0, {
+ 'reward_type': 'discount',
+ 'discount_mode': 'percent',
+ 'discount_applicability': 'order',
+ 'discount': 100.0,
+ })]
+ })
+
+ cls.partner_1 = env['res.partner'].create([{
+ 'name': 'Mitchel Notadmin',
+ 'email': 'mitch.el@example.com',
+ }])
+ cls.partner_2 = env['res.partner'].create({
+ 'name': 'John Smith',
+ 'email': 'john.smith@example.com',
+ })
+
+ cls.product = env['product.product'].create({
+ 'name': "TEST PRODUCT",
+ 'standard_price': 100,
+ })
+
+ cls.order_partner_1 = env['sale.order'].create({'partner_id': cls.partner_1.id})
+ cls.order_partner_2 = env['sale.order'].create({'partner_id': cls.partner_2.id})
+
+ cls.order_lines = env['sale.order.line'].create([{
+ 'order_id': cls.order_partner_1.id,
+ 'product_id': cls.product.id,
+ 'product_uom_qty': 1,
+ }, {
+ 'order_id': cls.order_partner_2.id,
+ 'product_id': cls.product.id,
+ 'product_uom_qty': 3,
+ },
+ ])
+
+ def setUp(self):
+ super().setUp()
+
+ def reset():
+ with self.registry.cursor() as cr:
+ cr.execute("""
+ DELETE FROM loyalty_card WHERE program_id = %(program_id)s;
+ DELETE FROM loyalty_rule WHERE program_id = %(program_id)s;
+ DELETE FROM loyalty_reward WHERE program_id = %(program_id)s;
+ DELETE FROM loyalty_program WHERE id = %(program_id)s;
+ DELETE FROM sale_order_line WHERE id IN %(sol_ids)s;
+ DELETE FROM sale_order WHERE id IN %(so_ids)s;
+ DELETE FROM res_partner WHERE id IN %(partner_ids)s;
+ DELETE FROM product_product WHERE id = %(product_id)s;
+ """, {
+ 'program_id': self.promo_code_program.id,
+ 'sol_ids': tuple(self.order_lines.ids),
+ 'so_ids': (self.order_partner_1.id, self.order_partner_2.id),
+ 'partner_ids': (self.partner_1.id, self.partner_2.id),
+ 'product_id': self.product.id,
+ })
+ self.addCleanup(reset)
+
+ @mute_logger('odoo.sql_db')
+ def test_locked_update_promo_code(self):
+ """ Test that two cursors cannot lock the same row simultaneously """
+
+ # Commit the orders so that both cursors can read them
+ with self.registry.cursor() as cr:
+ cr.commit()
+
+ # A simple barrier to make sure threads start roughly at the same time
+ start_barrier = threading.Barrier(2)
+
+ def run(order_id):
+ with self.registry.cursor() as cr:
+ cr.execute("SELECT id FROM loyalty_rule WHERE code = %s", (self.promo_code,))
+ self.assertTrue(cr.fetchone())
+
+ env = api.Environment(cr, SUPERUSER_ID, {})
+ order = env['sale.order'].browse(order_id)
+
+ # Wait for the other threads to be ready
+ start_barrier.wait()
+
+ try:
+ order._try_apply_code(self.promo_code)
+ time.sleep(2) # Hold the lock for a moment to ensure overlap
+ return True
+
+ except OperationalError:
+ # This catches the Postgres error when a row is locked
+ return False
+
+ with ThreadPoolExecutor(max_workers=2) as executor:
+ future_1 = executor.submit(run, self.order_partner_1.id)
+ future_2 = executor.submit(run, self.order_partner_2.id)
+
+ # One should go through, the other should be locked (does not matter
+ # which thread)
+ res_1 = future_1.result(timeout=3)
+ res_2 = future_2.result(timeout=3)
+ self.assertNotEqual(res_1, res_2)
diff --git a/doc/cla/individual/anjeelharia.md b/doc/cla/individual/anjeelharia.md
new file mode 100644
index 0000000000000..a2a6838880902
--- /dev/null
+++ b/doc/cla/individual/anjeelharia.md
@@ -0,0 +1,11 @@
+India, 2025-12-03
+
+I hereby agree to the terms of the Odoo Individual Contributor License
+Agreement v1.0.
+
+I declare that I am authorized and able to make this agreement and sign this
+declaration.
+
+Signed,
+
+Anjeel bytemeasap@gmail.com https://github.com/ByteMeAsap
diff --git a/odoo/addons/base/data/res_partner_demo.xml b/odoo/addons/base/data/res_partner_demo.xml
index b0be7d4a5df32..9984f0dbf020a 100644
--- a/odoo/addons/base/data/res_partner_demo.xml
+++ b/odoo/addons/base/data/res_partner_demo.xml
@@ -57,7 +57,7 @@
- Deco Addict
+ Acme Corporation
1
77 Santa Barbara Rd
@@ -65,9 +65,9 @@
94523
- deco.addict82@example.com
+ acme.corp82@example.com
(603)-996-3829
- http://www.deco-addict.com
+ http://www.acme-example-company.com
diff --git a/odoo/addons/base/static/img/res_partner_2-image.png b/odoo/addons/base/static/img/res_partner_2-image.png
index 1e9df902f8ae5..e7465708f9cf3 100644
Binary files a/odoo/addons/base/static/img/res_partner_2-image.png and b/odoo/addons/base/static/img/res_partner_2-image.png differ
diff --git a/odoo/addons/base/tests/common.py b/odoo/addons/base/tests/common.py
index 512c3b512f6d6..592513301ae16 100644
--- a/odoo/addons/base/tests/common.py
+++ b/odoo/addons/base/tests/common.py
@@ -182,7 +182,7 @@ def _load_partners_set(cls):
'name': 'Austin Kennedy', # Tom Ruiz
})],
}, {
- 'name': 'Pepper Street', # 'Deco Addict',
+ 'name': 'Pepper Street', # 'Acme Corporation',
'state_id': cls.env.ref('base.state_us_2').id,
'child_ids': [Command.create({
'name': 'Liam King', # 'Douglas Fletcher',
diff --git a/odoo/addons/base/tests/test_expression.py b/odoo/addons/base/tests/test_expression.py
index f0ea01292c4fb..901d55e8526a7 100644
--- a/odoo/addons/base/tests/test_expression.py
+++ b/odoo/addons/base/tests/test_expression.py
@@ -818,14 +818,14 @@ def test_lp1071710(self):
# indirect search via m2o
Partner = self.env['res.partner']
- deco_addict = self._search(Partner, [('name', '=', 'Pepper Street')])
+ acme_corp = self._search(Partner, [('name', '=', 'Pepper Street')])
not_be = self._search(Partner, [('country_id', '!=', 'Belgium')])
- self.assertNotIn(deco_addict, not_be)
+ self.assertNotIn(acme_corp, not_be)
Partner = Partner.with_context(lang='fr_FR')
not_be = self._search(Partner, [('country_id', '!=', 'Belgique')])
- self.assertNotIn(deco_addict, not_be)
+ self.assertNotIn(acme_corp, not_be)
def test_or_with_implicit_and(self):
# Check that when using expression.OR on a list of domains with at least one
diff --git a/odoo/netsvc.py b/odoo/netsvc.py
index fa660ad0a9b0f..a068e98e1ee1f 100644
--- a/odoo/netsvc.py
+++ b/odoo/netsvc.py
@@ -145,6 +145,16 @@ def format(self, record):
record.dbname = getattr(threading.current_thread(), 'dbname', '?')
return logging.Formatter.format(self, record)
+ def formatMessage(self, record):
+ if record.munge_traceback:
+ return super().formatMessage(record).replace(
+ 'Traceback (most recent call last):',
+ '_Traceback_ (most recent call last):',
+ )
+ else:
+ return super().formatMessage(record)
+
+
class ColoredFormatter(DBFormatter):
def format(self, record):
fg_color, bg_color = LEVEL_COLOR_MAPPING.get(record.levelno, (GREEN, DEFAULT))
@@ -162,6 +172,7 @@ def init_logger():
def record_factory(*args, **kwargs):
record = old_factory(*args, **kwargs)
record.perf_info = ""
+ record.munge_traceback = False
return record
logging.setLogRecordFactory(record_factory)
diff --git a/odoo/tests/common.py b/odoo/tests/common.py
index 7161a52bde0c0..c1453b985fcd6 100644
--- a/odoo/tests/common.py
+++ b/odoo/tests/common.py
@@ -1119,6 +1119,7 @@ def _chrome_start(self):
'--remote-debugging-port': str(self.remote_debugging_port),
'--no-sandbox': '',
'--disable-gpu': '',
+ '--mute-audio': '',
'--remote-allow-origins': '*',
# '--enable-precise-memory-info': '', # uncomment to debug memory leaks in qunit suite
# '--js-flags': '--expose-gc', # uncomment to debug memory leaks in qunit suite
diff --git a/odoo/tests/test_module_operations.py b/odoo/tests/test_module_operations.py
index eb9a216aa7515..bca13263f3fb7 100755
--- a/odoo/tests/test_module_operations.py
+++ b/odoo/tests/test_module_operations.py
@@ -231,5 +231,5 @@ def test_standalone(args):
try:
args.func(args)
except Exception:
- _logger.error("%s tests failed", args.func.__name__[5:])
- raise
+ _logger.exception("%s tests failed", args.func.__name__[5:])
+ exit(1)
diff --git a/odoo/tools/_monkeypatches.py b/odoo/tools/_monkeypatches.py
index fce9ed4c28562..4876272ac1cdc 100644
--- a/odoo/tools/_monkeypatches.py
+++ b/odoo/tools/_monkeypatches.py
@@ -158,10 +158,15 @@ def pool_init(self, *args, **kwargs):
def policy_clone(self, **kwargs):
for arg in kwargs:
- if arg.startswith("_") or "__" in arg:
+ if arg.startswith("_") or "__" in arg or arg == "clone":
raise AttributeError(f"{self.__class__.__name__!r} object has no attribute {arg!r}")
return orig_policy_clone(self, **kwargs)
+def policy_add(self, other):
+ return policy_clone(self, **other.__dict__)
+
+
orig_policy_clone = _PolicyBase.clone
_PolicyBase.clone = policy_clone
+_PolicyBase.__add__ = policy_add
diff --git a/odoo/tools/_monkeypatches_urls.py b/odoo/tools/_monkeypatches_urls.py
index 072e36b087ce8..35cf4bd4ffcb0 100644
--- a/odoo/tools/_monkeypatches_urls.py
+++ b/odoo/tools/_monkeypatches_urls.py
@@ -64,7 +64,6 @@ def _to_str(
"ABCDEFGHIJKLMNOPQRSTUVWXYZ"
"0123456789"
"-._~"
- "$!'()*+,;" # RFC3986 sub-delims set, not including query string delimiters &=
)
_always_safe = frozenset(_always_safe_chars.encode("ascii"))
diff --git a/odoo/tools/_vendor/useragents.py b/odoo/tools/_vendor/useragents.py
index 7627ccc973bf6..f0b8730deb484 100644
--- a/odoo/tools/_vendor/useragents.py
+++ b/odoo/tools/_vendor/useragents.py
@@ -75,11 +75,11 @@ class UserAgentParser(object):
)
def __init__(self):
- self.platforms = [(b, re.compile(a, re.I)) for a, b in self.platforms]
- self.browsers = [
+ self.platforms = tuple((b, re.compile(a, re.I)) for a, b in self.platforms)
+ self.browsers = tuple(
(b, re.compile(self._browser_version_re % a, re.I))
for a, b in self.browsers
- ]
+ )
def __call__(self, user_agent):
for platform, regex in self.platforms: # noqa: B007
diff --git a/odoo/tools/misc.py b/odoo/tools/misc.py
index 5dad940be5fca..558c51446c602 100644
--- a/odoo/tools/misc.py
+++ b/odoo/tools/misc.py
@@ -854,8 +854,8 @@ def emit(self, record):
if record.levelno > self.max_level:
record.levelname = f'_{record.levelname}'
record.levelno = self.to_level
+ record.munge_traceback = True
self.had_error_log = True
- record.args = tuple(arg.replace('Traceback (most recent call last):', '_Traceback_ (most recent call last):') if isinstance(arg, str) else arg for arg in record.args)
if logging.getLogger(record.name).isEnabledFor(record.levelno):
for handler in self.old_handlers:
diff --git a/setup/win32/setup.nsi b/setup/win32/setup.nsi
index 7b5ff67a0a52b..1cb1f06a0472b 100644
--- a/setup/win32/setup.nsi
+++ b/setup/win32/setup.nsi
@@ -389,6 +389,7 @@ SectionEnd
!insertmacro MUI_FUNCTION_DESCRIPTION_END
Section "Uninstall"
+ SetRegView 64
# Check if the server is installed
!insertmacro IfKeyExists "HKLM" "${UNINSTALL_REGISTRY_KEY_SERVER}" "UninstallString"
Pop $R0
|
+ 