Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

htdocs/core/boxes/box_supplier_orders_awaiting_reception.php

@@ -70,7 +70,7 @@ class box_supplier_orders_awaiting_reception extends ModeleBoxes
     public function loadBox($max = 5)
     {
         global $conf, $user, $langs;
-        $langs->loadLangs(array("boxes", "sendings"));
+        $langs->loadLangs(array("boxes", "sendings", "orders"));
 
         $this->max = $max;
 

htdocs/core/class/notify.class.php

@@ -541,7 +541,12 @@ class Notify
 							'',
 							'',
 							0,
-							-1
+							-1,
+                            '',
+                            '',
+                            '',
+                            '',
+                            'notification'
                         );
 
 						if ($mailfile->sendfile())
@@ -769,7 +774,12 @@ class Notify
 						'',
 						'',
 						0,
-						1
+						1,
+                        '',
+                        '',
+                        '',
+                        '',
+                        'notification'
 					);
 
 					if ($mailfile->sendfile())