From 657972b79be5f3cf9b5ece59b7bfc500a3e3188f Mon Sep 17 00:00:00 2001 From: Gauthier PC portable 024 Date: Wed, 16 Jun 2021 16:49:24 +0200 Subject: [PATCH 1/5] FIX : Tracking number label shouldn't be displaied on "espadon" model if shipping tracking number is empty --- htdocs/core/modules/expedition/doc/pdf_espadon.modules.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php b/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php index c232edbe81c..69b6059e622 100644 --- a/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php +++ b/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php @@ -364,7 +364,11 @@ class pdf_espadon extends ModelePdfExpedition $tab_top_alt = $tab_top; $pdf->SetFont('', 'B', $default_font_size - 2); - $pdf->writeHTMLCell(60, 4, $this->posxdesc - 1, $tab_top - 1, $outputlangs->transnoentities("TrackingNumber")." : ".$object->tracking_number, 0, 1, false, true, 'L'); + if(!empty($object->tracking_number)) { + $pdf->writeHTMLCell(60, 4, $this->posxdesc - 1, $tab_top - 1, $outputlangs->transnoentities("TrackingNumber")." : ".$object->tracking_number, 0, 1, false, true, 'L'); + } else { + $pdf->writeHTMLCell(60, 4, $this->posxdesc - 1, $tab_top - 5, '', 0, 1, false, true, 'L'); + } $tab_top_alt = $pdf->GetY(); //$tab_top_alt += 1; From eeef78760a260e90dda94bfe9d6a5049b3189526 Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Thu, 17 Jun 2021 10:29:43 +0200 Subject: [PATCH 2/5] fix: Bad position of the printFieldListWhere hook --- htdocs/product/stock/replenish.php | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/htdocs/product/stock/replenish.php b/htdocs/product/stock/replenish.php index d316d6cdf98..a2bf8051a3c 100644 --- a/htdocs/product/stock/replenish.php +++ b/htdocs/product/stock/replenish.php @@ -352,6 +352,12 @@ if (!empty($canvas)) $sql .= ' AND p.canvas = "'.$db->escape($canvas).'"'; if ($fk_supplier > 0) { $sql .= ' AND EXISTS (SELECT pfp.rowid FROM '.MAIN_DB_PREFIX.'product_fournisseur_price as pfp WHERE pfp.fk_product = p.rowid AND pfp.fk_soc = '.((int) $fk_supplier).' AND pfp.entity IN ('.getEntity('product_fournisseur_price').'))'; } + +// Add where from hooks +$parameters = array(); +$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters); // Note that $action and $object may have been modified by hook +$sql .= $hookmanager->resPrint; + $sql .= ' GROUP BY p.rowid, p.ref, p.label, p.description, p.price'; $sql .= ', p.price_ttc, p.price_base_type,p.fk_product_type, p.tms'; $sql .= ', p.duration, p.tobuy'; @@ -459,11 +465,6 @@ if ($usevirtualstock) } } -// Add where from hooks -$parameters = array(); -$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters); // Note that $action and $object may have been modified by hook -$sql .= $hookmanager->resPrint; - $sql .= $db->order($sortfield, $sortorder); $sql .= $db->plimit($limit + 1, $offset); From 5b8a6f1d712601e5e6cbe87353fa2d8ff2fdf63a Mon Sep 17 00:00:00 2001 From: atm-lena Date: Thu, 17 Jun 2021 10:41:03 +0200 Subject: [PATCH 3/5] Add Trigger "MAILING_DELETE" --- htdocs/comm/mailing/class/mailing.class.php | 24 ++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/htdocs/comm/mailing/class/mailing.class.php b/htdocs/comm/mailing/class/mailing.class.php index 75efe1f07b2..24531c53956 100644 --- a/htdocs/comm/mailing/class/mailing.class.php +++ b/htdocs/comm/mailing/class/mailing.class.php @@ -429,6 +429,10 @@ class Mailing extends CommonObject */ public function delete($rowid) { + global $user; + + $this->db->begin(); + $sql = "DELETE FROM ".MAIN_DB_PREFIX."mailing"; $sql .= " WHERE rowid = ".$rowid; @@ -436,13 +440,31 @@ class Mailing extends CommonObject $resql = $this->db->query($sql); if ($resql) { - return $this->delete_targets(); + $res = $this->delete_targets(); + if(empty($res)){ + $this->db->rollback(); + $this->error = $this->db->lasterror(); + return -1; + } } else { + $this->db->rollback(); $this->error = $this->db->lasterror(); return -1; } + + if(!$notrigger){ + $result = $this->call_trigger('MAILING_DELETE', $user); + if ($result < 0) + { + $this->db->rollback(); + return -1; + } + } + + $this->db->commit(); + return 1; } // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps From 9769e33eab1d44c124f1a4e666eed788e8eaf391 Mon Sep 17 00:00:00 2001 From: atm-lena Date: Thu, 17 Jun 2021 10:41:55 +0200 Subject: [PATCH 4/5] notigger parameter --- htdocs/comm/mailing/class/mailing.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/comm/mailing/class/mailing.class.php b/htdocs/comm/mailing/class/mailing.class.php index 24531c53956..a61ea3079e4 100644 --- a/htdocs/comm/mailing/class/mailing.class.php +++ b/htdocs/comm/mailing/class/mailing.class.php @@ -427,7 +427,7 @@ class Mailing extends CommonObject * @param int $rowid id du mailing a supprimer * @return int 1 en cas de succes */ - public function delete($rowid) + public function delete($rowid, $notrigger = 0) { global $user; From 50bc832532d58ccabbdf240906f87d4c274cd087 Mon Sep 17 00:00:00 2001 From: Gauthier PC portable 024 Date: Thu, 17 Jun 2021 10:48:48 +0200 Subject: [PATCH 5/5] FIX : better correction --- htdocs/core/modules/expedition/doc/pdf_espadon.modules.php | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php b/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php index 69b6059e622..48e70b29a45 100644 --- a/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php +++ b/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php @@ -362,15 +362,12 @@ class pdf_espadon extends ModelePdfExpedition { $tab_top = 88 + $height_incoterms; $tab_top_alt = $tab_top; - $pdf->SetFont('', 'B', $default_font_size - 2); if(!empty($object->tracking_number)) { $pdf->writeHTMLCell(60, 4, $this->posxdesc - 1, $tab_top - 1, $outputlangs->transnoentities("TrackingNumber")." : ".$object->tracking_number, 0, 1, false, true, 'L'); - } else { - $pdf->writeHTMLCell(60, 4, $this->posxdesc - 1, $tab_top - 5, '', 0, 1, false, true, 'L'); } - $tab_top_alt = $pdf->GetY(); + if(!empty($object->tracking_number)) $tab_top_alt = $pdf->GetY(); //$tab_top_alt += 1; // Tracking number