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

Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2020-05-24 18:04:26 +02:00
commit 84ec747109
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/core/boxes/box_shipments.php
View File

@ -133,7 +133,7 @@ class box_shipments extends ModeleBoxes
$societestatic->logo = $objp->logo; $societestatic->logo = $objp->logo;
$this->info_box_contents[$line][] = array( $this->info_box_contents[$line][] = array(
'td' => '', 'td' => 'class="nowraponall"',
'text' => $shipmentstatic->getNomUrl(1), 'text' => $shipmentstatic->getNomUrl(1),
'asis' => 1, 'asis' => 1,
); );
@ -145,7 +145,7 @@ class box_shipments extends ModeleBoxes
); );
$this->info_box_contents[$line][] = array( $this->info_box_contents[$line][] = array(
'td' => '', 'td' => 'class="nowraponall"',
'text' => $orderstatic->getNomUrl(1), 'text' => $orderstatic->getNomUrl(1),
'asis' => 1, 'asis' => 1,
); );

3
scripts/website/migrate-news-joomla2dolibarr.php
View File

@ -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]; $max = (!isset($argv[4]) || (empty($argv[4]) && $argv[4] !== '0')) ? '10' : $argv[4];
$excludeid = (empty($argv[5]) ? '' : $argv[5]); $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)) { if (empty($argv[3]) || !in_array($argv[1], array('test', 'confirm')) || empty($websiteref)) {
print '***** '.$script_file.' *****'."\n"; print '***** '.$script_file.' *****'."\n";
@ -136,7 +137,7 @@ while ($obj = $dbjoomla->fetch_object($resql)) {
} }
if ($blogpostfooter) $htmltext .= "\n".$blogpostfooter; 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; $keywords = $obj->metakey;
$author_alias = $obj->username; $author_alias = $obj->username;