lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Source is optionnal

Browse Source
This commit is contained in:
Laurent Destailleur 2008-10-07 21:49:40 +00:00
parent d5ce66c5d8
commit ac10b7398a
2 changed files with 49 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -486,13 +486,13 @@ class Commande extends CommonObject
// Nettoyage parametres // Nettoyage parametres
$this->brouillon = 1; // On positionne en mode brouillon la commande $this->brouillon = 1; // On positionne en mode brouillon la commande
dolibarr_syslog("Commande.class::create"); dolibarr_syslog("Commande::create");
// Verification parametres // Verification parametres
if ($this->source < 0) if (! empty($conf->global->COMMANDE_REQUIRE_SOURCE) && $this->source < 0)
{ {
$this->error=$langs->trans("ErrorFieldRequired",$langs->trans("Source")); $this->error=$langs->trans("ErrorFieldRequired",$langs->trans("Source"));
dolibarr_syslog("Commande.class::create ".$this->error, LOG_ERR); dolibarr_syslog("Commande::create ".$this->error, LOG_ERR);
return -1; return -1;
} }
if (! $remise) $remise=0; if (! $remise) $remise=0;
@ -503,7 +503,7 @@ class Commande extends CommonObject
if ($result < 0) if ($result < 0)
{ {
$this->error="Failed to fetch company"; $this->error="Failed to fetch company";
dolibarr_syslog("Commande.class::create ".$this->error, LOG_ERR); dolibarr_syslog("Commande::create ".$this->error, LOG_ERR);
return -2; return -2;
} }
@ -515,7 +515,7 @@ class Commande extends CommonObject
$sql.= ' remise_absolue, remise_percent)'; $sql.= ' remise_absolue, remise_percent)';
$sql.= " VALUES ('".$this->ref."',".$this->socid.", ".$this->db->idate(mktime()).", ".$user->id.', '.$this->projetid.','; $sql.= " VALUES ('".$this->ref."',".$this->socid.", ".$this->db->idate(mktime()).", ".$user->id.', '.$this->projetid.',';
$sql.= ' '.$this->db->idate($this->date_commande).','; $sql.= ' '.$this->db->idate($this->date_commande).',';
$sql.= ' '.$this->source.', '; $sql.= ' '.($this->source>=0?$this->source:'null').', ';
$sql.= " '".addslashes($this->note)."', "; $sql.= " '".addslashes($this->note)."', ";
$sql.= " '".addslashes($this->note_public)."', "; $sql.= " '".addslashes($this->note_public)."', ";
$sql.= " '".addslashes($this->ref_client)."', '".$this->modelpdf."', '".$this->cond_reglement_id."', '".$this->mode_reglement_id."',"; $sql.= " '".addslashes($this->ref_client)."', '".$this->modelpdf."', '".$this->cond_reglement_id."', '".$this->mode_reglement_id."',";
@ -1845,7 +1845,7 @@ class Commande extends CommonObject
$label=$langs->trans('OrderSource'.$this->source); $label=$langs->trans('OrderSource'.$this->source);
// \TODO Si libelle non trouve, on va chercher en base dans dictionnaire // \TODO Si libelle non trouve, on va chercher en base dans dictionnaire
if ($label == 'OrderSource') return '';
return $label; return $label;
} }
@ -2368,7 +2368,7 @@ class CommandeLigne
else else
{ {
$this->error=$this->db->error(); $this->error=$this->db->error();
dolibarr_syslog("CommandeLigne.class.php::insert Error ".$this->error); dolibarr_syslog("CommandeLigne::insert Error ".$this->error);
$this->db->rollback(); $this->db->rollback();
return -2; return -2;
} }
@ -2390,7 +2390,7 @@ class CommandeLigne
$sql.= ",total_ttc='".price2num($this->total_ttc)."'"; $sql.= ",total_ttc='".price2num($this->total_ttc)."'";
$sql.= " WHERE rowid = ".$this->rowid; $sql.= " WHERE rowid = ".$this->rowid;
dolibarr_syslog("CommandeLigne.class.php::update_total sql=$sql"); dolibarr_syslog("CommandeLigne::update_total sql=$sql");
$resql=$this->db->query($sql); $resql=$this->db->query($sql);
if ($resql) if ($resql)
@ -2401,7 +2401,7 @@ class CommandeLigne
else else
{ {
$this->error=$this->db->error(); $this->error=$this->db->error();
dolibarr_syslog("CommandeLigne.class.php::update_total Error ".$this->error); dolibarr_syslog("CommandeLigne::update_total Error ".$this->error);
$this->db->rollback(); $this->db->rollback();
return -2; return -2;
} }

2
htdocs/commande/fiche.php
View File

@ -655,7 +655,7 @@ if ($_POST['addfile'])
} }
else else
{ {
// Echec transfert (fichier d<>passant la limite ?) // Echec transfert (fichier d<>passant la limite ?
$mesg = '<div class="error">'.$langs->trans("ErrorFileNotUploaded").'</div>'; $mesg = '<div class="error">'.$langs->trans("ErrorFileNotUploaded").'</div>';
// print_r($_FILES); // print_r($_FILES);
} }