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

Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2012-06-10 13:08:56 +02:00
commit 37f7c98e50
3 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -227,11 +227,9 @@ class Contrat extends CommonObject
* Close all lines of a contract * Close all lines of a contract
* *
* @param User $user Object User making action * @param User $user Object User making action
* @param Translate $langs Object Lang
* @param Conf $conf Object Conf
* @return void * @return void
*/ */
function cloture($user,$langs='',$conf='') function cloture($user)
{ {
$this->db->begin(); $this->db->begin();
@ -258,7 +256,7 @@ class Contrat extends CommonObject
if ($this->statut == 0) if ($this->statut == 0)
{ {
$result=$this->validate($user,$langs,$conf); $result=$this->validate($user);
if ($result < 0) $ok=false; if ($result < 0) $ok=false;
} }
@ -277,12 +275,12 @@ class Contrat extends CommonObject
* Validate a contract * Validate a contract
* *
* @param User $user Objet User * @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 * @return int <0 if KO, >0 if OK
*/ */
function validate($user,$langs,$conf) function validate($user)
{ {
global $langs, $conf;
$error=0; $error=0;
$sql = "UPDATE ".MAIN_DB_PREFIX."contrat SET statut = 1"; $sql = "UPDATE ".MAIN_DB_PREFIX."contrat SET statut = 1";
@ -699,12 +697,12 @@ class Contrat extends CommonObject
* Supprime l'objet de la base * Supprime l'objet de la base
* *
* @param User $user Utilisateur qui supprime * @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 * @return int < 0 si erreur, > 0 si ok
*/ */
function delete($user,$langs='',$conf='') function delete($user)
{ {
global $conf, $langs;
$error=0; $error=0;
$this->db->begin(); $this->db->begin();

6
htdocs/contrat/fiche.php
View File

@ -415,21 +415,21 @@ else if ($action == 'confirm_deleteline' && $confirm == 'yes' && $user->rights->
else if ($action == 'confirm_valid' && $confirm == 'yes' && $user->rights->contrat->creer) else if ($action == 'confirm_valid' && $confirm == 'yes' && $user->rights->contrat->creer)
{ {
$object->fetch($id); $object->fetch($id);
$result = $object->validate($user,$langs,$conf); $result = $object->validate($user);
} }
// Close all lines // Close all lines
else if ($action == 'confirm_close' && $confirm == 'yes' && $user->rights->contrat->creer) else if ($action == 'confirm_close' && $confirm == 'yes' && $user->rights->contrat->creer)
{ {
$object->fetch($id); $object->fetch($id);
$result = $object->cloture($user,$langs,$conf); $result = $object->cloture($user);
} }
else if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->contrat->supprimer) else if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->contrat->supprimer)
{ {
$object->fetch($id); $object->fetch($id);
$object->fetch_thirdparty(); $object->fetch_thirdparty();
$result=$object->delete($user,$langs,$conf); $result=$object->delete($user);
if ($result >= 0) if ($result >= 0)
{ {
Header("Location: index.php"); Header("Location: index.php");

2
test/phpunit/ContratTest.php
View File

@ -234,7 +234,7 @@ class ContratTest extends PHPUnit_Framework_TestCase
$localobject=new Contrat($this->savdb); $localobject=new Contrat($this->savdb);
$result=$localobject->fetch($id); $result=$localobject->fetch($id);
$result=$localobject->delete($id); $result=$localobject->delete($user);
print __METHOD__." id=".$id." result=".$result."\n"; print __METHOD__." id=".$id." result=".$result."\n";
$this->assertLessThan($result, 0); $this->assertLessThan($result, 0);