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

2019-09-30 15:18:28 +02:00 · 2019-09-30 15:18:28 +02:00 · 5b582d1117
commit 5b582d1117
parent 7dd4a829a5 bc1e59ee23
2 changed files with 13 additions and 3 deletions
--- a/htdocs/core/boxes/box_supplier_orders_awaiting_reception.php
+++ b/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;

--- a/htdocs/core/class/notify.class.php
+++ b/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())