diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php index 57e3852ac6a..a5c48e902fd 100644 --- a/htdocs/contrat/class/contrat.class.php +++ b/htdocs/contrat/class/contrat.class.php @@ -227,12 +227,10 @@ class Contrat extends CommonObject * Close all lines of a contract * * @param User $user Object User making action - * @param Translate $langs Object Lang - * @param Conf $conf Object Conf * @return void */ - function cloture($user,$langs='',$conf='') - { + function cloture($user) + { $this->db->begin(); // Load lines @@ -258,7 +256,7 @@ class Contrat extends CommonObject if ($this->statut == 0) { - $result=$this->validate($user,$langs,$conf); + $result=$this->validate($user); if ($result < 0) $ok=false; } @@ -277,12 +275,12 @@ class Contrat extends CommonObject * Validate a contract * * @param User $user Objet User - * @param Translate $langs Environnement langue de l'utilisateur - * @param Conf $conf Environnement de configuration lors de l'operation * @return int <0 if KO, >0 if OK */ - function validate($user,$langs,$conf) + function validate($user) { + global $langs, $conf; + $error=0; $sql = "UPDATE ".MAIN_DB_PREFIX."contrat SET statut = 1"; @@ -697,12 +695,12 @@ class Contrat extends CommonObject * Supprime l'objet de la base * * @param User $user Utilisateur qui supprime - * @param Translate $langs Environnement langue de l'utilisateur - * @param Conf $conf Environnement de configuration lors de l'operation * @return int < 0 si erreur, > 0 si ok */ - function delete($user,$langs='',$conf='') + function delete($user) { + global $conf, $langs; + $error=0; $this->db->begin(); diff --git a/htdocs/contrat/fiche.php b/htdocs/contrat/fiche.php index 897cf0901df..89f0eea8780 100644 --- a/htdocs/contrat/fiche.php +++ b/htdocs/contrat/fiche.php @@ -415,21 +415,21 @@ else if ($action == 'confirm_deleteline' && $confirm == 'yes' && $user->rights-> else if ($action == 'confirm_valid' && $confirm == 'yes' && $user->rights->contrat->creer) { $object->fetch($id); - $result = $object->validate($user,$langs,$conf); + $result = $object->validate($user); } // Close all lines else if ($action == 'confirm_close' && $confirm == 'yes' && $user->rights->contrat->creer) { $object->fetch($id); - $result = $object->cloture($user,$langs,$conf); + $result = $object->cloture($user); } else if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->contrat->supprimer) { $object->fetch($id); $object->fetch_thirdparty(); - $result=$object->delete($user,$langs,$conf); + $result=$object->delete($user); if ($result >= 0) { Header("Location: index.php"); diff --git a/test/phpunit/ContratTest.php b/test/phpunit/ContratTest.php index 824f463034f..2a827af2665 100644 --- a/test/phpunit/ContratTest.php +++ b/test/phpunit/ContratTest.php @@ -234,7 +234,7 @@ class ContratTest extends PHPUnit_Framework_TestCase $localobject=new Contrat($this->savdb); $result=$localobject->fetch($id); - $result=$localobject->delete($id); + $result=$localobject->delete($user); print __METHOD__." id=".$id." result=".$result."\n"; $this->assertLessThan($result, 0);