[PATCH] Upstream patch - 01072022

addons/l10n_es_edi_sii/models/account_edi_format.py

@@ -46,7 +46,7 @@ class PatchedHTTPAdapter(requests.adapters.HTTPAdapter):
         context = conn.conn_kw['ssl_context']
 
         def patched_load_cert_chain(l10n_es_flectra_certificate, keyfile=None, password=None):
-            cert_file, key_file, dummy = l10n_es_flectra_certificate._decode_certificate()
+            cert_file, key_file, dummy = l10n_es_flectra_certificate.sudo()._decode_certificate()
             cert_obj = load_certificate(FILETYPE_PEM, cert_file)
             pkey_obj = load_privatekey(FILETYPE_PEM, key_file)
 

addons/sale_mrp/models/sale.py

@@ -20,7 +20,7 @@ class SaleOrder(models.Model):
         for item in data:
             procurement_groups = self.env['procurement.group'].browse(item['ids'])
             mrp_count[item['sale_id'][0]] = len(
-                set(procurement_groups.stock_move_ids.created_production_id.ids) |
+                set(procurement_groups.stock_move_ids.created_production_id.procurement_group_id.mrp_production_ids.ids) |
                 set(procurement_groups.mrp_production_ids.ids))
         for sale in self:
             sale.mrp_production_count = mrp_count.get(sale.id)
@@ -28,7 +28,7 @@ class SaleOrder(models.Model):
     def action_view_mrp_production(self):
         self.ensure_one()
         procurement_groups = self.env['procurement.group'].search([('sale_id', 'in', self.ids)])
-        mrp_production_ids = set(procurement_groups.stock_move_ids.created_production_id.ids) |\
+        mrp_production_ids = set(procurement_groups.stock_move_ids.created_production_id.procurement_group_id.mrp_production_ids.ids) |\
             set(procurement_groups.mrp_production_ids.ids)
         action = {
             'res_model': 'mrp.production',

addons/website_sale/tests/test_customize.py

@@ -53,6 +53,11 @@ class TestUi(HttpCaseWithUserDemo, HttpCaseWithUserPortal):
             else:
                 ptav.price_extra = 50.4
 
+        # Update the pricelist currency regarding env.company_id currency_id in case company has changed currency with COA installation.
+        website = self.env['website'].get_current_website()
+        pricelist = website.get_current_pricelist()
+        pricelist.write({'currency_id': self.env.company.currency_id.id})
+
     def test_01_admin_shop_customize_tour(self):
         # Enable Variant Group
         self.env.ref('product.group_product_variant').write({'users': [(4, self.env.ref('base.user_admin').id)]})