Merge branch '13.0' into 13.0-test

.theia/launch.json

@@ -96,6 +96,22 @@
             "args": [],
             "console": "integratedTerminal"
         },
+        {
+            "name": "Odoo: Locust Load Testing",
+            "type": "python",
+            "request": "launch",
+            "program": "/flow/odoo/Locust/entrypoint.py",
+            "args": [
+                // -f /path/to/locustfiles.py
+                // -d more-specific-db
+                "--user", "admin",
+                "--pass", "admin",
+                "--host", "localhost",
+                "--port", "8069",
+                "--proto", "jsonrpc"
+            ],
+            "console": "integratedTerminal"
+        },
         {
             "name": "Odoo: reload foreground server",
             "type": "python",

rma_sale/models/rma.py

@@ -11,8 +11,15 @@ class SaleOrderLine(models.Model):
     def _get_protected_fields(self):
         res = super(SaleOrderLine, self)._get_protected_fields()
         context = self._context or {}
-        if context.get('rma_done') and 'product_uom_qty' in res:
-            res.remove('product_uom_qty')
+        if context.get('rma_done'):
+            if 'product_uom_qty' in res:
+                res.remove('product_uom_qty')
+            # technically used by product_cores to update related core pieces
+            if 'product_id' in res:
+                res.remove('product_id')
+            if 'product_uom' in res:
+                res.remove('product_uom')
+        return res
         return res