[PATCH] Upstream patch - 25102021

addons/event/models/event_mail.py

@@ -204,7 +204,21 @@ class EventMailRegistration(models.Model):
             reg_mail.scheduler_id.notification_type == 'mail'
         )
         for reg_mail in todo:
-            reg_mail.scheduler_id.template_id.send_mail(reg_mail.registration_id.id)
+            organizer = reg_mail.scheduler_id.event_id.organizer_id
+            company = self.env.company
+            author = self.env.ref('base.user_root')
+            if organizer.email:
+                author = organizer
+            elif company.email:
+                author = company.partner_id
+            elif self.env.user.email:
+                author = self.env.user
+            
+            email_values = {
+                'email_from': author.email_formatted,
+                'author_id': author.id,
+            }
+            reg_mail.scheduler_id.template_id.send_mail(reg_mail.registration_id.id, email_values=email_values)
         todo.write({'mail_sent': True})
 
     @api.depends('registration_id', 'scheduler_id.interval_unit', 'scheduler_id.interval_type')

addons/pos_restaurant/static/src/js/multiprint.js

@@ -171,7 +171,9 @@ models.Order = models.Order.extend({
             var old  = {};
             var found = false;
             for(var id in old_res) {
-                if(old_res[id].product_id === curr.product_id){
+                const old_line_id = id.split('|')[0];
+                const new_line_id = line_hash.split('|')[0];
+                if(old_line_id === new_line_id){
                     found = true;
                     old = old_res[id];
                     break;

addons/stock/report/report_deliveryslip.xml

@@ -204,7 +204,8 @@
                 </p>
             </td>
             <td class="text-center" name="move_line_aggregated_qty_done">
-                <span t-esc="aggregated_lines[line]['qty_done']"/>
+                <span t-esc="aggregated_lines[line]['qty_done']"
+                    t-options="{'widget': 'float', 'decimal_precision': 'Product Unit of Measure'}"/>
                 <span t-esc="aggregated_lines[line]['product_uom']"/>
             </td>
         </tr>