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

Fix: [ bug #1425 ]

Browse Source
This commit is contained in:
Laurent Destailleur 2014-06-20 13:38:44 +02:00
parent f7654107f9
commit fcb00b2024
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -29,6 +29,7 @@ Fix: If multiprice level is used the VAT on addline is not correct
Fix: [ bug #1254 ] Error when using "Enter" on qty input box of a product (on supplier order part)
Fix: [ bug #1462, 1468, 1480, 1483, 1490, 1497] $this instead of $object
Fix: [ bug #1455 ] outstanding amount
Fix: [ bug #1425 ]
***** ChangeLog for 3.5.3 compared to 3.5.2 *****
Fix: Error on field accountancy code for export profile of invoices.

2
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
View File

@ -606,7 +606,7 @@ class pdf_einstein extends ModelePDFCommandes
}*/
// Show planed date of delivery
if ($object->date_livraison)
if (! empty($object->date_livraison))
{
$outputlangs->load("sendings");
$pdf->SetFont('','B', $default_font_size - 2);

2
htdocs/core/modules/propale/doc/pdf_azur.modules.php
View File

@ -618,7 +618,7 @@ class pdf_azur extends ModelePDFPropales
$posxval=52;
// Show shipping date
if ($object->date_livraison)
if (! empty($object->date_livraison))
{
$outputlangs->load("sendings");
$pdf->SetFont('','B', $default_font_size - 2);

7
htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
View File

@ -909,6 +909,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
$outputlangs->load("bills");
$outputlangs->load("orders");
$outputlangs->load("companies");
$outputlangs->load("sendings");
$default_font_size = pdf_getPDFFontSize($outputlangs);
@ -979,11 +980,10 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
$posy+=5;
$pdf->SetXY($posx,$posy);
if ($object->date_commande)
if (! empty($object->date_commande))
{
$pdf->SetTextColor(0,0,60);
$pdf->MultiCell(100, 3, $outputlangs->transnoentities("OrderDate")." : " . dol_print_date($object->date_commande,"day",false,$outputlangs,true), '', 'R');
$pdf->MultiCell(190, 3, $outputlangs->transnoentities("DateDeliveryPlanned")." : " . dol_print_date($object->date_livraison,"day",false,$outputlangs,true), '', 'R');
}
else
{
@ -991,6 +991,9 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
$pdf->MultiCell(100, 3, $outputlangs->transnoentities("OrderToProcess"), '', 'R');
}
$pdf->SetTextColor(0,0,60);
if (! empty($object->date_livraison)) $pdf->MultiCell(190, 3, $outputlangs->transnoentities("DateDeliveryPlanned")." : " . dol_print_date($object->date_livraison,"day",false,$outputlangs,true), '', 'R');
$posy+=5;
$pdf->SetTextColor(0,0,60);