diff --git a/htdocs/core/boxes/box_shipments.php b/htdocs/core/boxes/box_shipments.php index 278ad974cf5..8908f52640c 100644 --- a/htdocs/core/boxes/box_shipments.php +++ b/htdocs/core/boxes/box_shipments.php @@ -133,7 +133,7 @@ class box_shipments extends ModeleBoxes $societestatic->logo = $objp->logo; $this->info_box_contents[$line][] = array( - 'td' => '', + 'td' => 'class="nowraponall"', 'text' => $shipmentstatic->getNomUrl(1), 'asis' => 1, ); @@ -145,7 +145,7 @@ class box_shipments extends ModeleBoxes ); $this->info_box_contents[$line][] = array( - 'td' => '', + 'td' => 'class="nowraponall"', 'text' => $orderstatic->getNomUrl(1), 'asis' => 1, ); diff --git a/scripts/website/migrate-news-joomla2dolibarr.php b/scripts/website/migrate-news-joomla2dolibarr.php index 30c166aa594..b4399ba0885 100755 --- a/scripts/website/migrate-news-joomla2dolibarr.php +++ b/scripts/website/migrate-news-joomla2dolibarr.php @@ -44,6 +44,7 @@ $image = 'image/__WEBSITE_KEY__/images/stories/dolibarr.png'; $max = (!isset($argv[4]) || (empty($argv[4]) && $argv[4] !== '0')) ? '10' : $argv[4]; $excludeid = (empty($argv[5]) ? '' : $argv[5]); +$forcelang = (empty($argv[6]) ? '' : $argv[6]); if (empty($argv[3]) || !in_array($argv[1], array('test', 'confirm')) || empty($websiteref)) { print '***** '.$script_file.' *****'."\n"; @@ -136,7 +137,7 @@ while ($obj = $dbjoomla->fetch_object($resql)) { } if ($blogpostfooter) $htmltext .= "\n".$blogpostfooter; - $language = ($obj->language && $obj->language != '*' ? $obj->language : 'en'); + $language = ($forcelang ? $forcelang : ($obj->language && $obj->language != '*' ? $obj->language : 'en')); $keywords = $obj->metakey; $author_alias = $obj->username;