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

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

Browse Source
This commit is contained in:
Laurent Destailleur 2019-07-30 22:03:13 +02:00
commit 9baf21f492
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/core/class/commonobject.class.php
View File

@ -5957,6 +5957,12 @@ abstract class CommonObject
$type='link'; $type='link';
$param['options']=array($reg[1].':'.$reg[2]=>$reg[1].':'.$reg[2]); $param['options']=array($reg[1].':'.$reg[2]=>$reg[1].':'.$reg[2]);
} }
elseif(preg_match('/^sellist:(.*):(.*):(.*):(.*)/i', $val['type'], $reg)) {
$param['options'] = array($reg[1] . ':' . $reg[2] . ':' . $reg[3] . ':' . $reg[4] => 'N');
$type = 'sellist';
}
$langfile=$val['langfile']; $langfile=$val['langfile'];
$list=$val['list']; $list=$val['list'];
$help=$val['help']; $help=$val['help'];

2
htdocs/core/modules/cheque/doc/pdf_blochet.class.php
View File

@ -247,7 +247,7 @@ class BordereauChequeBlochet extends ModeleChequeReceipts
$pdf->MultiCell(22,2,$outputlangs->transnoentities("Owner"),0,'L'); $pdf->MultiCell(22,2,$outputlangs->transnoentities("Owner"),0,'L');
$pdf->SetFont('','', $default_font_size); $pdf->SetFont('','', $default_font_size);
$pdf->SetXY(32,26); $pdf->SetXY(32,26);
$pdf->MultiCell(60,2,$outputlangs->convToOutputCharset($this->account->proprio),0,'L'); $pdf->MultiCell(80,2,$outputlangs->convToOutputCharset($this->account->proprio),0,'L');
$pdf->SetFont('','', $default_font_size); $pdf->SetFont('','', $default_font_size);
$pdf->SetXY(10,32); $pdf->SetXY(10,32);