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

Fix: Concat html strings

Browse Source
This commit is contained in:
Laurent Destailleur 2011-04-07 07:52:19 +00:00
parent d4cf4e7582
commit 58570403cb
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
htdocs/comm/propal.php
View File

@ -704,7 +704,7 @@ if ($_POST['action'] == "addline" && $user->rights->propale->creer)
} }
$desc = $prod->description; $desc = $prod->description;
$desc.= ($prod->description && $_POST['np_desc']) ? "\n" : ""; $desc.= ($prod->description && $_POST['np_desc']) ? ((dol_textishtml($prod->description) || dol_textishtml($_POST['np_desc']))?"<br />\n":"\n") : "";
$desc.= $_POST['np_desc']; $desc.= $_POST['np_desc'];
$type = $prod->type; $type = $prod->type;
} }
@ -1112,7 +1112,7 @@ if ($id > 0 || ! empty($ref))
print '</td>'; print '</td>';
print '</tr>'; print '</tr>';
$rowspan=10; $rowspan=9;
// Company // Company
print '<tr><td>'.$langs->trans('Company').'</td><td colspan="5">'.$soc->getNomUrl(1).'</td>'; print '<tr><td>'.$langs->trans('Company').'</td><td colspan="5">'.$soc->getNomUrl(1).'</td>';
@ -1504,11 +1504,11 @@ if ($id > 0 || ! empty($ref))
if ($_GET['action'] != 'statut' && $_GET['action'] <> 'editline') if ($_GET['action'] != 'statut' && $_GET['action'] <> 'editline')
{ {
// Valid // Validate
if ($object->statut == 0 && $user->rights->propale->valider && sizeof($object->lines) > 0) if ($object->statut == 0 && $user->rights->propale->valider)
{ {
print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=validate"'; if (sizeof($object->lines) > 0) print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=validate">'.$langs->trans('Validate').'</a>';
print '>'.$langs->trans('Validate').'</a>'; else print '<a class="butActionRefused" href="#">'.$langs->trans('Validate').'</a>';
} }
// Edit // Edit

2
htdocs/commande/fiche.php
View File

@ -522,7 +522,7 @@ if ($_POST['action'] == 'addline' && $user->rights->commande->creer)
} }
$desc = $prod->description; $desc = $prod->description;
$desc.= ($prod->description && $_POST['np_desc']) ? ((dol_textishtml($prod->description) || dol_textishtml($_POST['np_desc']))?"<br>":"\n") : ""; $desc.= ($prod->description && $_POST['np_desc']) ? ((dol_textishtml($prod->description) || dol_textishtml($_POST['np_desc']))?"<br />\n":"\n") : "";
$desc.= $_POST['np_desc']; $desc.= $_POST['np_desc'];
$type = $prod->type; $type = $prod->type;
} }

4
htdocs/compta/facture.php
View File

@ -878,7 +878,7 @@ if (($_POST['action'] == 'addline' || $_POST['action'] == 'addline_predef') && $
} }
$desc = $prod->description; $desc = $prod->description;
$desc.= ($prod->description && $_POST['np_desc']) ? "\n" : ""; $desc.= ($prod->description && $_POST['np_desc']) ? ((dol_textishtml($prod->description) || dol_textishtml($_POST['np_desc']))?"<br />\n":"\n") : "";
$desc.= $_POST['np_desc']; $desc.= $_POST['np_desc'];
if (! empty($prod->customcode) || ! empty($prod->country_code)) if (! empty($prod->customcode) || ! empty($prod->country_code))
{ {
@ -887,7 +887,7 @@ if (($_POST['action'] == 'addline' || $_POST['action'] == 'addline_predef') && $
if (! empty($prod->customcode) && ! empty($prod->country_code)) $tmptxt.=' - '; if (! empty($prod->customcode) && ! empty($prod->country_code)) $tmptxt.=' - ';
if (! empty($prod->country_code)) $tmptxt.=$langs->transnoentitiesnoconv("CountryOrigin").': '.getCountry($prod->country_code,0,$db,$langs,0); if (! empty($prod->country_code)) $tmptxt.=$langs->transnoentitiesnoconv("CountryOrigin").': '.getCountry($prod->country_code,0,$db,$langs,0);
$tmptxt.=')'; $tmptxt.=')';
$desc.="\n".$tmptxt; $desc.= (dol_textishtml($desc)?"<br />\n":"\n").$tmptxt;
} }
$type = $prod->type; $type = $prod->type;
} }