Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Fix: use order date

Browse Source
This commit is contained in:
Regis Houssin
2009-12-17 08:50:00 +00:00
parent b1af17940a
commit ea47b49bb8
4 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/fourn/fournisseur.commande.class.php
View File

@@ -108,7 +108,7 @@ class CommandeFournisseur extends Commande
$this->total_ht = $obj->total_ht; $this->total_ht = $obj->total_ht;
$this->total_tva = $obj->tva; $this->total_tva = $obj->tva;
$this->total_ttc = $obj->total_ttc; $this->total_ttc = $obj->total_ttc;
$this->date_commande = $obj->date_commande; // date <EFBFBD> laquelle la commande a <EFBFBD>t<EFBFBD> transmise $this->date_commande = $obj->date_commande; // date a laquelle la commande a ete transmise
$this->date = $obj->date_creation; $this->date = $obj->date_creation;
$this->remise_percent = $obj->remise_percent; $this->remise_percent = $obj->remise_percent;
$this->methode_commande_id = $obj->fk_methode_commande; $this->methode_commande_id = $obj->fk_methode_commande;

10
htdocs/includes/modules/supplier_order/pdf/pdf_muscadet.modules.php
View File

@@ -623,8 +623,16 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
$posy+=6; $posy+=6;
$pdf->SetXY(100,$posy); $pdf->SetXY(100,$posy);
if ($object->date_commande)
{
$pdf->SetTextColor(0,0,60); $pdf->SetTextColor(0,0,60);
$pdf->MultiCell(100, 4, $outputlangs->transnoentities("Date")." : " . dol_print_date($object->date,"day",false,$outputlangs,true), '', 'R'); $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) if ($showadress)
{ {

1
htdocs/langs/en_US/orders.lang
View File

@@ -9,6 +9,7 @@ OrderLine=Order line
OrderFollow=Follow up OrderFollow=Follow up
OrderContact=Order contact OrderContact=Order contact
OrderDate=Order date OrderDate=Order date
OrderToProcess=Order to process
NewOrder=New order NewOrder=New order
ToOrder=Make order ToOrder=Make order
MakeOrder=Make order MakeOrder=Make order

1
htdocs/langs/fr_FR/orders.lang
View File

@@ -9,6 +9,7 @@ OrderLine=Ligne de commande
OrderFollow=Suivi OrderFollow=Suivi
OrderContact=Contacts commande OrderContact=Contacts commande
OrderDate=Date commande OrderDate=Date commande
OrderToProcess=Commande à traiter
NewOrder=Nouvelle commande NewOrder=Nouvelle commande
ToOrder=Passer commande ToOrder=Passer commande
MakeOrder=Passer commande MakeOrder=Passer commande