Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-02-14 08:54:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

New: Add more graph and fix some statistics.

Browse Source
This commit is contained in:
Laurent Destailleur
2011-05-22 00:42:37 +00:00
parent 5a6221629e
commit c6df144818
10 changed files with 116 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
htdocs/commande/class/commande.class.php
View File

@@ -582,7 +582,7 @@ class Commande extends CommonObject
}
if (! $remise) $remise=0;
if (! $this->fk_project) $this->fk_project = 0;
// $date_commande is deprecated
$date = ($this->date_commande ? $this->date_commande : $this->date);
@@ -2396,11 +2396,11 @@ class Commande extends CommonObject
}
/**
* \brief Renvoi le libelle d'un statut donne
* \param statut Id statut
* \param facturee Si facturee
* \param mode 0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
* \return string Libelle
* Renvoi le libelle d'un statut donne
* @param statut Id statut
* @param facturee Si facturee
* @param mode 0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
* @return string Label of status
*/
function LibStatut($statut,$facturee,$mode)
{
@@ -2477,7 +2477,7 @@ class Commande extends CommonObject
$file = '/commande/fiche.php';
if ($conf->expedition->enabled && ($option == 1 || $option == 2)) $file = '/expedition/shipment.php';
$url = DOL_URL_ROOT.$file.'?id='.$this->id;
if ($short) return $url;