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

Fix: On ne pouvait pas ractiver un service.

Browse Source
This commit is contained in:
Laurent Destailleur 2007-05-14 18:33:26 +00:00
parent e5577d0076
commit 56b7fb1205
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
htdocs/contrat/contrat.class.php
View File

@ -90,21 +90,23 @@ class Contrat extends CommonObject
* \param user Objet User qui avtice le contrat * \param user Objet User qui avtice le contrat
* \param line_id Id de la ligne de detail à activer * \param line_id Id de la ligne de detail à activer
* \param date Date d'ouverture * \param date Date d'ouverture
* \param date_end Date fin prévue * \param date_end Date fin prévue
* \return int < 0 si erreur, > 0 si ok * \return int < 0 si erreur, > 0 si ok
*/ */
function active_line($user, $line_id, $date, $date_end='') function active_line($user, $line_id, $date, $date_end='')
{ {
global $langs,$conf; global $langs,$conf;
// statut actif : 4 $this->db->begin();
$sql = "UPDATE ".MAIN_DB_PREFIX."contratdet SET statut = 4,"; $sql = "UPDATE ".MAIN_DB_PREFIX."contratdet SET statut = 4,";
$sql.= " date_ouverture = '".$this->db->idate($date)."',"; $sql.= " date_ouverture = '".$this->db->idate($date)."',";
if ($date_end) $sql.= " date_fin_validite = '".$this->db->idate($date_end)."',"; if ($date_end) $sql.= " date_fin_validite = '".$this->db->idate($date_end)."',";
$sql.= " fk_user_ouverture = ".$user->id; $sql.= " fk_user_ouverture = ".$user->id.",";
$sql.= " WHERE rowid = ".$line_id . " AND (statut = 0 OR statut = 3) "; $sql.= " date_cloture = null";
$sql.= " WHERE rowid = ".$line_id . " AND (statut = 0 OR statut = 3 OR statut = 5)";
dolibarr_syslog("Contrat::active_line sql=".$sql);
$resql = $this->db->query($sql); $resql = $this->db->query($sql);
if ($resql) if ($resql)
{ {
@ -114,11 +116,14 @@ class Contrat extends CommonObject
$result=$interface->run_triggers('CONTRACT_SERVICE_ACTIVATE',$this,$user,$langs,$conf); $result=$interface->run_triggers('CONTRACT_SERVICE_ACTIVATE',$this,$user,$langs,$conf);
// Fin appel triggers // Fin appel triggers
$this->db->commit();
return 1; return 1;
} }
else else
{ {
$this->error=$this->db->error(); $this->error=$this->db->lasterror();
dolibarr_syslog("Contrat::active_line error ".$this->error);
$this->db->rollback();
return -1; return -1;
} }
} }
@ -1174,7 +1179,7 @@ class ContratLigne
var $price; var $price;
var $fk_product; var $fk_product;
var $statut; var $statut; // 4=actif, 5=clos
var $date_debut_prevue; var $date_debut_prevue;
var $date_debut_reel; var $date_debut_reel;
var $date_fin_prevue; var $date_fin_prevue;