lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixing style errors.

Browse Source
This commit is contained in:
stickler-ci 2021-06-10 12:28:26 +00:00
parent 1d279dedaa
commit aae636bdc7
1 changed files with 66 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
htdocs/core/lib/pdf.lib.php
View File

@ -2285,24 +2285,22 @@ function pdf_getLinkedObjects(&$object, $outputlangs)
} elseif ($objecttype == 'commande' || $objecttype == 'supplier_order') { } elseif ($objecttype == 'commande' || $objecttype == 'supplier_order') {
$outputlangs->load('orders'); $outputlangs->load('orders');
if(count($objects) > 1) { if (count($objects) > 1) {
$object->note_public .= '<br/>'.$outputlangs->transnoentities("RefOrder").' : <br/>'; $object->note_public .= '<br/>'.$outputlangs->transnoentities("RefOrder").' : <br/>';
foreach($objects as $elementobject) { 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($elementobject->ref).($elementobject->ref_client ? ' ('.$elementobject->ref_client.')' : '').($elementobject->ref_supplier ? ' ('.$elementobject->ref_supplier.')' : '').' ';
$object->note_public .= $outputlangs->transnoentities("OrderDate").' : '; $object->note_public .= $outputlangs->transnoentities("OrderDate").' : ';
$object->note_public .= dol_print_date($elementobject->date, 'day', '', $outputlangs); $object->note_public .= dol_print_date($elementobject->date, 'day', '', $outputlangs);
$object->note_public .= '<br/>'; $object->note_public .= '<br/>';
} }
} elseif(count($objects) == 1) { } elseif (count($objects) == 1) {
$elementobject = array_shift($objects); $elementobject = array_shift($objects);
$linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("RefOrder"); $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]['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_title'] = $outputlangs->transnoentities("OrderDate");
$linkedobjects[$objecttype]['date_value'] = dol_print_date($elementobject->date, 'day', '', $outputlangs); $linkedobjects[$objecttype]['date_value'] = dol_print_date($elementobject->date, 'day', '', $outputlangs);
} }
} } elseif ($objecttype == 'contrat') {
elseif ($objecttype == 'contrat')
{
$outputlangs->load('contracts'); $outputlangs->load('contracts');
foreach ($objects as $elementobject) { foreach ($objects as $elementobject) {
$linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("RefContract"); $linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("RefContract");
@ -2321,62 +2319,56 @@ function pdf_getLinkedObjects(&$object, $outputlangs)
} elseif ($objecttype == 'shipping') { } elseif ($objecttype == 'shipping') {
$outputlangs->loadLangs(array("orders", "sendings")); $outputlangs->loadLangs(array("orders", "sendings"));
if(count($objects) > 1) { if (count($objects) > 1) {
$order = null; $order = null;
if(empty($object->linkedObjects['commande']) && $object->element != 'commande') $object->note_public .= '<br/>'.$outputlangs->transnoentities("RefOrder").' / '.$outputlangs->transnoentities("RefSending").' : <br/>'; if (empty($object->linkedObjects['commande']) && $object->element != 'commande') $object->note_public .= '<br/>'.$outputlangs->transnoentities("RefOrder").' / '.$outputlangs->transnoentities("RefSending").' : <br/>';
else $object->note_public .= '<br/>'.$outputlangs->transnoentities("RefSending").' : <br/>'; else $object->note_public .= '<br/>'.$outputlangs->transnoentities("RefSending").' : <br/>';
// We concat this record info into fields xxx_value. title is overwrote. // We concat this record info into fields xxx_value. title is overwrote.
foreach($objects as $elementobject) { 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 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); $elementobject->fetchObjectLinked(null, '', null, '', 'OR', 1, 'sourcetype', 0);
if(! empty($elementobject->linkedObjectsIds['commande'])) { if (! empty($elementobject->linkedObjectsIds['commande'])) {
include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php'; include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
$order = new Commande($db); $order = new Commande($db);
$ret = $order->fetch(reset($elementobject->linkedObjectsIds['commande'])); $ret = $order->fetch(reset($elementobject->linkedObjectsIds['commande']));
if($ret < 1) { if ($ret < 1) {
$order = null; $order = null;
} }
} }
} }
if(! is_object($order)) { if (! is_object($order)) {
$object->note_public .= $outputlangs->transnoentities($elementobject->ref); $object->note_public .= $outputlangs->transnoentities($elementobject->ref);
$object->note_public .= '<br/>'; $object->note_public .= '<br/>';
} } else {
else {
$object->note_public .= $outputlangs->convToOutputCharset($order->ref).($order->ref_client ? ' ('.$order->ref_client.')' : ''); $object->note_public .= $outputlangs->convToOutputCharset($order->ref).($order->ref_client ? ' ('.$order->ref_client.')' : '');
$object->note_public .= ' / '.$outputlangs->transnoentities($elementobject->ref); $object->note_public .= ' / '.$outputlangs->transnoentities($elementobject->ref);
$object->note_public .= '<br/>'; $object->note_public .= '<br/>';
} }
} }
} } elseif (count($objects) == 1) {
elseif(count($objects) == 1) {
$elementobject = array_shift($objects); $elementobject = array_shift($objects);
$order = null; $order = null;
// We concat this record info into fields xxx_value. title is overwrote. // 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 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); $elementobject->fetchObjectLinked(null, '', null, '', 'OR', 1, 'sourcetype', 0);
if(! empty($elementobject->linkedObjectsIds['commande'])) { if (! empty($elementobject->linkedObjectsIds['commande'])) {
include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php'; include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
$order = new Commande($db); $order = new Commande($db);
$ret = $order->fetch(reset($elementobject->linkedObjectsIds['commande'])); $ret = $order->fetch(reset($elementobject->linkedObjectsIds['commande']));
if($ret < 1) { if ($ret < 1) {
$order = null; $order = null;
} }
} }
} }
if(! is_object($order)) { if (! is_object($order)) {
$linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("RefSending"); $linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("RefSending");
if(! empty($linkedobjects[$objecttype]['ref_value'])) $linkedobjects[$objecttype]['ref_value'] .= ' / '; if (! empty($linkedobjects[$objecttype]['ref_value'])) $linkedobjects[$objecttype]['ref_value'] .= ' / ';
$linkedobjects[$objecttype]['ref_value'] .= $outputlangs->transnoentities($elementobject->ref); $linkedobjects[$objecttype]['ref_value'] .= $outputlangs->transnoentities($elementobject->ref);
} } else {
else {
$linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("RefOrder").' / '.$outputlangs->transnoentities("RefSending"); $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.')' : ''); 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]['ref_value'] .= ' / '.$outputlangs->transnoentities($elementobject->ref);
} }
} }