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

Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0

Browse Source 
Conflicts:
	htdocs/core/tpl/advtarget.tpl.php
This commit is contained in:
Laurent Destailleur 2020-10-30 03:31:04 +01:00
commit 263b679af4
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/core/class/hookmanager.class.php
View File

@ -166,6 +166,7 @@ class HookManager
'doActions',
'doMassActions',
'formatEvent',
'formConfirm',
'formCreateThirdpartyOptions',
'formObjectOptions',
'formattachOptions',

4
htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
View File

@ -664,11 +664,11 @@ class pdf_typhon extends ModelePDFDeliveryOrder
$larg_sign = ($this->page_largeur-$this->marge_gauche-$this->marge_droite)/3;
$pdf->Rect($this->marge_gauche, $posy + 1, $larg_sign, 25);
$pdf->SetXY($this->marge_gauche + 2, $posy + 2);
$pdf->MultiCell($larg_sign, 2, $outputlangs->trans("For").' '.$outputlangs->convToOutputCharset($mysoc->name).":", '', 'L');
$pdf->MultiCell($larg_sign, 2, $outputlangs->transnoentities("For") . ' ' . $outputlangs->convToOutputCharset($mysoc->name) . ":", '', 'L');
$pdf->Rect(2*$larg_sign+$this->marge_gauche, $posy + 1, $larg_sign, 25);
$pdf->SetXY(2*$larg_sign+$this->marge_gauche + 2, $posy + 2);
$pdf->MultiCell($larg_sign, 2, $outputlangs->trans("ForCustomer").':', '', 'L');
$pdf->MultiCell($larg_sign, 2, $outputlangs->transnoentities("ForCustomer") . ':', '', 'L');
}
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore

5
htdocs/core/tpl/advtarget.tpl.php
View File

@ -76,7 +76,7 @@ print '<input type="button" name="savefilter" id="savefilter" value="'.$langs->t
print '</td><td>' . "\n";
print '</td></tr>' . "\n";
print '<tr><td>' . $langs->trans('AdvTgtOrCreateNewFilter') . '</td><td>';
print '<tr><td>'.$langs->trans('AdvTgtOrCreateNewFilter').'</td><td>';
print '<input type="text" name="template_name" id="template_name" value=""/>';
print '<input type="button" name="createfilter" id="createfilter" value="'.$langs->trans('AdvTgtCreateFilter').'" class="button"/>';
print '</td><td>'."\n";
@ -510,14 +510,11 @@ if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) {
print $formadvtargetemaling->advMultiselectarraySelllist('options_'.$key.'_cnct', $extrafields->attributes[$key]['param']['options'], $array_query['options_'.$key.'_cnct']);
print '</td><td>'."\n";
} else {
print '<table class="nobordernopadding"><tr>';
print '<td></td><td>';
if (is_array($array_query['options_'.$key.'_cnct'])) {
print $extrafields->showInputField($key, implode(',', $array_query['options_'.$key.'_cnct']), '', '_cnct');
} else {
print $extrafields->showInputField($key, $array_query['options_'.$key.'_cnct'], '', '_cnct');
}
print '</td></tr></table>';
print '</td><td>'."\n";
}
print '</td></tr>'."\n";