From d6c6170e9d9801eb5201f277ee6600685b3109b1 Mon Sep 17 00:00:00 2001 From: Quentin VIAL-GOUTEYRON Date: Mon, 7 Jun 2021 16:01:58 +0200 Subject: [PATCH 1/9] fix multiple order linked to invoice --- htdocs/core/lib/pdf.lib.php | 120 ++++++++++++++++++++++++------------ 1 file changed, 79 insertions(+), 41 deletions(-) diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php index 1babc31b4c2..9800f09b1f8 100644 --- a/htdocs/core/lib/pdf.lib.php +++ b/htdocs/core/lib/pdf.lib.php @@ -2122,7 +2122,7 @@ function pdf_getTotalQty($object, $type, $outputlangs) * @param Translate $outputlangs Object lang for output * @return array Linked objects */ -function pdf_getLinkedObjects($object, $outputlangs) +function pdf_getLinkedObjects(&$object, $outputlangs) { global $db, $hookmanager; @@ -2151,13 +2151,22 @@ function pdf_getLinkedObjects($object, $outputlangs) elseif ($objecttype == 'commande' || $objecttype == 'supplier_order') { $outputlangs->load('orders'); - foreach ($objects as $elementobject) - { - $linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("RefOrder"); + + if(count($objects) > 1) { + $object->note_public .= '
'.$outputlangs->transnoentities("RefOrder").' :
'; + foreach($objects as $elementobject) { + $object->note_public .= $outputlangs->transnoentities($elementobject->ref).($elementobject->ref_client ? ' ('.$elementobject->ref_client.')' : '').($elementobject->ref_supplier ? ' ('.$elementobject->ref_supplier.')' : '').' '; + $object->note_public .= $outputlangs->transnoentities("OrderDate").' : '; + $object->note_public .= dol_print_date($elementobject->date, 'day', '', $outputlangs); + $object->note_public .= '
'; + } + } else if(count($objects) == 1) { + $elementobject = array_shift($objects); + $linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("RefOrder"); $linkedobjects[$objecttype]['ref_value'] = $outputlangs->transnoentities($elementobject->ref).($elementobject->ref_client ? ' ('.$elementobject->ref_client.')' : '').($elementobject->ref_supplier ? ' ('.$elementobject->ref_supplier.')' : ''); $linkedobjects[$objecttype]['date_title'] = $outputlangs->transnoentities("OrderDate"); $linkedobjects[$objecttype]['date_value'] = dol_print_date($elementobject->date, 'day', '', $outputlangs); - } + } } elseif ($objecttype == 'contrat') { @@ -2183,43 +2192,72 @@ function pdf_getLinkedObjects($object, $outputlangs) } elseif ($objecttype == 'shipping') { - $outputlangs->loadLangs(array("orders", "sendings")); + $outputlangs->loadLangs(array("orders", "sendings")); - foreach ($objects as $x => $elementobject) - { - $order = null; - // We concat this record info into fields xxx_value. title is overwrote. - if (empty($object->linkedObjects['commande']) && $object->element != 'commande') // There is not already a link to order and object is not the order, so we show also info with order - { - $elementobject->fetchObjectLinked(null, '', null, '', 'OR', 1, 'sourcetype', 0); - if (! empty($elementobject->linkedObjectsIds['commande'])){ - include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php'; - $order = new Commande($db); - $ret = $order->fetch(reset($elementobject->linkedObjectsIds['commande'])); - if ($ret < 1) { $order=null; } - } - } - if (!is_object($order)) - { - $linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("RefSending"); - if (!empty($linkedobjects[$objecttype]['ref_value'])) $linkedobjects[$objecttype]['ref_value'] .= ' / '; - $linkedobjects[$objecttype]['ref_value'] .= $outputlangs->transnoentities($elementobject->ref); - //$linkedobjects[$objecttype]['date_title'] = $outputlangs->transnoentities("DateShipment"); - //if (! empty($linkedobjects[$objecttype]['date_value'])) $linkedobjects[$objecttype]['date_value'].=' / '; - //$linkedobjects[$objecttype]['date_value'].= dol_print_date($elementobject->date_delivery,'day','',$outputlangs); - } - else - { - $linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("RefOrder").' / '.$outputlangs->transnoentities("RefSending"); - if (empty($linkedobjects[$objecttype]['ref_value'])) $linkedobjects[$objecttype]['ref_value'] = $outputlangs->convToOutputCharset($order->ref).($order->ref_client ? ' ('.$order->ref_client.')' : ''); - $linkedobjects[$objecttype]['ref_value'] .= ' / '.$outputlangs->transnoentities($elementobject->ref); - //$linkedobjects[$objecttype]['date_title'] = $outputlangs->transnoentities("OrderDate") . ($elementobject->date_delivery ? ' / ' . $outputlangs->transnoentities("DateShipment") : ''); - //if (empty($linkedobjects[$objecttype]['date_value'])) $linkedobjects[$objecttype]['date_value'] = dol_print_date($order->date,'day','',$outputlangs); - //$linkedobjects[$objecttype]['date_value'].= ($elementobject->date_delivery ? ' / ' . dol_print_date($elementobject->date_delivery,'day','',$outputlangs) : ''); - } - } - } - } + if(count($objects) > 1) { + + $order = null; + if(empty($object->linkedObjects['commande']) && $object->element != 'commande') $object->note_public .= '
'.$outputlangs->transnoentities("RefOrder").' / '.$outputlangs->transnoentities("RefSending").' :
'; + else $object->note_public .= '
'.$outputlangs->transnoentities("RefSending").' :
'; + // We concat this record info into fields xxx_value. title is overwrote. + foreach($objects as $elementobject) { + if(empty($object->linkedObjects['commande']) && $object->element != 'commande') // There is not already a link to order and object is not the order, so we show also info with order + { + $elementobject->fetchObjectLinked(null, '', null, '', 'OR', 1, 'sourcetype', 0); + if(! empty($elementobject->linkedObjectsIds['commande'])) { + include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php'; + $order = new Commande($db); + $ret = $order->fetch(reset($elementobject->linkedObjectsIds['commande'])); + if($ret < 1) { + $order = null; + } + } + } + + if(! is_object($order)) { + + $object->note_public .= $outputlangs->transnoentities($elementobject->ref); + $object->note_public .= '
'; + } + + else { + + $object->note_public .= $outputlangs->convToOutputCharset($order->ref).($order->ref_client ? ' ('.$order->ref_client.')' : ''); + $object->note_public .= ' / '.$outputlangs->transnoentities($elementobject->ref); + $object->note_public .= '
'; + } + } + } + else if(count($objects) == 1) { + $elementobject = array_shift($objects); + $order = null; + // We concat this record info into fields xxx_value. title is overwrote. + if(empty($object->linkedObjects['commande']) && $object->element != 'commande') // There is not already a link to order and object is not the order, so we show also info with order + { + $elementobject->fetchObjectLinked(null, '', null, '', 'OR', 1, 'sourcetype', 0); + if(! empty($elementobject->linkedObjectsIds['commande'])) { + include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php'; + $order = new Commande($db); + $ret = $order->fetch(reset($elementobject->linkedObjectsIds['commande'])); + if($ret < 1) { + $order = null; + } + } + } + + if(! is_object($order)) { + $linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("RefSending"); + if(! empty($linkedobjects[$objecttype]['ref_value'])) $linkedobjects[$objecttype]['ref_value'] .= ' / '; + $linkedobjects[$objecttype]['ref_value'] .= $outputlangs->transnoentities($elementobject->ref); + } + else { + $linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("RefOrder").' / '.$outputlangs->transnoentities("RefSending"); + if(empty($linkedobjects[$objecttype]['ref_value'])) $linkedobjects[$objecttype]['ref_value'] = $outputlangs->convToOutputCharset($order->ref).($order->ref_client ? ' ('.$order->ref_client.')' : ''); + $linkedobjects[$objecttype]['ref_value'] .= ' / '.$outputlangs->transnoentities($elementobject->ref); + } + } + } + } // For add external linked objects if (is_object($hookmanager)) From 453ff4aa66e9461f57906f3069618af7617c867c Mon Sep 17 00:00:00 2001 From: stickler-ci Date: Mon, 7 Jun 2021 14:19:06 +0000 Subject: [PATCH 2/9] Fixing style errors. --- htdocs/core/lib/pdf.lib.php | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php index d420c20796e..b6a831d0b58 100644 --- a/htdocs/core/lib/pdf.lib.php +++ b/htdocs/core/lib/pdf.lib.php @@ -2160,7 +2160,7 @@ function pdf_getLinkedObjects(&$object, $outputlangs) $object->note_public .= dol_print_date($elementobject->date, 'day', '', $outputlangs); $object->note_public .= '
'; } - } else if(count($objects) == 1) { + } elseif(count($objects) == 1) { $elementobject = array_shift($objects); $linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("RefOrder"); $linkedobjects[$objecttype]['ref_value'] = $outputlangs->transnoentities($elementobject->ref).($elementobject->ref_client ? ' ('.$elementobject->ref_client.')' : '').($elementobject->ref_supplier ? ' ('.$elementobject->ref_supplier.')' : ''); @@ -2195,7 +2195,6 @@ function pdf_getLinkedObjects(&$object, $outputlangs) $outputlangs->loadLangs(array("orders", "sendings")); if(count($objects) > 1) { - $order = null; if(empty($object->linkedObjects['commande']) && $object->element != 'commande') $object->note_public .= '
'.$outputlangs->transnoentities("RefOrder").' / '.$outputlangs->transnoentities("RefSending").' :
'; else $object->note_public .= '
'.$outputlangs->transnoentities("RefSending").' :
'; @@ -2215,20 +2214,18 @@ function pdf_getLinkedObjects(&$object, $outputlangs) } if(! is_object($order)) { - $object->note_public .= $outputlangs->transnoentities($elementobject->ref); $object->note_public .= '
'; } else { - $object->note_public .= $outputlangs->convToOutputCharset($order->ref).($order->ref_client ? ' ('.$order->ref_client.')' : ''); $object->note_public .= ' / '.$outputlangs->transnoentities($elementobject->ref); $object->note_public .= '
'; } } } - else if(count($objects) == 1) { + elseif(count($objects) == 1) { $elementobject = array_shift($objects); $order = null; // We concat this record info into fields xxx_value. title is overwrote. From 1d279dedaae54fd532d222dc36c9dcb8b242c433 Mon Sep 17 00:00:00 2001 From: Quentin VIAL-GOUTEYRON Date: Thu, 10 Jun 2021 14:24:01 +0200 Subject: [PATCH 3/9] missing & --- htdocs/core/lib/pdf.lib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php index 5aab08f2e58..24bc4cb493d 100644 --- a/htdocs/core/lib/pdf.lib.php +++ b/htdocs/core/lib/pdf.lib.php @@ -2262,7 +2262,7 @@ function pdf_getTotalQty($object, $type, $outputlangs) * @param Translate $outputlangs Object lang for output * @return array Linked objects */ -function pdf_getLinkedObjects($object, $outputlangs) +function pdf_getLinkedObjects(&$object, $outputlangs) { global $db, $hookmanager; From aae636bdc7816b14618c7bdc250c4d2c8d59899c Mon Sep 17 00:00:00 2001 From: stickler-ci Date: Thu, 10 Jun 2021 12:28:26 +0000 Subject: [PATCH 4/9] Fixing style errors. --- htdocs/core/lib/pdf.lib.php | 140 +++++++++++++++++------------------- 1 file changed, 66 insertions(+), 74 deletions(-) diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php index 24bc4cb493d..3beed062548 100644 --- a/htdocs/core/lib/pdf.lib.php +++ b/htdocs/core/lib/pdf.lib.php @@ -2285,24 +2285,22 @@ function pdf_getLinkedObjects(&$object, $outputlangs) } elseif ($objecttype == 'commande' || $objecttype == 'supplier_order') { $outputlangs->load('orders'); - if(count($objects) > 1) { - $object->note_public .= '
'.$outputlangs->transnoentities("RefOrder").' :
'; - foreach($objects as $elementobject) { - $object->note_public .= $outputlangs->transnoentities($elementobject->ref).($elementobject->ref_client ? ' ('.$elementobject->ref_client.')' : '').($elementobject->ref_supplier ? ' ('.$elementobject->ref_supplier.')' : '').' '; - $object->note_public .= $outputlangs->transnoentities("OrderDate").' : '; - $object->note_public .= dol_print_date($elementobject->date, 'day', '', $outputlangs); - $object->note_public .= '
'; - } - } elseif(count($objects) == 1) { - $elementobject = array_shift($objects); - $linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("RefOrder"); + if (count($objects) > 1) { + $object->note_public .= '
'.$outputlangs->transnoentities("RefOrder").' :
'; + foreach ($objects as $elementobject) { + $object->note_public .= $outputlangs->transnoentities($elementobject->ref).($elementobject->ref_client ? ' ('.$elementobject->ref_client.')' : '').($elementobject->ref_supplier ? ' ('.$elementobject->ref_supplier.')' : '').' '; + $object->note_public .= $outputlangs->transnoentities("OrderDate").' : '; + $object->note_public .= dol_print_date($elementobject->date, 'day', '', $outputlangs); + $object->note_public .= '
'; + } + } elseif (count($objects) == 1) { + $elementobject = array_shift($objects); + $linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("RefOrder"); $linkedobjects[$objecttype]['ref_value'] = $outputlangs->transnoentities($elementobject->ref).($elementobject->ref_client ? ' ('.$elementobject->ref_client.')' : '').($elementobject->ref_supplier ? ' ('.$elementobject->ref_supplier.')' : ''); $linkedobjects[$objecttype]['date_title'] = $outputlangs->transnoentities("OrderDate"); $linkedobjects[$objecttype]['date_value'] = dol_print_date($elementobject->date, 'day', '', $outputlangs); - } - } - elseif ($objecttype == 'contrat') - { + } + } elseif ($objecttype == 'contrat') { $outputlangs->load('contracts'); foreach ($objects as $elementobject) { $linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("RefContract"); @@ -2321,67 +2319,61 @@ function pdf_getLinkedObjects(&$object, $outputlangs) } elseif ($objecttype == 'shipping') { $outputlangs->loadLangs(array("orders", "sendings")); - if(count($objects) > 1) { - $order = null; - if(empty($object->linkedObjects['commande']) && $object->element != 'commande') $object->note_public .= '
'.$outputlangs->transnoentities("RefOrder").' / '.$outputlangs->transnoentities("RefSending").' :
'; - else $object->note_public .= '
'.$outputlangs->transnoentities("RefSending").' :
'; - // We concat this record info into fields xxx_value. title is overwrote. - foreach($objects as $elementobject) { - if(empty($object->linkedObjects['commande']) && $object->element != 'commande') // There is not already a link to order and object is not the order, so we show also info with order - { - $elementobject->fetchObjectLinked(null, '', null, '', 'OR', 1, 'sourcetype', 0); - if(! empty($elementobject->linkedObjectsIds['commande'])) { - include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php'; - $order = new Commande($db); - $ret = $order->fetch(reset($elementobject->linkedObjectsIds['commande'])); - if($ret < 1) { - $order = null; - } - } - } + if (count($objects) > 1) { + $order = null; + if (empty($object->linkedObjects['commande']) && $object->element != 'commande') $object->note_public .= '
'.$outputlangs->transnoentities("RefOrder").' / '.$outputlangs->transnoentities("RefSending").' :
'; + else $object->note_public .= '
'.$outputlangs->transnoentities("RefSending").' :
'; + // We concat this record info into fields xxx_value. title is overwrote. + foreach ($objects as $elementobject) { + if (empty($object->linkedObjects['commande']) && $object->element != 'commande') { // There is not already a link to order and object is not the order, so we show also info with order + $elementobject->fetchObjectLinked(null, '', null, '', 'OR', 1, 'sourcetype', 0); + if (! empty($elementobject->linkedObjectsIds['commande'])) { + include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php'; + $order = new Commande($db); + $ret = $order->fetch(reset($elementobject->linkedObjectsIds['commande'])); + if ($ret < 1) { + $order = null; + } + } + } - if(! is_object($order)) { - $object->note_public .= $outputlangs->transnoentities($elementobject->ref); - $object->note_public .= '
'; - } + if (! is_object($order)) { + $object->note_public .= $outputlangs->transnoentities($elementobject->ref); + $object->note_public .= '
'; + } else { + $object->note_public .= $outputlangs->convToOutputCharset($order->ref).($order->ref_client ? ' ('.$order->ref_client.')' : ''); + $object->note_public .= ' / '.$outputlangs->transnoentities($elementobject->ref); + $object->note_public .= '
'; + } + } + } elseif (count($objects) == 1) { + $elementobject = array_shift($objects); + $order = null; + // We concat this record info into fields xxx_value. title is overwrote. + if (empty($object->linkedObjects['commande']) && $object->element != 'commande') { // There is not already a link to order and object is not the order, so we show also info with order + $elementobject->fetchObjectLinked(null, '', null, '', 'OR', 1, 'sourcetype', 0); + if (! empty($elementobject->linkedObjectsIds['commande'])) { + include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php'; + $order = new Commande($db); + $ret = $order->fetch(reset($elementobject->linkedObjectsIds['commande'])); + if ($ret < 1) { + $order = null; + } + } + } - else { - $object->note_public .= $outputlangs->convToOutputCharset($order->ref).($order->ref_client ? ' ('.$order->ref_client.')' : ''); - $object->note_public .= ' / '.$outputlangs->transnoentities($elementobject->ref); - $object->note_public .= '
'; - } - } - } - elseif(count($objects) == 1) { - $elementobject = array_shift($objects); - $order = null; - // We concat this record info into fields xxx_value. title is overwrote. - if(empty($object->linkedObjects['commande']) && $object->element != 'commande') // There is not already a link to order and object is not the order, so we show also info with order - { - $elementobject->fetchObjectLinked(null, '', null, '', 'OR', 1, 'sourcetype', 0); - if(! empty($elementobject->linkedObjectsIds['commande'])) { - include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php'; - $order = new Commande($db); - $ret = $order->fetch(reset($elementobject->linkedObjectsIds['commande'])); - if($ret < 1) { - $order = null; - } - } - } - - if(! is_object($order)) { - $linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("RefSending"); - if(! empty($linkedobjects[$objecttype]['ref_value'])) $linkedobjects[$objecttype]['ref_value'] .= ' / '; - $linkedobjects[$objecttype]['ref_value'] .= $outputlangs->transnoentities($elementobject->ref); - } - else { - $linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("RefOrder").' / '.$outputlangs->transnoentities("RefSending"); - if(empty($linkedobjects[$objecttype]['ref_value'])) $linkedobjects[$objecttype]['ref_value'] = $outputlangs->convToOutputCharset($order->ref).($order->ref_client ? ' ('.$order->ref_client.')' : ''); - $linkedobjects[$objecttype]['ref_value'] .= ' / '.$outputlangs->transnoentities($elementobject->ref); - } - } - } - } + if (! is_object($order)) { + $linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("RefSending"); + if (! empty($linkedobjects[$objecttype]['ref_value'])) $linkedobjects[$objecttype]['ref_value'] .= ' / '; + $linkedobjects[$objecttype]['ref_value'] .= $outputlangs->transnoentities($elementobject->ref); + } else { + $linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("RefOrder").' / '.$outputlangs->transnoentities("RefSending"); + if (empty($linkedobjects[$objecttype]['ref_value'])) $linkedobjects[$objecttype]['ref_value'] = $outputlangs->convToOutputCharset($order->ref).($order->ref_client ? ' ('.$order->ref_client.')' : ''); + $linkedobjects[$objecttype]['ref_value'] .= ' / '.$outputlangs->transnoentities($elementobject->ref); + } + } + } + } // For add external linked objects if (is_object($hookmanager)) { From f22a02a7ef14856b885bf3bccafd53969d197236 Mon Sep 17 00:00:00 2001 From: Quentin VIAL-GOUTEYRON Date: Tue, 3 Aug 2021 11:21:47 +0200 Subject: [PATCH 5/9] fix br --- htdocs/core/lib/pdf.lib.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php index 3beed062548..8d56c50ae79 100644 --- a/htdocs/core/lib/pdf.lib.php +++ b/htdocs/core/lib/pdf.lib.php @@ -2286,12 +2286,12 @@ function pdf_getLinkedObjects(&$object, $outputlangs) $outputlangs->load('orders'); if (count($objects) > 1) { - $object->note_public .= '
'.$outputlangs->transnoentities("RefOrder").' :
'; + $object->note_public .= '
'.$outputlangs->transnoentities("RefOrder").' :
'; foreach ($objects as $elementobject) { $object->note_public .= $outputlangs->transnoentities($elementobject->ref).($elementobject->ref_client ? ' ('.$elementobject->ref_client.')' : '').($elementobject->ref_supplier ? ' ('.$elementobject->ref_supplier.')' : '').' '; $object->note_public .= $outputlangs->transnoentities("OrderDate").' : '; $object->note_public .= dol_print_date($elementobject->date, 'day', '', $outputlangs); - $object->note_public .= '
'; + $object->note_public .= '
'; } } elseif (count($objects) == 1) { $elementobject = array_shift($objects); @@ -2321,8 +2321,8 @@ function pdf_getLinkedObjects(&$object, $outputlangs) if (count($objects) > 1) { $order = null; - if (empty($object->linkedObjects['commande']) && $object->element != 'commande') $object->note_public .= '
'.$outputlangs->transnoentities("RefOrder").' / '.$outputlangs->transnoentities("RefSending").' :
'; - else $object->note_public .= '
'.$outputlangs->transnoentities("RefSending").' :
'; + if (empty($object->linkedObjects['commande']) && $object->element != 'commande') $object->note_public .= '
'.$outputlangs->transnoentities("RefOrder").' / '.$outputlangs->transnoentities("RefSending").' :
'; + else $object->note_public .= '
'.$outputlangs->transnoentities("RefSending").' :
'; // We concat this record info into fields xxx_value. title is overwrote. foreach ($objects as $elementobject) { if (empty($object->linkedObjects['commande']) && $object->element != 'commande') { // There is not already a link to order and object is not the order, so we show also info with order @@ -2339,11 +2339,11 @@ function pdf_getLinkedObjects(&$object, $outputlangs) if (! is_object($order)) { $object->note_public .= $outputlangs->transnoentities($elementobject->ref); - $object->note_public .= '
'; + $object->note_public .= '
'; } else { $object->note_public .= $outputlangs->convToOutputCharset($order->ref).($order->ref_client ? ' ('.$order->ref_client.')' : ''); $object->note_public .= ' / '.$outputlangs->transnoentities($elementobject->ref); - $object->note_public .= '
'; + $object->note_public .= '
'; } } } elseif (count($objects) == 1) { From 2fab637b9211a2e94fd7c90b112f8549b9b0a488 Mon Sep 17 00:00:00 2001 From: Quentin VIAL-GOUTEYRON Date: Tue, 3 Aug 2021 11:26:57 +0200 Subject: [PATCH 6/9] add dol_concatdesc --- htdocs/core/lib/pdf.lib.php | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php index 8d56c50ae79..1f6bd167671 100644 --- a/htdocs/core/lib/pdf.lib.php +++ b/htdocs/core/lib/pdf.lib.php @@ -2286,12 +2286,12 @@ function pdf_getLinkedObjects(&$object, $outputlangs) $outputlangs->load('orders'); if (count($objects) > 1) { - $object->note_public .= '
'.$outputlangs->transnoentities("RefOrder").' :
'; + $object->note_public .= dol_concatdesc($object->note_public,'
'.$outputlangs->transnoentities("RefOrder").' :
'); foreach ($objects as $elementobject) { - $object->note_public .= $outputlangs->transnoentities($elementobject->ref).($elementobject->ref_client ? ' ('.$elementobject->ref_client.')' : '').($elementobject->ref_supplier ? ' ('.$elementobject->ref_supplier.')' : '').' '; - $object->note_public .= $outputlangs->transnoentities("OrderDate").' : '; - $object->note_public .= dol_print_date($elementobject->date, 'day', '', $outputlangs); - $object->note_public .= '
'; + $object->note_public .= dol_concatdesc($object->note_public,$outputlangs->transnoentities($elementobject->ref).($elementobject->ref_client ? ' ('.$elementobject->ref_client.')' : '').($elementobject->ref_supplier ? ' ('.$elementobject->ref_supplier.')' : '').' '); + $object->note_public .= dol_concatdesc($object->note_public,$outputlangs->transnoentities("OrderDate").' : '); + $object->note_public .= dol_concatdesc($object->note_public,dol_print_date($elementobject->date, 'day', '', $outputlangs)); + $object->note_public .= dol_concatdesc($object->note_public,'
'); } } elseif (count($objects) == 1) { $elementobject = array_shift($objects); @@ -2321,8 +2321,8 @@ function pdf_getLinkedObjects(&$object, $outputlangs) if (count($objects) > 1) { $order = null; - if (empty($object->linkedObjects['commande']) && $object->element != 'commande') $object->note_public .= '
'.$outputlangs->transnoentities("RefOrder").' / '.$outputlangs->transnoentities("RefSending").' :
'; - else $object->note_public .= '
'.$outputlangs->transnoentities("RefSending").' :
'; + if (empty($object->linkedObjects['commande']) && $object->element != 'commande') $object->note_public .= dol_concatdesc($object->note_public,'
'.$outputlangs->transnoentities("RefOrder").' / '.$outputlangs->transnoentities("RefSending").' :
'); + else $object->note_public .= dol_concatdesc($object->note_public,'
'.$outputlangs->transnoentities("RefSending").' :
'); // We concat this record info into fields xxx_value. title is overwrote. foreach ($objects as $elementobject) { if (empty($object->linkedObjects['commande']) && $object->element != 'commande') { // There is not already a link to order and object is not the order, so we show also info with order @@ -2338,12 +2338,12 @@ function pdf_getLinkedObjects(&$object, $outputlangs) } if (! is_object($order)) { - $object->note_public .= $outputlangs->transnoentities($elementobject->ref); - $object->note_public .= '
'; + $object->note_public .= dol_concatdesc($object->note_public,$outputlangs->transnoentities($elementobject->ref)); + $object->note_public .= dol_concatdesc($object->note_public,'
'); } else { - $object->note_public .= $outputlangs->convToOutputCharset($order->ref).($order->ref_client ? ' ('.$order->ref_client.')' : ''); - $object->note_public .= ' / '.$outputlangs->transnoentities($elementobject->ref); - $object->note_public .= '
'; + $object->note_public .= dol_concatdesc($object->note_public,$outputlangs->convToOutputCharset($order->ref).($order->ref_client ? ' ('.$order->ref_client.')' : '')); + $object->note_public .= dol_concatdesc($object->note_public,' / '.$outputlangs->transnoentities($elementobject->ref)); + $object->note_public .= dol_concatdesc($object->note_public,'
'); } } } elseif (count($objects) == 1) { From 9d2552e77b3e8bf1c4c24a5dfd703256ba7a1179 Mon Sep 17 00:00:00 2001 From: stickler-ci Date: Tue, 3 Aug 2021 09:29:25 +0000 Subject: [PATCH 7/9] Fixing style errors. --- htdocs/core/lib/pdf.lib.php | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php index 1f6bd167671..ca17b6a0d39 100644 --- a/htdocs/core/lib/pdf.lib.php +++ b/htdocs/core/lib/pdf.lib.php @@ -2286,12 +2286,12 @@ function pdf_getLinkedObjects(&$object, $outputlangs) $outputlangs->load('orders'); if (count($objects) > 1) { - $object->note_public .= dol_concatdesc($object->note_public,'
'.$outputlangs->transnoentities("RefOrder").' :
'); + $object->note_public .= dol_concatdesc($object->note_public, '
'.$outputlangs->transnoentities("RefOrder").' :
'); foreach ($objects as $elementobject) { - $object->note_public .= dol_concatdesc($object->note_public,$outputlangs->transnoentities($elementobject->ref).($elementobject->ref_client ? ' ('.$elementobject->ref_client.')' : '').($elementobject->ref_supplier ? ' ('.$elementobject->ref_supplier.')' : '').' '); - $object->note_public .= dol_concatdesc($object->note_public,$outputlangs->transnoentities("OrderDate").' : '); - $object->note_public .= dol_concatdesc($object->note_public,dol_print_date($elementobject->date, 'day', '', $outputlangs)); - $object->note_public .= dol_concatdesc($object->note_public,'
'); + $object->note_public .= dol_concatdesc($object->note_public, $outputlangs->transnoentities($elementobject->ref).($elementobject->ref_client ? ' ('.$elementobject->ref_client.')' : '').($elementobject->ref_supplier ? ' ('.$elementobject->ref_supplier.')' : '').' '); + $object->note_public .= dol_concatdesc($object->note_public, $outputlangs->transnoentities("OrderDate").' : '); + $object->note_public .= dol_concatdesc($object->note_public, dol_print_date($elementobject->date, 'day', '', $outputlangs)); + $object->note_public .= dol_concatdesc($object->note_public, '
'); } } elseif (count($objects) == 1) { $elementobject = array_shift($objects); @@ -2321,8 +2321,8 @@ function pdf_getLinkedObjects(&$object, $outputlangs) if (count($objects) > 1) { $order = null; - if (empty($object->linkedObjects['commande']) && $object->element != 'commande') $object->note_public .= dol_concatdesc($object->note_public,'
'.$outputlangs->transnoentities("RefOrder").' / '.$outputlangs->transnoentities("RefSending").' :
'); - else $object->note_public .= dol_concatdesc($object->note_public,'
'.$outputlangs->transnoentities("RefSending").' :
'); + if (empty($object->linkedObjects['commande']) && $object->element != 'commande') $object->note_public .= dol_concatdesc($object->note_public, '
'.$outputlangs->transnoentities("RefOrder").' / '.$outputlangs->transnoentities("RefSending").' :
'); + else $object->note_public .= dol_concatdesc($object->note_public, '
'.$outputlangs->transnoentities("RefSending").' :
'); // We concat this record info into fields xxx_value. title is overwrote. foreach ($objects as $elementobject) { if (empty($object->linkedObjects['commande']) && $object->element != 'commande') { // There is not already a link to order and object is not the order, so we show also info with order @@ -2338,12 +2338,12 @@ function pdf_getLinkedObjects(&$object, $outputlangs) } if (! is_object($order)) { - $object->note_public .= dol_concatdesc($object->note_public,$outputlangs->transnoentities($elementobject->ref)); - $object->note_public .= dol_concatdesc($object->note_public,'
'); + $object->note_public .= dol_concatdesc($object->note_public, $outputlangs->transnoentities($elementobject->ref)); + $object->note_public .= dol_concatdesc($object->note_public, '
'); } else { - $object->note_public .= dol_concatdesc($object->note_public,$outputlangs->convToOutputCharset($order->ref).($order->ref_client ? ' ('.$order->ref_client.')' : '')); - $object->note_public .= dol_concatdesc($object->note_public,' / '.$outputlangs->transnoentities($elementobject->ref)); - $object->note_public .= dol_concatdesc($object->note_public,'
'); + $object->note_public .= dol_concatdesc($object->note_public, $outputlangs->convToOutputCharset($order->ref).($order->ref_client ? ' ('.$order->ref_client.')' : '')); + $object->note_public .= dol_concatdesc($object->note_public, ' / '.$outputlangs->transnoentities($elementobject->ref)); + $object->note_public .= dol_concatdesc($object->note_public, '
'); } } } elseif (count($objects) == 1) { From 96bdd6168480bb0e1a71ca98c4953ea5905fd721 Mon Sep 17 00:00:00 2001 From: Christophe Battarel Date: Mon, 11 Oct 2021 17:36:31 +0200 Subject: [PATCH 8/9] NEW : add constant TICKETS_MESSAGE_FORCE_MAIL --- htdocs/core/class/html.formticket.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/class/html.formticket.class.php b/htdocs/core/class/html.formticket.class.php index a4b18470be4..5ce2dd0fca7 100644 --- a/htdocs/core/class/html.formticket.class.php +++ b/htdocs/core/class/html.formticket.class.php @@ -1232,7 +1232,7 @@ class FormTicket // External users can't send message email if ($user->rights->ticket->write && !$user->socid) { print ''; - $checkbox_selected = (GETPOST('send_email') == "1" ? ' checked' : ''); + $checkbox_selected = (GETPOST('send_email') == "1" ? ' checked' : ($conf->global->TICKETS_MESSAGE_FORCE_MAIL?'checked':'')); print ' '; print ''; print ''; From bac0c3d7c850f22b7fdd33b958b07c00692f4a49 Mon Sep 17 00:00:00 2001 From: lmarcouiller Date: Tue, 12 Oct 2021 11:30:35 +0200 Subject: [PATCH 9/9] Fix fatal error on php 8.0 --- htdocs/eventorganization/class/conferenceorbooth.class.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/htdocs/eventorganization/class/conferenceorbooth.class.php b/htdocs/eventorganization/class/conferenceorbooth.class.php index 6d0c77dc768..90462fdb762 100644 --- a/htdocs/eventorganization/class/conferenceorbooth.class.php +++ b/htdocs/eventorganization/class/conferenceorbooth.class.php @@ -238,9 +238,10 @@ class ConferenceOrBooth extends ActionComm * @param string $ref Ref * @param string $ref_ext Ref ext to get * @param string $email_msgid Email msgid + * @param int $loadresources 1=Load also resources * @return int <0 if KO, 0 if not found, >0 if OK */ - public function fetch($id, $ref = null, $ref_ext = '', $email_msgid = '') + public function fetch($id, $ref = null, $ref_ext = '', $email_msgid = '', $loadresources = 1) { global $dolibarr_main_url_root, $conf, $langs;