Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 19.0
This commit is contained in:
commit
f097217c38
2 changed files with 17 additions and 4 deletions
|
|
@ -1236,6 +1236,10 @@ class pdf_cornas extends ModelePDFSuppliersOrders
|
|||
$pdf->SetXY($posx, $posy);
|
||||
$pdf->SetTextColor(0, 0, 60);
|
||||
$title = $outputlangs->transnoentities("SupplierOrder")." ".$outputlangs->convToOutputCharset($object->ref);
|
||||
if ($object->status == $object::STATUS_DRAFT) {
|
||||
$pdf->SetTextColor(128, 0, 0);
|
||||
$title .= ' - '.$outputlangs->transnoentities("NotValidated");
|
||||
}
|
||||
$pdf->MultiCell($w, 3, $title, '', 'R');
|
||||
$posy += 1;
|
||||
|
||||
|
|
@ -1277,12 +1281,15 @@ class pdf_cornas extends ModelePDFSuppliersOrders
|
|||
$pdf->SetXY($posx, $posy);
|
||||
$pdf->SetTextColor(0, 0, 60);
|
||||
$pdf->MultiCell($w, 3, $outputlangs->transnoentities("OrderDate")." : ".dol_print_date($object->date_commande, "day", false, $outputlangs, true), '', 'R');
|
||||
} else {
|
||||
}
|
||||
// no point in having this here this a document sent to supplier
|
||||
/*} else {
|
||||
$posy += 5;
|
||||
$pdf->SetXY($posx, $posy);
|
||||
$pdf->SetTextColor(255, 0, 0);
|
||||
$pdf->MultiCell($w, 3, $outputlangs->transnoentities("OrderToProcess"), '', 'R');
|
||||
}
|
||||
}*/
|
||||
|
||||
|
||||
$pdf->SetTextColor(0, 0, 60);
|
||||
$usehourmin = 'day';
|
||||
|
|
|
|||
|
|
@ -1159,6 +1159,10 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
|
|||
$pdf->SetXY($posx, $posy);
|
||||
$pdf->SetTextColor(0, 0, 60);
|
||||
$title = $outputlangs->transnoentities("SupplierOrder")." ".$outputlangs->convToOutputCharset($object->ref);
|
||||
if ($object->status == $object::STATUS_DRAFT) {
|
||||
$pdf->SetTextColor(128, 0, 0);
|
||||
$title .= ' - '.$outputlangs->transnoentities("NotValidated");
|
||||
}
|
||||
$pdf->MultiCell($w, 3, $title, '', 'R');
|
||||
$posy += 1;
|
||||
|
||||
|
|
@ -1200,12 +1204,14 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
|
|||
$pdf->SetXY($posx, $posy);
|
||||
$pdf->SetTextColor(0, 0, 60);
|
||||
$pdf->MultiCell($w, 3, $outputlangs->transnoentities("OrderDate")." : ".dol_print_date($object->date_commande, "day", false, $outputlangs, true), '', 'R');
|
||||
} else {
|
||||
}
|
||||
// no point in having this here this a document sent to supplier
|
||||
/*} else {
|
||||
$posy += 5;
|
||||
$pdf->SetXY($posx, $posy);
|
||||
$pdf->SetTextColor(255, 0, 0);
|
||||
$pdf->MultiCell($w, 3, $outputlangs->transnoentities("OrderToProcess"), '', 'R');
|
||||
}
|
||||
}*/
|
||||
|
||||
$pdf->SetTextColor(0, 0, 60);
|
||||
$usehourmin = 'day';
|
||||
|
|
|
|||
Loading…
Reference in a new issue