Browse Source

Merge pull request #3320 from fmarcet/3.7

Fix: Not showing delivery date on rouget pdf (expedition)
Laurent Destailleur 10 years ago
parent
commit
bd4a31c45d
2 changed files with 2 additions and 1 deletions
  1. 1 0
      ChangeLog
  2. 1 1
      htdocs/core/modules/expedition/doc/pdf_rouget.modules.php

+ 1 - 0
ChangeLog

@@ -16,6 +16,7 @@ FIX [ bug #3055 ] Product image thumbnails were not deleted after deleting the i
 FIX [ bug 1634 ] Error deleting a project when it had many linked objects
 FIX [ bug 1925 ] "Link to order" option in supplier invoices is not working properly
 FIX [ bug #3198 ] Trigger LINECONTRACT_INSERT passes Contrat as $object instead of ContratLigne
+FIX: Not showing delivery date on rouget pdf
 
 NEW: Created new ContratLigne::insert function
 

+ 1 - 1
htdocs/core/modules/expedition/doc/pdf_rouget.modules.php

@@ -544,7 +544,7 @@ class pdf_rouget extends ModelePdfExpedition
 		$posy+=4;
 		$pdf->SetXY($posx,$posy);
 		$pdf->SetTextColor(0,0,60);
-		$pdf->MultiCell(100, 4, $outputlangs->transnoentities("DateDeliveryPlanned")." : ".dol_print_date($object->date_livraison,"daytext",false,$outputlangs,true), '', 'R');
+		$pdf->MultiCell(100, 4, $outputlangs->transnoentities("DateDeliveryPlanned")." : ".dol_print_date($object->date_delivery,"daytext",false,$outputlangs,true), '', 'R');
 
 		if (! empty($object->client->code_client))
 		{