Merge branch 'master-upstream-patch-21042023' into 'master'

[PATCH] Upstream patch - 21042023

See merge request flectra-hq/flectra!1001

addons/stock/models/stock_move_line.py

@@ -191,6 +191,8 @@ class StockMoveLine(models.Model):
                 vals['company_id'] = self.env['stock.move'].browse(vals['move_id']).company_id.id
             elif vals.get('picking_id'):
                 vals['company_id'] = self.env['stock.picking'].browse(vals['picking_id']).company_id.id
+            if self.env.context.get('import_file') and vals.get('product_uom_qty') != 0:
+                raise UserError(_("It is not allow to import reserved quantity, you have to use the quantity directly."))
 
         mls = super().create(vals_list)
 

addons/stock/views/product_views.xml

@@ -140,9 +140,9 @@
                         <field name="description_picking" placeholder="This note is added to internal transfer orders (e.g. where to pick the product in the warehouse)." nolabel="1"/>
                     </group>
                 </page>
-                <page name="inventory" position="attributes">
-                    <attribute name="groups">stock.group_stock_user,product.group_stock_packaging</attribute>
-                </page>
+                <xpath expr="//page[@name='inventory']" position="attributes">
+                    <attribute name="groups" add="stock.group_stock_user" separator=","/>
+                </xpath>
             </field>
         </record>
 

addons/website_sale/static/src/js/website_sale.js

@@ -8,7 +8,8 @@ var _t = core._t;
 var timeout;
 
 publicWidget.registry.websiteSaleCartLink = publicWidget.Widget.extend({
-    selector: '#top_menu a[href$="/shop/cart"]',
+    // TODO in master: remove the second selector.
+    selector: '#top a[href$="/shop/cart"], #top_menu a[href$="/shop/cart"]',
     events: {
         'mouseenter': '_onMouseEnter',
         'mouseleave': '_onMouseLeave',