From cd6b5bbd2ab32d8aada49811c95c7cb526c6b118 Mon Sep 17 00:00:00 2001
From: Parthiv Patel <parthiv@techreceptives.com>
Date: Sun, 26 Feb 2023 08:34:36 +0000
Subject: [PATCH] [PATCH] Upstream patch - 26022023

---
 .../models/account_payment.py                 |  2 +-
 .../tests/test_print_check.py                 | 16 ++++
 .../base_automation/models/base_automation.py |  7 +-
 addons/l10n_ch/models/account_invoice.py      |  2 +
 addons/l10n_ch/models/mail_template.py        | 10 +--
 addons/l10n_ch/views/account_invoice_view.xml | 28 ------
 .../data/account_account_tags_data.xml        | 12 ++-
 .../3.1/post-migrate_update_taxes.py          |  2 +-
 .../l10n_it_edi/models/account_edi_format.py  | 10 +--
 addons/l10n_it_edi/tools/remove_signature.py  |  6 +-
 .../models/account_edi_format.py              |  1 +
 .../models/account_invoice.py                 |  8 +-
 addons/mrp/models/mrp_unbuild.py              | 19 +---
 .../js/Screens/ReceiptScreen/ReceiptScreen.js |  6 +-
 addons/product/models/product_template.py     |  4 +-
 addons/purchase_stock/models/stock_rule.py    |  5 +-
 .../tests/test_purchase_lead_time.py          | 13 ++-
 .../tests/test_reordering_rule.py             | 86 +++++++++++++++++++
 .../wizard/snailmail_letter_format_error.py   |  4 +-
 addons/stock/models/stock_picking.py          |  4 +-
 addons/transifex/models/ir_translation.py     |  9 +-
 addons/website/models/assets.py               |  7 ++
 22 files changed, 178 insertions(+), 83 deletions(-)

diff --git a/addons/account_check_printing/models/account_payment.py b/addons/account_check_printing/models/account_payment.py
index 803a9cc6ab..a7464b8a1b 100644
--- a/addons/account_check_printing/models/account_payment.py
+++ b/addons/account_check_printing/models/account_payment.py
@@ -55,7 +55,7 @@ class AccountPayment(models.Model):
               JOIN account_journal journal ON journal.id = move.journal_id,
                    account_payment other_payment
               JOIN account_move other_move ON other_move.id = other_payment.move_id
-             WHERE payment.check_number::INTEGER = other_payment.check_number::INTEGER
+             WHERE payment.check_number::BIGINT = other_payment.check_number::BIGINT
                AND move.journal_id = other_move.journal_id
                AND payment.id != other_payment.id
                AND payment.id IN %(ids)s
diff --git a/addons/account_check_printing/tests/test_print_check.py b/addons/account_check_printing/tests/test_print_check.py
index 7506c4dbb3..3c4ad3aa4d 100644
--- a/addons/account_check_printing/tests/test_print_check.py
+++ b/addons/account_check_printing/tests/test_print_check.py
@@ -161,3 +161,19 @@ class TestPrintCheck(AccountTestInvoicingCommon):
         })._create_payments()
 
         self.assertEqual(set(payments.mapped('check_number')), {str(x) for x in range(11111, 11111 + nb_invoices_to_test)})
+
+    def test_print_great_pre_number_check(self):
+        """
+        Make sure we can use integer of more than 2147483647 in check sequence
+         limit of `integer` type in psql: https://www.postgresql.org/docs/current/datatype-numeric.html
+        """
+        payment = self.env['account.payment'].create({
+            'payment_type': 'outbound',
+            'partner_type': 'supplier',
+            'amount': 100.0,
+            'journal_id': self.company_data['default_journal_bank'].id,
+            'payment_method_id': self.payment_method_check.id,
+        })
+        payment.action_post()
+        self.assertTrue(payment.write({'check_number': '2147483647'}))
+        self.assertTrue(payment.write({'check_number': '2147483648'}))
diff --git a/addons/base_automation/models/base_automation.py b/addons/base_automation/models/base_automation.py
index 50c4e5a46b..fba80fdfed 100644
--- a/addons/base_automation/models/base_automation.py
+++ b/addons/base_automation/models/base_automation.py
@@ -432,7 +432,12 @@ class BaseAutomation(models.Model):
             """ Patch method `name` on `model`, unless it has been patched already. """
             if model not in patched_models[name]:
                 patched_models[name].add(model)
-                model._patch_method(name, method)
+                ModelClass = type(model)
+                origin = getattr(ModelClass, name)
+                method.origin = origin
+                wrapped = api.propagate(origin, method)
+                wrapped.origin = origin
+                setattr(ModelClass, name, wrapped)
 
         # retrieve all actions, and patch their corresponding model
         for action_rule in self.with_context({}).search([]):
diff --git a/addons/l10n_ch/models/account_invoice.py b/addons/l10n_ch/models/account_invoice.py
index f0849c1f05..8863edd70d 100644
--- a/addons/l10n_ch/models/account_invoice.py
+++ b/addons/l10n_ch/models/account_invoice.py
@@ -285,6 +285,8 @@ class AccountMove(models.Model):
 
     def isr_print(self):
         """ Triggered by the 'Print ISR' button.
+        This button isn't available anymore and will be removed in 16.2.
+        This function is kept for stable policy.
         """
         self.ensure_one()
         if self.l10n_ch_isr_valid:
diff --git a/addons/l10n_ch/models/mail_template.py b/addons/l10n_ch/models/mail_template.py
index d96888e468..ee8e10a29b 100644
--- a/addons/l10n_ch/models/mail_template.py
+++ b/addons/l10n_ch/models/mail_template.py
@@ -30,13 +30,6 @@ class MailTemplate(models.Model):
                 inv_print_name = self._render_field('report_name', record.ids, compute_lang=True)[record.id]
                 new_attachments = []
 
-                if record.l10n_ch_isr_valid:
-                    # We add an attachment containing the ISR
-                    isr_report_name = 'ISR-' + inv_print_name + '.pdf'
-                    isr_pdf = self.env.ref('l10n_ch.l10n_ch_isr_report')._render_qweb_pdf(record.ids)[0]
-                    isr_pdf = base64.b64encode(isr_pdf)
-                    new_attachments.append((isr_report_name, isr_pdf))
-
                 if record.move_type == 'out_invoice' and record.partner_bank_id._eligible_for_qr_code('ch_qr', record.partner_id, record.currency_id):
                     # We add an attachment containing the QR-bill
                     qr_report_name = 'QR-bill-' + inv_print_name + '.pdf'
@@ -49,6 +42,5 @@ class MailTemplate(models.Model):
                 if attachments_list:
                     attachments_list.extend(new_attachments)
                 else:
-                    record_dict['attachments'] =  new_attachments
-
+                    record_dict['attachments'] = new_attachments
         return result
diff --git a/addons/l10n_ch/views/account_invoice_view.xml b/addons/l10n_ch/views/account_invoice_view.xml
index c3da57ad38..57ed9f2837 100644
--- a/addons/l10n_ch/views/account_invoice_view.xml
+++ b/addons/l10n_ch/views/account_invoice_view.xml
@@ -12,34 +12,6 @@
                 </xpath>
 
                 <xpath expr="//button[@id='account_invoice_payment_btn']" position="before">
-                    <button id="l10n_ch_btn_isr_print_highlight"
-                        name="isr_print"
-                        string="Print ISR"
-                        type="object"
-                        attrs="{'invisible':['|', '|', '|', '|',
-                            ('move_type', 'not in', ('out_invoice', 'out_refund')),
-                            ('l10n_ch_isr_sent', '=', True),
-                            ('state', '!=', 'posted'),
-                            ('payment_state', 'not in', ('not_paid', 'partial')),
-                            ('l10n_ch_currency_name', 'not in', ['EUR', 'CHF'])]}"
-                        class="oe_highlight"
-                        groups="base.group_user"
-                        />
-                </xpath>
-
-                <xpath expr="//button[@id='account_invoice_payment_btn']" position="before">
-                    <button id="btn_isr_print_normal"
-                        name="isr_print"
-                        string="Print ISR"
-                        type="object"
-                        attrs="{'invisible':['|', '|', '|', '|',
-                            ('move_type', 'not in', ('out_invoice', 'out_refund')),
-                            ('l10n_ch_isr_sent', '=', False),
-                            ('state', '!=', 'posted'),
-                            ('payment_state', 'not in', ('not_paid', 'partial')),
-                            ('l10n_ch_currency_name', 'not in', ['EUR', 'CHF'])]}"
-                        groups="base.group_user"
-                        />
                     <button
                         name="print_ch_qr_bill"
                         string="Print QR-bill"
diff --git a/addons/l10n_de/data/account_account_tags_data.xml b/addons/l10n_de/data/account_account_tags_data.xml
index c9cf7702d6..266db83e8c 100644
--- a/addons/l10n_de/data/account_account_tags_data.xml
+++ b/addons/l10n_de/data/account_account_tags_data.xml
@@ -273,11 +273,11 @@
     <!-- TAX -->
 
     <record id="tax_report_de_tax_tag_17" model="account.tax.report.line">
-        <field name="name">83. Verbleibende Umsatzsteuer-Vorauszahlung</field>
+        <field name="name">Anmeldung der Umsatzsteuer-Vorauszahlung</field>
         <field name="report_id" ref="tax_report"/>
         <field name="sequence">10</field>
         <field name="parent_id" ref="tax_report_de_tag_02"/>
-        <field name="code">83</field>
+        <field name="code"></field>
     </record>
 
     <record id="tax_report_de_tax_tag_18" model="account.tax.report.line">
@@ -494,6 +494,14 @@
         <field name="parent_id" ref="tax_report_de_tax_tag_17"/>
         <field name="code">39</field>
     </record>
+    <record id="tax_report_de_tag_83" model="account.tax.report.line">
+        <field name="name">83. Verbleibende Umsatzsteuer-Vorauszahlung (zeile 49)</field>
+        <field name="tag_name">83</field>
+        <field name="report_id" ref="tax_report"/>
+        <field name="sequence">70</field>
+        <field name="parent_id" ref="tax_report_de_tax_tag_17"/>
+        <field name="code">83</field>
+    </record>
 
     <record id="tax_report_de_tag_71" model="account.tax.report.line">
         <field name="name">Minderung</field>
diff --git a/addons/l10n_de_skr04/migrations/3.1/post-migrate_update_taxes.py b/addons/l10n_de_skr04/migrations/3.1/post-migrate_update_taxes.py
index e22a722cfe..d707011b90 100644
--- a/addons/l10n_de_skr04/migrations/3.1/post-migrate_update_taxes.py
+++ b/addons/l10n_de_skr04/migrations/3.1/post-migrate_update_taxes.py
@@ -3,4 +3,4 @@ from flectra.addons.account.models.chart_template import update_taxes_from_templ
 
 
 def migrate(cr, version):
-    update_taxes_from_templates(cr, 'l10n_de_skr04.l10n_de_chart_template')
+    update_taxes_from_templates(cr, 'l10n_de_skr04.l10n_chart_de_skr04')
diff --git a/addons/l10n_it_edi/models/account_edi_format.py b/addons/l10n_it_edi/models/account_edi_format.py
index be8bf23bfe..7a5721732f 100644
--- a/addons/l10n_it_edi/models/account_edi_format.py
+++ b/addons/l10n_it_edi/models/account_edi_format.py
@@ -317,7 +317,7 @@ class AccountEdiFormat(models.Model):
     def _check_filename_is_fattura_pa(self, filename):
         return re.search("[A-Z]{2}[A-Za-z0-9]{2,28}_[A-Za-z0-9]{0,5}.((?i:xml.p7m|xml))", filename)
 
-    def _is_fattura_pa(self, filename, tree):
+    def _is_fattura_pa(self, filename, tree=None):
         return self.code == 'fattura_pa' and self._check_filename_is_fattura_pa(filename)
 
     def _create_invoice_from_xml_tree(self, filename, tree, journal=None):
@@ -357,17 +357,17 @@ class AccountEdiFormat(models.Model):
 
     def _create_invoice_from_binary(self, filename, content, extension):
         self.ensure_one()
-        if extension.lower() == '.xml.p7m':
+        if extension.lower() == '.xml.p7m' and self._is_fattura_pa(filename):
             decoded_content = self._decode_p7m_to_xml(filename, content)
-            if decoded_content is not None and self._is_fattura_pa(filename, decoded_content):
+            if decoded_content is not None:
                 return self._import_fattura_pa(decoded_content, self.env['account.move'])
         return super()._create_invoice_from_binary(filename, content, extension)
 
     def _update_invoice_from_binary(self, filename, content, extension, invoice):
         self.ensure_one()
-        if extension.lower() == '.xml.p7m':
+        if extension.lower() == '.xml.p7m' and self._is_fattura_pa(filename):
             decoded_content = self._decode_p7m_to_xml(filename, content)
-            if decoded_content is not None and self._is_fattura_pa(filename, decoded_content):
+            if decoded_content is not None:
                 return self._import_fattura_pa(decoded_content, invoice)
         return super()._update_invoice_from_binary(filename, content, extension, invoice)
 
diff --git a/addons/l10n_it_edi/tools/remove_signature.py b/addons/l10n_it_edi/tools/remove_signature.py
index 2b846871b9..b95428cfc1 100644
--- a/addons/l10n_it_edi/tools/remove_signature.py
+++ b/addons/l10n_it_edi/tools/remove_signature.py
@@ -36,7 +36,11 @@ def remove_signature(content):
     # This method is deprecated, but there are actually no alternatives
     with warnings.catch_warnings():
         warnings.filterwarnings("ignore", category=DeprecationWarning)
-        loaded_data = ssl_crypto.load_pkcs7_data(ssl_crypto.FILETYPE_ASN1, content)
+        try:
+            loaded_data = ssl_crypto.load_pkcs7_data(ssl_crypto.FILETYPE_ASN1, content)
+        except ssl_crypto.Error:
+            _logger.warning("Error reading the content, PKCS#7 signature missing or invalid. Content will be tentatively used as it is.")
+            return content
 
     # Verify the signature
     if verify(loaded_data._pkcs7, null, null, null, out_buffer, flags) != 1:
diff --git a/addons/l10n_it_edi_sdicoop/models/account_edi_format.py b/addons/l10n_it_edi_sdicoop/models/account_edi_format.py
index 7957613e27..8fc800413f 100644
--- a/addons/l10n_it_edi_sdicoop/models/account_edi_format.py
+++ b/addons/l10n_it_edi_sdicoop/models/account_edi_format.py
@@ -33,6 +33,7 @@ class AccountEdiFormat(models.Model):
                 res = proxy_user._make_request(proxy_user._get_server_url() + '/api/l10n_it_edi/1/in/RicezioneInvoice',
                                                params={'recipient_codice_fiscale': company.l10n_it_codice_fiscale})
             except AccountEdiProxyError as e:
+                res = {}
                 _logger.error('Error while receiving file from SdiCoop: %s', e)
 
             proxy_acks = []
diff --git a/addons/l10n_it_edi_sdicoop/models/account_invoice.py b/addons/l10n_it_edi_sdicoop/models/account_invoice.py
index 8a704a062d..0d9ef063ee 100644
--- a/addons/l10n_it_edi_sdicoop/models/account_invoice.py
+++ b/addons/l10n_it_edi_sdicoop/models/account_invoice.py
@@ -2,7 +2,7 @@
 # Part of Odoo, Flectra. See LICENSE file for full copyright and licensing details.
 import logging
 
-from flectra import fields, models
+from flectra import api, fields, models
 
 
 _logger = logging.getLogger(__name__)
@@ -22,3 +22,9 @@ class AccountMove(models.Model):
         # With SdiCoop web-service, no need to send PEC mail.
         # Set the state to 'other' because the invoice should not be managed par l10n_it_edi.
         self.l10n_it_send_state = 'other'
+
+    @api.depends('l10n_it_edi_transaction')
+    def _compute_show_reset_to_draft_button(self):
+        super(AccountMove, self)._compute_show_reset_to_draft_button()
+        for move in self.filtered(lambda m: m.l10n_it_edi_transaction):
+            move.show_reset_to_draft_button = False
diff --git a/addons/mrp/models/mrp_unbuild.py b/addons/mrp/models/mrp_unbuild.py
index dca9863b6a..4b065bd8fe 100644
--- a/addons/mrp/models/mrp_unbuild.py
+++ b/addons/mrp/models/mrp_unbuild.py
@@ -47,7 +47,7 @@ class MrpUnbuild(models.Model):
         states={'done': [('readonly', True)]}, check_company=True)
     mo_id = fields.Many2one(
         'mrp.production', 'Manufacturing Order',
-        domain="[('id', 'in', allowed_mo_ids)]",
+        domain="[('state', '=', 'done'), ('company_id', '=', company_id), ('product_id', '=?', product_id)]",
         states={'done': [('readonly', True)]}, check_company=True)
     mo_bom_id = fields.Many2one('mrp.bom', 'Bill of Material used on the Production Order', related='mo_id.bom_id')
     lot_id = fields.Many2one(
@@ -76,22 +76,9 @@ class MrpUnbuild(models.Model):
         ('done', 'Done')], string='Status', default='draft', index=True)
     allowed_mo_ids = fields.One2many('mrp.production', compute='_compute_allowed_mo_ids')
 
-    @api.depends('company_id', 'product_id', 'bom_id')
     def _compute_allowed_mo_ids(self):
-        for unbuild in self:
-            domain = [
-                    ('state', '=', 'done'),
-                    ('company_id', '=', unbuild.company_id.id)
-                ]
-            if unbuild.bom_id:
-                domain = expression.AND([domain, [('bom_id', '=', unbuild.bom_id.id)]])
-            elif unbuild.product_id:
-                domain = expression.AND([domain, [('product_id', '=', unbuild.product_id.id)]])
-            allowed_mos = self.env['mrp.production'].search_read(domain, ['id'])
-            if allowed_mos:
-                unbuild.allowed_mo_ids = [mo['id'] for mo in allowed_mos]
-            else:
-                unbuild.allowed_mo_ids = False
+        # the function remains as a stable fix patch that was removed in master
+        pass
 
     @api.onchange('company_id')
     def _onchange_company_id(self):
diff --git a/addons/point_of_sale/static/src/js/Screens/ReceiptScreen/ReceiptScreen.js b/addons/point_of_sale/static/src/js/Screens/ReceiptScreen/ReceiptScreen.js
index c8457f40b8..d5beabccf2 100644
--- a/addons/point_of_sale/static/src/js/Screens/ReceiptScreen/ReceiptScreen.js
+++ b/addons/point_of_sale/static/src/js/Screens/ReceiptScreen/ReceiptScreen.js
@@ -73,8 +73,9 @@ flectra.define('point_of_sale.ReceiptScreen', function (require) {
              */
             async handleAutoPrint() {
                 if (this._shouldAutoPrint()) {
+                    const currentOrder = this.currentOrder;
                     await this.printReceipt();
-                    if (this.currentOrder._printed && this._shouldCloseImmediately()) {
+                    if (this.currentOrder && this.currentOrder === currentOrder && currentOrder._printed && this._shouldCloseImmediately()) {
                         this.whenClosing();
                     }
                 }
@@ -85,9 +86,10 @@ flectra.define('point_of_sale.ReceiptScreen', function (require) {
                 this.showScreen(name, props);
             }
             async printReceipt() {
+                const currentOrder = this.currentOrder;
                 const isPrinted = await this._printReceipt();
                 if (isPrinted) {
-                    this.currentOrder._printed = true;
+                    currentOrder._printed = true;
                 }
             }
             _shouldAutoPrint() {
diff --git a/addons/product/models/product_template.py b/addons/product/models/product_template.py
index e411e75602..62d38c001d 100644
--- a/addons/product/models/product_template.py
+++ b/addons/product/models/product_template.py
@@ -277,8 +277,8 @@ class ProductTemplate(models.Model):
                     template.barcode = archived_variants.barcode
 
     def _search_barcode(self, operator, value):
-        templates = self.with_context(active_test=False).search([('product_variant_ids.barcode', operator, value)])
-        return [('id', 'in', templates.ids)]
+        query = self.with_context(active_test=False)._search([('product_variant_ids.barcode', operator, value)])
+        return [('id', 'in', query)]
 
     def _set_barcode(self):
         variant_count = len(self.product_variant_ids)
diff --git a/addons/purchase_stock/models/stock_rule.py b/addons/purchase_stock/models/stock_rule.py
index e6a9980959..4cf83172aa 100644
--- a/addons/purchase_stock/models/stock_rule.py
+++ b/addons/purchase_stock/models/stock_rule.py
@@ -309,9 +309,10 @@ class StockRule(models.Model):
             ('company_id', '=', company_id.id),
             ('user_id', '=', False),
         )
-        if values.get('orderpoint_id'):
+        delta_days = self.env['ir.config_parameter'].sudo().get_param('purchase_stock.delta_days_merge')
+        if delta_days is not False:
             procurement_date = fields.Date.to_date(values['date_planned']) - relativedelta(days=int(values['supplier'].delay) + company_id.po_lead)
-            delta_days = int(self.env['ir.config_parameter'].sudo().get_param('purchase_stock.delta_days_merge') or 0)
+            delta_days = int(delta_days)
             domain += (
                 ('date_order', '<=', datetime.combine(procurement_date + relativedelta(days=delta_days), datetime.max.time())),
                 ('date_order', '>=', datetime.combine(procurement_date - relativedelta(days=delta_days), datetime.min.time()))
diff --git a/addons/purchase_stock/tests/test_purchase_lead_time.py b/addons/purchase_stock/tests/test_purchase_lead_time.py
index a379533773..97359c9ad3 100644
--- a/addons/purchase_stock/tests/test_purchase_lead_time.py
+++ b/addons/purchase_stock/tests/test_purchase_lead_time.py
@@ -322,7 +322,8 @@ class TestPurchaseLeadTime(PurchaseTestCommon):
         delivery_moves._action_confirm()
         self.env['procurement.group'].run_scheduler()
         po_line = self.env['purchase.order.line'].search([('product_id', '=', product.id)])
-        self.assertEqual(fields.Date.to_date(po_line.order_id.date_order), fields.Date.today() + timedelta(days=2))
+        expected_date_order = fields.Date.today() + timedelta(days=2)
+        self.assertEqual(fields.Date.to_date(po_line.order_id.date_order), expected_date_order)
         self.assertEqual(len(po_line), 1)
         self.assertEqual(po_line.product_uom_qty, 20.0)
         self.assertEqual(len(po_line.order_id), 1)
@@ -332,12 +333,10 @@ class TestPurchaseLeadTime(PurchaseTestCommon):
         self.mock_date.today.return_value = fields.Date.today() + timedelta(days=1)
         orderpoint._compute_qty()
         self.env['procurement.group'].run_scheduler()
-        po_line = self.env['purchase.order.line'].search([('product_id', '=', product.id)])
-        self.assertEqual(len(po_line), 2)
-        self.assertEqual(len(po_line.order_id), 2)
-        new_order = po_line.order_id.sorted('date_order')[-1]
-        self.assertEqual(fields.Date.to_date(new_order.date_order), fields.Date.today() + timedelta(days=2))
-        self.assertEqual(new_order.order_line.product_uom_qty, 5.0)
+        po_line02 = self.env['purchase.order.line'].search([('product_id', '=', product.id)])
+        self.assertEqual(po_line02, po_line, 'The orderpoint execution should not create a new POL')
+        self.assertEqual(fields.Date.to_date(po_line.order_id.date_order), expected_date_order, 'The Order Deadline should not change')
+        self.assertEqual(po_line.product_uom_qty, 25.0, 'The existing POL should be updated with the quantity of the last execution')
         self.patcher.stop()
 
     def test_supplier_lead_time(self):
diff --git a/addons/purchase_stock/tests/test_reordering_rule.py b/addons/purchase_stock/tests/test_reordering_rule.py
index cb2a8f4993..fd24aee83b 100644
--- a/addons/purchase_stock/tests/test_reordering_rule.py
+++ b/addons/purchase_stock/tests/test_reordering_rule.py
@@ -714,3 +714,89 @@ class TestReorderingRule(SavepointCase):
         self.assertRecordValues(orderpoint, [
             {'qty_forecast': 0, 'qty_to_order': 0},
         ])
+
+    def test_add_line_to_existing_draft_po(self):
+        """
+        Days to purchase = 10
+        Two products P1, P2 from the same supplier
+        Several use cases, each time we run the RR one by one. Then, according
+        to the dates and the configuration, it should use the existing PO or not
+        """
+        warehouse = self.env['stock.warehouse'].search([('company_id', '=', self.env.company.id)], limit=1)
+
+        self.env.company.days_to_purchase = 10
+        expected_order_date = dt.combine(dt.today() + td(days=10), dt.min.time())
+        expected_delivery_date = expected_order_date + td(days=1.0)
+        expected_delivery_date = expected_delivery_date.replace(hour=12, minute=0, second=0)
+
+        product_02 = self.env['product.product'].create({
+            'name': 'Super Product',
+            'type': 'product',
+            'seller_ids': [(0, 0, {'name': self.partner.id})],
+        })
+
+        op_01, op_02 = self.env['stock.warehouse.orderpoint'].create([{
+            'warehouse_id': warehouse.id,
+            'location_id': warehouse.lot_stock_id.id,
+            'product_id': p.id,
+            'product_min_qty': 1,
+            'product_max_qty': 0,
+        } for p in [self.product_01, product_02]])
+
+        op_01.action_replenish()
+        po01 = self.env['purchase.order'].search([], order='id desc', limit=1)
+        self.assertEqual(po01.date_order, expected_order_date)
+
+        op_02.action_replenish()
+        self.assertEqual(po01.date_order, expected_order_date)
+        self.assertRecordValues(po01.order_line, [
+            {'product_id': self.product_01.id, 'date_planned': expected_delivery_date},
+            {'product_id': product_02.id, 'date_planned': expected_delivery_date},
+        ])
+
+        # Reset and try another flow
+        po01.button_cancel()
+        op_01.action_replenish()
+        po02 = self.env['purchase.order'].search([], order='id desc', limit=1)
+        self.assertNotEqual(po02, po01)
+
+        with freeze_time(dt.today() + td(days=1)):
+            op_02.invalidate_cache(fnames=['lead_days_date'], ids=op_02.ids)
+            op_02.action_replenish()
+            self.assertEqual(po02.date_order, expected_order_date)
+            self.assertRecordValues(po02.order_line, [
+                {'product_id': self.product_01.id, 'date_planned': expected_delivery_date},
+                {'product_id': product_02.id, 'date_planned': expected_delivery_date},
+            ])
+
+        # Restrict the merge with POs that have their order deadline in [today - 2 days, today + 2 days]
+        self.env['ir.config_parameter'].set_param('purchase_stock.delta_days_merge', '2')
+
+        # Reset and try with a second RR executed in the dates range (-> should still use the existing PO)
+        po02.button_cancel()
+        op_01.action_replenish()
+        po03 = self.env['purchase.order'].search([], order='id desc', limit=1)
+        self.assertNotEqual(po03, po02)
+
+        with freeze_time(dt.today() + td(days=2)):
+            op_02.invalidate_cache(fnames=['lead_days_date'], ids=op_02.ids)
+            op_02.action_replenish()
+            self.assertEqual(po03.date_order, expected_order_date)
+            self.assertRecordValues(po03.order_line, [
+                {'product_id': self.product_01.id, 'date_planned': expected_delivery_date},
+                {'product_id': product_02.id, 'date_planned': expected_delivery_date},
+            ])
+
+        # Reset and try with a second RR executed after the dates range (-> should not use the existing PO)
+        po03.button_cancel()
+        op_01.action_replenish()
+        po04 = self.env['purchase.order'].search([], order='id desc', limit=1)
+        self.assertNotEqual(po04, po03)
+
+        with freeze_time(dt.today() + td(days=3)):
+            op_02.invalidate_cache(fnames=['lead_days_date'], ids=op_02.ids)
+            op_02.action_replenish()
+            self.assertEqual(po04.order_line.product_id, self.product_01, 'There should be only a line for product 01')
+            po05 = self.env['purchase.order'].search([], order='id desc', limit=1)
+            self.assertNotEqual(po05, po04, 'A new PO should be generated')
+            self.assertEqual(po05.order_line.product_id, product_02)
diff --git a/addons/snailmail/wizard/snailmail_letter_format_error.py b/addons/snailmail/wizard/snailmail_letter_format_error.py
index 8a87e139d9..c2a4a3302f 100644
--- a/addons/snailmail/wizard/snailmail_letter_format_error.py
+++ b/addons/snailmail/wizard/snailmail_letter_format_error.py
@@ -20,7 +20,9 @@ class SnailmailLetterFormatError(models.TransientModel):
             ('error_code', '=', 'FORMAT_ERROR'),
         ])
         for letter in letters_to_resend:
-            letter.attachment_id.unlink()
+            old_attachment = letter.attachment_id
+            letter.attachment_id = False
+            old_attachment.unlink()
             letter.write({'cover': self.snailmail_cover})
             letter.snailmail_print()
 
diff --git a/addons/stock/models/stock_picking.py b/addons/stock/models/stock_picking.py
index 40d10d8d45..25bc408864 100644
--- a/addons/stock/models/stock_picking.py
+++ b/addons/stock/models/stock_picking.py
@@ -83,8 +83,8 @@ class PickingType(models.Model):
 
     @api.model
     def create(self, vals):
-        if 'sequence_id' not in vals or not vals['sequence_id']:
-            if vals['warehouse_id']:
+        if not vals.get('sequence_id') and vals.get('sequence_code'):
+            if vals.get('warehouse_id'):
                 wh = self.env['stock.warehouse'].browse(vals['warehouse_id'])
                 vals['sequence_id'] = self.env['ir.sequence'].sudo().create({
                     'name': wh.name + ' ' + _('Sequence') + ' ' + vals['sequence_code'],
diff --git a/addons/transifex/models/ir_translation.py b/addons/transifex/models/ir_translation.py
index 1525474aff..84af0781e5 100644
--- a/addons/transifex/models/ir_translation.py
+++ b/addons/transifex/models/ir_translation.py
@@ -49,12 +49,17 @@ class IrTranslation(models.Model):
             language_codes = dict((l.code, l.iso_code) for l in languages)
 
             # .tx/config files contains the project reference
-            # using ini files like '[flectra-master.website_sale]'
+            # using ini files
             translation_modules = set(self.mapped('module'))
             project_modules = {}
             for module in translation_modules:
                 for section in tx_sections:
-                    _, _, _, tx_project, _, tx_mod = section.split(':')
+                    if len(section.split(':')) != 6:
+                        # old format ['main', 'flectra-16.base', ...]
+                        tx_project, tx_mod = section.split(".")
+                    else:
+                        # tx_config_file.sections(): ['main', 'o:flectra:p:flectra-16:r:base', ...]
+                        _, _, _, tx_project, _, tx_mod = section.split(':')
                     if tx_mod == module:
                         project_modules[module] = tx_project
 
diff --git a/addons/website/models/assets.py b/addons/website/models/assets.py
index 3b87bed0ce..721d0c4750 100644
--- a/addons/website/models/assets.py
+++ b/addons/website/models/assets.py
@@ -114,6 +114,13 @@ class Assets(models.AbstractModel):
         updatedFileContent = self.get_asset_content(custom_url) or self.get_asset_content(url)
         updatedFileContent = updatedFileContent.decode('utf-8')
         for name, value in values.items():
+            # Protect variable names so they cannot be computed as numbers
+            # on SCSS compilation (e.g. var(--700) => var(700)).
+            if isinstance(value, str):
+                value = re.sub(
+                    r"var\(--([0-9]+)\)",
+                    lambda matchobj: "var(--#{" + matchobj.group(1) + "})",
+                    value)
             pattern = "'%s': %%s,\n" % name
             regex = re.compile(pattern % ".+")
             replacement = pattern % value