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

Fix: First try to uniformize code was not a success. Another try.

Browse Source
This commit is contained in:
Laurent Destailleur
2009-09-13 20:19:59 +00:00
parent 733b633ef7
commit bf13666d26
3 changed files with 38 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -502,12 +502,15 @@ class Commande extends CommonObject
}
/**
* \brief Create order
* \param user Objet utilisateur qui cree
* \brief Create order
* \param user Objet user that make creation
* \return int <0 if KO, >0 if OK
* \remarks this->ref can be set or empty. If empty, we will use "(PROV)"
*/
function create($user)
{
global $conf,$langs,$mysoc;
$error=0;
// Clean parameters
$this->brouillon = 1; // On positionne en mode brouillon la commande
@@ -515,11 +518,13 @@ class Commande extends CommonObject
dol_syslog("Commande::create user=".$user->id);
// Check parameters
if (empty($this->ref))
{
$this->error=$langs->trans("ErrorFieldRequired",$langs->trans("Ref"));
$soc = new Societe($this->db);
$result=$soc->fetch($this->socid);
if ($result < 0)
{
$this->error="Failed to fetch company";
dol_syslog("Commande::create ".$this->error, LOG_ERR);
return -1;
return -2;
}
if (! empty($conf->global->COMMANDE_REQUIRE_SOURCE) && $this->source < 0)
{
@@ -530,14 +535,6 @@ class Commande extends CommonObject
if (! $remise) $remise=0;
if (! $this->projetid) $this->projetid = 0;
$soc = new Societe($this->db);
$result=$soc->fetch($this->socid);
if ($result < 0)
{
$this->error="Failed to fetch company";
dol_syslog("Commande::create ".$this->error, LOG_ERR);
return -2;
}
$this->db->begin();