diff --git a/htdocs/fourn/fournisseur.commande.class.php b/htdocs/fourn/fournisseur.commande.class.php index 27c05044456..9bd25f94fdf 100644 --- a/htdocs/fourn/fournisseur.commande.class.php +++ b/htdocs/fourn/fournisseur.commande.class.php @@ -108,7 +108,7 @@ class CommandeFournisseur extends Commande $this->total_ht = $obj->total_ht; $this->total_tva = $obj->tva; $this->total_ttc = $obj->total_ttc; - $this->date_commande = $obj->date_commande; // date � laquelle la commande a �t� transmise + $this->date_commande = $obj->date_commande; // date a laquelle la commande a ete transmise $this->date = $obj->date_creation; $this->remise_percent = $obj->remise_percent; $this->methode_commande_id = $obj->fk_methode_commande; diff --git a/htdocs/includes/modules/supplier_order/pdf/pdf_muscadet.modules.php b/htdocs/includes/modules/supplier_order/pdf/pdf_muscadet.modules.php index d6053d53e06..e90d6cd6a51 100644 --- a/htdocs/includes/modules/supplier_order/pdf/pdf_muscadet.modules.php +++ b/htdocs/includes/modules/supplier_order/pdf/pdf_muscadet.modules.php @@ -623,8 +623,16 @@ class pdf_muscadet extends ModelePDFSuppliersOrders $posy+=6; $pdf->SetXY(100,$posy); - $pdf->SetTextColor(0,0,60); - $pdf->MultiCell(100, 4, $outputlangs->transnoentities("Date")." : " . dol_print_date($object->date,"day",false,$outputlangs,true), '', 'R'); + if ($object->date_commande) + { + $pdf->SetTextColor(0,0,60); + $pdf->MultiCell(100, 4, $outputlangs->transnoentities("Date")." : " . dol_print_date($object->date_commande,"day",false,$outputlangs,true), '', 'R'); + } + else + { + $pdf->SetTextColor(255,0,0); + $pdf->MultiCell(100, 4, strtolower($outputlangs->transnoentities("OrderToProcess")), '', 'R'); + } if ($showadress) { diff --git a/htdocs/langs/en_US/orders.lang b/htdocs/langs/en_US/orders.lang index 6c7868f66bc..0c426ae8548 100755 --- a/htdocs/langs/en_US/orders.lang +++ b/htdocs/langs/en_US/orders.lang @@ -9,6 +9,7 @@ OrderLine=Order line OrderFollow=Follow up OrderContact=Order contact OrderDate=Order date +OrderToProcess=Order to process NewOrder=New order ToOrder=Make order MakeOrder=Make order diff --git a/htdocs/langs/fr_FR/orders.lang b/htdocs/langs/fr_FR/orders.lang index 6b9bf697e06..073a1d37a6f 100755 --- a/htdocs/langs/fr_FR/orders.lang +++ b/htdocs/langs/fr_FR/orders.lang @@ -9,6 +9,7 @@ OrderLine=Ligne de commande OrderFollow=Suivi OrderContact=Contacts commande OrderDate=Date commande +OrderToProcess=Commande à traiter NewOrder=Nouvelle commande ToOrder=Passer commande MakeOrder=Passer commande