From d7d5b87cf2a0d678a0f2e95e446b86fe6350b11f Mon Sep 17 00:00:00 2001 From: ATM john Date: Fri, 27 Sep 2019 21:29:55 +0200 Subject: [PATCH 1/2] Fix lang loaded --- htdocs/core/boxes/box_supplier_orders_awaiting_reception.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/boxes/box_supplier_orders_awaiting_reception.php b/htdocs/core/boxes/box_supplier_orders_awaiting_reception.php index bba7e6557de..f30c46a1e2e 100644 --- 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, $db; - $langs->loadLangs(array("boxes", "sendings")); + $langs->loadLangs(array("boxes", "sendings", "orders")); $this->max = $max; From 2eaf3c0dda4feee7c50cd0dd57fdc9ce646512c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Sat, 28 Sep 2019 10:25:00 +0200 Subject: [PATCH 2/2] Add sendcontext to notification emails --- htdocs/core/class/notify.class.php | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/htdocs/core/class/notify.class.php b/htdocs/core/class/notify.class.php index 27d087b2fde..104247bf1c5 100644 --- 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())