alxarafe / alixar

dolibarr/scripts/members/sync_members_types_dolibarr2ldap.php

Indentation +53 added lines, -53 removed lines

@@ -32,12 +32,12 @@ 
 // Test if batch mode
 if (substr($sapi_type, 0, 3) == 'cgi') {
     echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
-	exit(-1);
+    exit(-1);
 }
 
 if (! isset($argv[1]) || ! $argv[1]) {
     print "Usage: ".$script_file." now\n";
-	exit(-1);
+    exit(-1);
 }
 $now=$argv[1];
 
@@ -72,60 +72,60 @@ 
 $resql = $db->query($sql);
 if ($resql)
 {
-	$num = $db->num_rows($resql);
-	$i = 0;
-
-	$ldap=new Ldap();
-	$result=$ldap->connect_bind();
-
-	if ($result > 0)
-	{
-		while ($i < $num)
-		{
-			$ldap->error="";
-
-			$obj = $db->fetch_object($resql);
-
-			$membertype = new AdherentType($db);
-			$membertype->id = $obj->rowid;
-			$membertype->fetch($membertype->id);
-
-			print $langs->trans("UpdateMemberType")." rowid=".$membertype->id." ".$membertype-label;
-
-			$oldobject=$membertype;
-
-			$oldinfo=$membertype->_load_ldap_info();
-			$olddn=$membertype->_load_ldap_dn($oldinfo);
-
-			$info=$membertype->_load_ldap_info();
-			$dn=$membertype->_load_ldap_dn($info);
-
-			$result=$ldap->add($dn,$info,$user);	// Wil fail if already exists
-			$result=$ldap->update($dn,$info,$user,$olddn);
-			if ($result > 0)
-			{
-				print " - ".$langs->trans("OK");
-			}
-			else
-			{
-				$error++;
-				print " - ".$langs->trans("KO").' - '.$ldap->error;
-			}
-			print "\n";
-
-			$i++;
-		}
-
-		$ldap->unbind();
-		$ldap->close();
-	}
-	else {
-		print $ldap->error;
-	}
+    $num = $db->num_rows($resql);
+    $i = 0;
+
+    $ldap=new Ldap();
+    $result=$ldap->connect_bind();
+
+    if ($result > 0)
+    {
+        while ($i < $num)
+        {
+            $ldap->error="";
+
+            $obj = $db->fetch_object($resql);
+
+            $membertype = new AdherentType($db);
+            $membertype->id = $obj->rowid;
+            $membertype->fetch($membertype->id);
+
+            print $langs->trans("UpdateMemberType")." rowid=".$membertype->id." ".$membertype-label;
+
+            $oldobject=$membertype;
+
+            $oldinfo=$membertype->_load_ldap_info();
+            $olddn=$membertype->_load_ldap_dn($oldinfo);
+
+            $info=$membertype->_load_ldap_info();
+            $dn=$membertype->_load_ldap_dn($info);
+
+            $result=$ldap->add($dn,$info,$user);	// Wil fail if already exists
+            $result=$ldap->update($dn,$info,$user,$olddn);
+            if ($result > 0)
+            {
+                print " - ".$langs->trans("OK");
+            }
+            else
+            {
+                $error++;
+                print " - ".$langs->trans("KO").' - '.$ldap->error;
+            }
+            print "\n";
+
+            $i++;
+        }
+
+        $ldap->unbind();
+        $ldap->close();
+    }
+    else {
+        print $ldap->error;
+    }
 }
 else
 {
-	dol_print_error($db);
+    dol_print_error($db);
 }
 
 exit($error);

dolibarr/scripts/members/sync_members_types_ldap2dolibarr.php

Indentation +92 added lines, -92 removed lines

@@ -33,7 +33,7 @@ 
 // Test if batch mode
 if (substr($sapi_type, 0, 3) == 'cgi') {
     echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
-	exit(-1);
+    exit(-1);
 }
 
 require_once $path."../../htdocs/master.inc.php";
@@ -60,10 +60,10 @@ 
 
 // List of fields to get from LDAP
 $required_fields = array(
-	$conf->global->LDAP_KEY_MEMBERS_TYPES,
-	$conf->global->LDAP_MEMBER_TYPE_FIELD_FULLNAME,
-	$conf->global->LDAP_MEMBER_TYPE_FIELD_DESCRIPTION,
-	$conf->global->LDAP_MEMBER_TYPE_FIELD_GROUPMEMBERS
+    $conf->global->LDAP_KEY_MEMBERS_TYPES,
+    $conf->global->LDAP_MEMBER_TYPE_FIELD_FULLNAME,
+    $conf->global->LDAP_MEMBER_TYPE_FIELD_DESCRIPTION,
+    $conf->global->LDAP_MEMBER_TYPE_FIELD_GROUPMEMBERS
 );
 
 // Remove from required_fields all entries not configured in LDAP (empty) and duplicated
@@ -71,17 +71,17 @@ 
 
 
 if (! isset($argv[1])) {
-	//print "Usage:  $script_file (nocommitiferror|commitiferror) [id_group]\n";
-	print "Usage:  $script_file (nocommitiferror|commitiferror) [--server=ldapserverhost] [--excludeuser=user1,user2...] [-y]\n";
-	exit(-1);
+    //print "Usage:  $script_file (nocommitiferror|commitiferror) [id_group]\n";
+    print "Usage:  $script_file (nocommitiferror|commitiferror) [--server=ldapserverhost] [--excludeuser=user1,user2...] [-y]\n";
+    exit(-1);
 }
 
 foreach($argv as $key => $val)
 {
-	if ($val == 'commitiferror') $forcecommit=1;
-	if (preg_match('/--server=([^\s]+)$/',$val,$reg)) $conf->global->LDAP_SERVER_HOST=$reg[1];
-	if (preg_match('/--excludeuser=([^\s]+)$/',$val,$reg)) $excludeuser=explode(',',$reg[1]);
-	if (preg_match('/-y$/',$val,$reg)) $confirmed=1;
+    if ($val == 'commitiferror') $forcecommit=1;
+    if (preg_match('/--server=([^\s]+)$/',$val,$reg)) $conf->global->LDAP_SERVER_HOST=$reg[1];
+    if (preg_match('/--excludeuser=([^\s]+)$/',$val,$reg)) $excludeuser=explode(',',$reg[1]);
+    if (preg_match('/-y$/',$val,$reg)) $confirmed=1;
 }
 
 print "Mails sending disabled (useless in batch mode)\n";
@@ -107,14 +107,14 @@ 
 
 if (! $confirmed)
 {
-	print "Hit Enter to continue or CTRL+C to stop...\n";
-	$input = trim(fgets(STDIN));
+    print "Hit Enter to continue or CTRL+C to stop...\n";
+    $input = trim(fgets(STDIN));
 }
 
 if (empty($conf->global->LDAP_MEMBER_TYPE_DN))
 {
-	print $langs->trans("Error").': '.$langs->trans("LDAP setup for members types not defined inside Dolibarr");
-	exit(-1);
+    print $langs->trans("Error").': '.$langs->trans("LDAP setup for members types not defined inside Dolibarr");
+    exit(-1);
 }
 
 
@@ -122,84 +122,84 @@ 
 $result = $ldap->connect_bind();
 if ($result >= 0)
 {
-	$justthese=array();
-
-
-	// We disable synchro Dolibarr-LDAP
-	$conf->global->LDAP_MEMBER_TYPE_ACTIVE=0;
-
-	$ldaprecords = $ldap->getRecords('*',$conf->global->LDAP_MEMBER_TYPE_DN, $conf->global->LDAP_KEY_MEMBERS_TYPES, $required_fields, 0, array($conf->global->LDAP_MEMBER_TYPE_FIELD_GROUPMEMBERS));
-	if (is_array($ldaprecords))
-	{
-		$db->begin();
-
-		// Warning $ldapuser has a key in lowercase
-		foreach ($ldaprecords as $key => $ldapgroup)
-		{
-			$membertype = new AdherentType($db);
-			$membertype->fetch('', $ldapgroup[$conf->global->LDAP_KEY_MEMBERS_TYPES]);
-			$membertype->label = $ldapgroup[$conf->global->LDAP_MEMBER_TYPE_FIELD_FULLNAME];
-			$membertype->description = $ldapgroup[$conf->global->LDAP_MEMBER_TYPE_FIELD_DESCRIPTION];
-			$membertype->entity = $conf->entity;
-
-			//print_r($ldapgroup);
-
-			if ($membertype->id > 0) { // Member type update
-				print $langs->transnoentities("MemberTypeUpdate").' # '.$key.': name='.$membertype->label;
-				$res=$membertype->update($user);
-
-				if ($res > 0)
-				{
-					print ' --> Updated member type id='.$membertype->id.' name='.$membertype->label;
-				}
-				else
-				{
-					$error++;
-					print ' --> '.$res.' '.$membertype->error;
-				}
-				print "\n";
-			} else { // Member type creation
-				print $langs->transnoentities("MemberTypeCreate").' # '.$key.': name='.$membertype->label;
-				$res=$membertype->create($user);
-
-				if ($res > 0)
-				{
-					print ' --> Created member type id='.$membertype->id.' name='.$membertype->label;
-				}
-				else
-				{
-					$error++;
-					print ' --> '.$res.' '.$membertype->error;
-				}
-				print "\n";
-			}
-
-			//print_r($membertype);
-		}
-
-		if (! $error || $forcecommit)
-		{
-			if (! $error) print $langs->transnoentities("NoErrorCommitIsDone")."\n";
-			else print $langs->transnoentities("ErrorButCommitIsDone")."\n";
-			$db->commit();
-		}
-		else
-		{
-			print $langs->transnoentities("ErrorSomeErrorWereFoundRollbackIsDone",$error)."\n";
-			$db->rollback();
-		}
-		print "\n";
-	}
-	else
-	{
-		dol_print_error('',$ldap->error);
-		$error++;
-	}
+    $justthese=array();
+
+
+    // We disable synchro Dolibarr-LDAP
+    $conf->global->LDAP_MEMBER_TYPE_ACTIVE=0;
+
+    $ldaprecords = $ldap->getRecords('*',$conf->global->LDAP_MEMBER_TYPE_DN, $conf->global->LDAP_KEY_MEMBERS_TYPES, $required_fields, 0, array($conf->global->LDAP_MEMBER_TYPE_FIELD_GROUPMEMBERS));
+    if (is_array($ldaprecords))
+    {
+        $db->begin();
+
+        // Warning $ldapuser has a key in lowercase
+        foreach ($ldaprecords as $key => $ldapgroup)
+        {
+            $membertype = new AdherentType($db);
+            $membertype->fetch('', $ldapgroup[$conf->global->LDAP_KEY_MEMBERS_TYPES]);
+            $membertype->label = $ldapgroup[$conf->global->LDAP_MEMBER_TYPE_FIELD_FULLNAME];
+            $membertype->description = $ldapgroup[$conf->global->LDAP_MEMBER_TYPE_FIELD_DESCRIPTION];
+            $membertype->entity = $conf->entity;
+
+            //print_r($ldapgroup);
+
+            if ($membertype->id > 0) { // Member type update
+                print $langs->transnoentities("MemberTypeUpdate").' # '.$key.': name='.$membertype->label;
+                $res=$membertype->update($user);
+
+                if ($res > 0)
+                {
+                    print ' --> Updated member type id='.$membertype->id.' name='.$membertype->label;
+                }
+                else
+                {
+                    $error++;
+                    print ' --> '.$res.' '.$membertype->error;
+                }
+                print "\n";
+            } else { // Member type creation
+                print $langs->transnoentities("MemberTypeCreate").' # '.$key.': name='.$membertype->label;
+                $res=$membertype->create($user);
+
+                if ($res > 0)
+                {
+                    print ' --> Created member type id='.$membertype->id.' name='.$membertype->label;
+                }
+                else
+                {
+                    $error++;
+                    print ' --> '.$res.' '.$membertype->error;
+                }
+                print "\n";
+            }
+
+            //print_r($membertype);
+        }
+
+        if (! $error || $forcecommit)
+        {
+            if (! $error) print $langs->transnoentities("NoErrorCommitIsDone")."\n";
+            else print $langs->transnoentities("ErrorButCommitIsDone")."\n";
+            $db->commit();
+        }
+        else
+        {
+            print $langs->transnoentities("ErrorSomeErrorWereFoundRollbackIsDone",$error)."\n";
+            $db->rollback();
+        }
+        print "\n";
+    }
+    else
+    {
+        dol_print_error('',$ldap->error);
+        $error++;
+    }
 }
 else
 {
-	dol_print_error('',$ldap->error);
-	$error++;
+    dol_print_error('',$ldap->error);
+    $error++;
 }
 
 
@@ -214,6 +214,6 @@ 
  */
 function dolValidElementType($element)
 {
-	return (trim($element) != '');
+    return (trim($element) != '');
 }
 

dolibarr/scripts/product/migrate_picture_path.php

Indentation +55 added lines, -55 removed lines

@@ -30,7 +30,7 @@ 
 // Test if batch mode
 if (substr($sapi_type, 0, 3) == 'cgi') {
     echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
-	exit(-1);
+    exit(-1);
 }
 
 @set_time_limit(0);							// No timeout for this script
@@ -58,7 +58,7 @@ 
 
 if (! isset($argv[1]) || $argv[1] != 'product') {
     print "Usage:  $script_file product\n";
-	exit(-1);
+    exit(-1);
 }
 
 print '--- start'."\n";
@@ -66,24 +66,24 @@ 
 // Case to migrate products path
 if ($argv[1] == 'product')
 {
-	$product = new Product($db);
-
-	$sql = "SELECT rowid as pid from ".MAIN_DB_PREFIX."product";	// Get list of all products
-	$resql = $db->query($sql);
-	if ($resql)
-	{
-		while ($obj = $db->fetch_object($resql))
-		{
-			$product->fetch($obj->pid);
-			print " migrating product id=".$product->id." ref=".$product->ref."\n";
-			migrate_product_photospath($product);
-		}
-	}
-	else
-	{
-		print "\n sql error ".$sql;
-		exit;
-	}
+    $product = new Product($db);
+
+    $sql = "SELECT rowid as pid from ".MAIN_DB_PREFIX."product";	// Get list of all products
+    $resql = $db->query($sql);
+    if ($resql)
+    {
+        while ($obj = $db->fetch_object($resql))
+        {
+            $product->fetch($obj->pid);
+            print " migrating product id=".$product->id." ref=".$product->ref."\n";
+            migrate_product_photospath($product);
+        }
+    }
+    else
+    {
+        print "\n sql error ".$sql;
+        exit;
+    }
 }
 
 
@@ -101,47 +101,47 @@ 
  */
 function migrate_product_photospath($product)
 {
-	global $conf;
+    global $conf;
 
-	$dir = $conf->product->multidir_output[$product->entity];
-	$conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO = 1;
-	$origin = $dir .'/'. get_exdir($product->id,2,0,0,$product,'product') . $product->id ."/photos";
-	$destin = $dir.'/'.dol_sanitizeFileName($product->ref);
+    $dir = $conf->product->multidir_output[$product->entity];
+    $conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO = 1;
+    $origin = $dir .'/'. get_exdir($product->id,2,0,0,$product,'product') . $product->id ."/photos";
+    $destin = $dir.'/'.dol_sanitizeFileName($product->ref);
 
-	$error = 0;
+    $error = 0;
 
-	$origin_osencoded=dol_osencode($origin);
-	$destin_osencoded=dol_osencode($destin);
-	dol_mkdir($destin);
+    $origin_osencoded=dol_osencode($origin);
+    $destin_osencoded=dol_osencode($destin);
+    dol_mkdir($destin);
 
-	if (dol_is_dir($origin))
-	{
-		$handle=opendir($origin_osencoded);
+    if (dol_is_dir($origin))
+    {
+        $handle=opendir($origin_osencoded);
         if (is_resource($handle))
         {
-        	while (($file = readdir($handle)) !== false)
-    		{
-     			if ($file != '.' && $file != '..' && is_dir($origin_osencoded.'/'.$file))
-    			{
-    				$thumbs = opendir($origin_osencoded.'/'.$file);
-    				if (is_resource($thumbs))
-        			{
-	     				dol_mkdir($destin.'/'.$file);
-	     				while (($thumb = readdir($thumbs)) !== false)
-		    			{
-		    				dol_move($origin.'/'.$file.'/'.$thumb, $destin.'/'.$file.'/'.$thumb);
-		    			}
+            while (($file = readdir($handle)) !== false)
+            {
+                    if ($file != '.' && $file != '..' && is_dir($origin_osencoded.'/'.$file))
+                {
+                    $thumbs = opendir($origin_osencoded.'/'.$file);
+                    if (is_resource($thumbs))
+                    {
+                            dol_mkdir($destin.'/'.$file);
+                            while (($thumb = readdir($thumbs)) !== false)
+                        {
+                            dol_move($origin.'/'.$file.'/'.$thumb, $destin.'/'.$file.'/'.$thumb);
+                        }
 //		    			dol_delete_dir($origin.'/'.$file);
-        			}
-    			}
-    			else
-    			{
-    				if (dol_is_file($origin.'/'.$file) )
-    				{
-    					dol_move($origin.'/'.$file, $destin.'/'.$file);
-    				}
-    			}
-    		}
+                    }
+                }
+                else
+                {
+                    if (dol_is_file($origin.'/'.$file) )
+                    {
+                        dol_move($origin.'/'.$file, $destin.'/'.$file);
+                    }
+                }
+            }
         }
-	}
+    }
 }

dolibarr/scripts/product/regenerate_thumbs.php

Indentation +21 added lines, -21 removed lines

@@ -30,7 +30,7 @@ 
 // Test if batch mode
 if (substr($sapi_type, 0, 3) == 'cgi') {
     echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
-	exit(-1);
+    exit(-1);
 }
 
 @set_time_limit(0);							// No timeout for this script
@@ -69,13 +69,13 @@ 
 $subdir=$argv[1];
 if (empty($dir) || empty($subdir))
 {
-	dol_print_error('', 'dir not defined');
-	exit(1);
+    dol_print_error('', 'dir not defined');
+    exit(1);
 }
 if (! dol_is_dir($dir.'/'.$subdir))
 {
-	print 'Directory '.$dir.'/'.$subdir.' not found.'."\n";
-	exit(2);
+    print 'Directory '.$dir.'/'.$subdir.' not found.'."\n";
+    exit(2);
 }
 
 $filearray=dol_dir_list($dir.'/'.$subdir,"directories",0,'','temp$');
@@ -84,22 +84,22 @@ 
 
 foreach($filearray as $keyf => $valf)
 {
-	$ref=basename($valf['name']);
-	$filearrayimg=dol_dir_list($valf['fullname'],"files",0,'(\.gif|\.png|\.jpg|\.jpeg|\.bmp)$','(\.meta|_preview.*\.png)$');
-	foreach($filearrayimg as $keyi => $vali)
-	{
-		print 'Process image for ref '.$ref.' : '.$vali['name']."\n";
-
-		// Create small thumbs for image
-		// Used on logon for example
-		$imgThumbSmall = vignette($vali['fullname'], $maxwidthsmall, $maxheightsmall, '_small', 50, "thumbs");
-		if (preg_match('/Error/', $imgThumbSmall)) print $imgThumbSmall."\n";
-
-		// Create mini thumbs for image (Ratio is near 16/9)
-		// Used on menu or for setup page for example
-		$imgThumbMini = vignette($vali['fullname'], $maxwidthmini, $maxheightmini, '_mini', 50, "thumbs");
-		if (preg_match('/Error/', $imgThumbMini)) print $imgThumbMini."\n";
-	}
+    $ref=basename($valf['name']);
+    $filearrayimg=dol_dir_list($valf['fullname'],"files",0,'(\.gif|\.png|\.jpg|\.jpeg|\.bmp)$','(\.meta|_preview.*\.png)$');
+    foreach($filearrayimg as $keyi => $vali)
+    {
+        print 'Process image for ref '.$ref.' : '.$vali['name']."\n";
+
+        // Create small thumbs for image
+        // Used on logon for example
+        $imgThumbSmall = vignette($vali['fullname'], $maxwidthsmall, $maxheightsmall, '_small', 50, "thumbs");
+        if (preg_match('/Error/', $imgThumbSmall)) print $imgThumbSmall."\n";
+
+        // Create mini thumbs for image (Ratio is near 16/9)
+        // Used on menu or for setup page for example
+        $imgThumbMini = vignette($vali['fullname'], $maxwidthmini, $maxheightmini, '_mini', 50, "thumbs");
+        if (preg_match('/Error/', $imgThumbMini)) print $imgThumbMini."\n";
+    }
 }
 
 $db->close();	// Close $db database opened handler

dolibarr/test/phpunit/MouvementStockTest.php

Indentation +161 added lines, -161 removed lines

@@ -33,9 +33,9 @@ 
 
 if (empty($user->id))
 {
-	print "Load permissions for admin user nb 1\n";
-	$user->fetch(1);
-	$user->getrights();
+    print "Load permissions for admin user nb 1\n";
+    $user->fetch(1);
+    $user->getrights();
 }
 $conf->global->MAIN_DISABLE_ALL_MAILS=1;
 
@@ -49,74 +49,74 @@ 
  */
 class MouvementStockTest extends PHPUnit_Framework_TestCase
 {
-	protected $savconf;
-	protected $savuser;
-	protected $savlangs;
-	protected $savdb;
-
-	/**
-	 * Constructor
-	 * We save global variables into local variables
-	 *
-	 * @return ContratTest
-	 */
-	function __construct()
-	{
-		parent::__construct();
-
-		//$this->sharedFixture
-		global $conf,$user,$langs,$db;
-		$this->savconf=$conf;
-		$this->savuser=$user;
-		$this->savlangs=$langs;
-		$this->savdb=$db;
-
-		print __METHOD__." db->type=".$db->type." user->id=".$user->id;
-		//print " - db ".$db->db;
-		print "\n";
-	}
-
-	// Static methods
-  	public static function setUpBeforeClass()
+    protected $savconf;
+    protected $savuser;
+    protected $savlangs;
+    protected $savdb;
+
+    /**
+     * Constructor
+     * We save global variables into local variables
+     *
+     * @return ContratTest
+     */
+    function __construct()
+    {
+        parent::__construct();
+
+        //$this->sharedFixture
+        global $conf,$user,$langs,$db;
+        $this->savconf=$conf;
+        $this->savuser=$user;
+        $this->savlangs=$langs;
+        $this->savdb=$db;
+
+        print __METHOD__." db->type=".$db->type." user->id=".$user->id;
+        //print " - db ".$db->db;
+        print "\n";
+    }
+
+    // Static methods
+        public static function setUpBeforeClass()
     {
-    	global $conf,$user,$langs,$db;
-		$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
+        global $conf,$user,$langs,$db;
+        $db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
 
-    	print __METHOD__."\n";
+        print __METHOD__."\n";
     }
 
     // tear down after class
     public static function tearDownAfterClass()
     {
-    	global $conf,$user,$langs,$db;
-		$db->rollback();
+        global $conf,$user,$langs,$db;
+        $db->rollback();
 
-		print __METHOD__."\n";
+        print __METHOD__."\n";
     }
 
-	/**
-	 * Init phpunit tests
-	 *
-	 * @return	void
-	 */
+    /**
+     * Init phpunit tests
+     *
+     * @return	void
+     */
     protected function setUp()
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
 
-		print __METHOD__."\n";
+        print __METHOD__."\n";
     }
-	/**
-	 * End phpunit tests
-	 *
-	 * @return	void
-	 */
+    /**
+     * End phpunit tests
+     *
+     * @return	void
+     */
     protected function tearDown()
     {
-    	print __METHOD__."\n";
+        print __METHOD__."\n";
     }
 
     /**
@@ -126,97 +126,97 @@ 
      */
     public function testMouvementCreate()
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
-
-		// We create a product for tests
-		$product1=new Product($db);
-		$product1->initAsSpecimen();
-		$product1->ref.=' 1';
-		$product1->label.=' 1';
-		$product1id=$product1->create($user);
-
-		$product2=new Product($db);
-		$product2->initAsSpecimen();
-		$product2->ref.=' 2';
-		$product2->label.=' 2';
-		$product2id=$product2->create($user);
-
-		// We create a product for tests
-		$warehouse1=new Entrepot($db);
-		$warehouse1->initAsSpecimen();
-		$warehouse1->libelle.=' 1';
-		$warehouse1->description.=' 1';
-		$warehouse1id=$warehouse1->create($user);
-
-		$warehouse2=new Entrepot($db);
-		$warehouse2->initAsSpecimen();
-		$warehouse2->libelle.=' 2';
-		$warehouse2->description.=' 2';
-		$warehouse2id=$warehouse2->create($user);
-
-		$localobject=new MouvementStock($this->savdb);
-
-    	// Do a list of movement into warehouse 1
-
-    	// Create an input movement (type = 3) of price 9.9 -> shoul dupdate PMP to 9.9
-    	$result=$localobject->_create($user, $product1id, $warehouse1id, 10, 3, 9.9, 'Movement for unit test 1', 'Inventory Code Test');
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertLessThan($result, 0);
-
-    	// Create an input movement (type = 3) of price 9.7 -> shoul dupdate PMP to 9.9/9.7 = 9.8
-    	$result=$localobject->_create($user, $product1id, $warehouse1id, 10, 3, 9.7, 'Movement for unit test 2', 'Inventory Code Test');
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertLessThan($result, 0);
-
-    	// Create an output movement (type = 2) of price 9.7 -> shoul dupdate PMP to 9.9/9.7 = 9.8
-    	$result=$localobject->_create($user, $product1id, $warehouse1id, -5, 2, 999, 'Movement for unit test 3', 'Inventory Code Test');
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertLessThan($result, 0);
-
-    	// Create an output movement (type = 1) of price 9.7 -> shoul dupdate PMP to 9.9/9.7 = 9.8
-    	$result=$localobject->_create($user, $product1id, $warehouse1id, 1, 0, 0, 'Input from transfer', 'Transfert X');
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertLessThan($result, 0);
-
-    	// Create an output movement (type = 1) of price 9.7 -> shoul dupdate PMP to 9.9/9.7 = 9.8
-    	$result=$localobject->_create($user, $product1id, $warehouse1id, -2, 1, 0, 'Output from transfer', 'Transfert Y');
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertLessThan($result, 0);
-
-
-    	// Do same but into warehouse 2
-
-    	// Create an input movement (type = 3) of price 9.9 -> shoul dupdate PMP to 9.9
-    	$result=$localobject->_create($user, $product1id, $warehouse2id, 10, 3, 9.9, 'Movement for unit test 1 wh 2', 'Inventory Code Test 2');
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertLessThan($result, 0);
-
-    	// Create an input movement (type = 3) of price 9.7 -> shoul dupdate PMP to 9.9/9.7 = 9.8
-    	$result=$localobject->_create($user, $product1id, $warehouse2id, 10, 3, 9.7, 'Movement for unit test 2 wh 2', 'Inventory Code Test 2');
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertLessThan($result, 0);
-
-    	// Create an output movement (type = 2) of price 9.7 -> shoul dupdate PMP to 9.9/9.7 = 9.8
-    	$result=$localobject->_create($user, $product1id, $warehouse2id, -5, 2, 999, 'Movement for unit test 3 wh 2', 'Inventory Code Test 2');
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertLessThan($result, 0);
-
-    	// Create an output movement (type = 1) of price 9.7 -> shoul dupdate PMP to 9.9/9.7 = 9.8
-    	$result=$localobject->_create($user, $product1id, $warehouse2id, 1, 0, 0, 'Input from transfer wh 2', 'Transfert X 2');
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertLessThan($result, 0);
-
-    	// Create an output movement (type = 1) of price 9.7 -> shoul dupdate PMP to 9.9/9.7 = 9.8
-    	$result=$localobject->_create($user, $product1id, $warehouse2id, -2, 1, 0, 'Output from transfer wh 2', 'Transfert Y 2');
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertLessThan($result, 0);
-
-
-    	return $localobject;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
+
+        // We create a product for tests
+        $product1=new Product($db);
+        $product1->initAsSpecimen();
+        $product1->ref.=' 1';
+        $product1->label.=' 1';
+        $product1id=$product1->create($user);
+
+        $product2=new Product($db);
+        $product2->initAsSpecimen();
+        $product2->ref.=' 2';
+        $product2->label.=' 2';
+        $product2id=$product2->create($user);
+
+        // We create a product for tests
+        $warehouse1=new Entrepot($db);
+        $warehouse1->initAsSpecimen();
+        $warehouse1->libelle.=' 1';
+        $warehouse1->description.=' 1';
+        $warehouse1id=$warehouse1->create($user);
+
+        $warehouse2=new Entrepot($db);
+        $warehouse2->initAsSpecimen();
+        $warehouse2->libelle.=' 2';
+        $warehouse2->description.=' 2';
+        $warehouse2id=$warehouse2->create($user);
+
+        $localobject=new MouvementStock($this->savdb);
+
+        // Do a list of movement into warehouse 1
+
+        // Create an input movement (type = 3) of price 9.9 -> shoul dupdate PMP to 9.9
+        $result=$localobject->_create($user, $product1id, $warehouse1id, 10, 3, 9.9, 'Movement for unit test 1', 'Inventory Code Test');
+        print __METHOD__." result=".$result."\n";
+        $this->assertLessThan($result, 0);
+
+        // Create an input movement (type = 3) of price 9.7 -> shoul dupdate PMP to 9.9/9.7 = 9.8
+        $result=$localobject->_create($user, $product1id, $warehouse1id, 10, 3, 9.7, 'Movement for unit test 2', 'Inventory Code Test');
+        print __METHOD__." result=".$result."\n";
+        $this->assertLessThan($result, 0);
+
+        // Create an output movement (type = 2) of price 9.7 -> shoul dupdate PMP to 9.9/9.7 = 9.8
+        $result=$localobject->_create($user, $product1id, $warehouse1id, -5, 2, 999, 'Movement for unit test 3', 'Inventory Code Test');
+        print __METHOD__." result=".$result."\n";
+        $this->assertLessThan($result, 0);
+
+        // Create an output movement (type = 1) of price 9.7 -> shoul dupdate PMP to 9.9/9.7 = 9.8
+        $result=$localobject->_create($user, $product1id, $warehouse1id, 1, 0, 0, 'Input from transfer', 'Transfert X');
+        print __METHOD__." result=".$result."\n";
+        $this->assertLessThan($result, 0);
+
+        // Create an output movement (type = 1) of price 9.7 -> shoul dupdate PMP to 9.9/9.7 = 9.8
+        $result=$localobject->_create($user, $product1id, $warehouse1id, -2, 1, 0, 'Output from transfer', 'Transfert Y');
+        print __METHOD__." result=".$result."\n";
+        $this->assertLessThan($result, 0);
+
+
+        // Do same but into warehouse 2
+
+        // Create an input movement (type = 3) of price 9.9 -> shoul dupdate PMP to 9.9
+        $result=$localobject->_create($user, $product1id, $warehouse2id, 10, 3, 9.9, 'Movement for unit test 1 wh 2', 'Inventory Code Test 2');
+        print __METHOD__." result=".$result."\n";
+        $this->assertLessThan($result, 0);
+
+        // Create an input movement (type = 3) of price 9.7 -> shoul dupdate PMP to 9.9/9.7 = 9.8
+        $result=$localobject->_create($user, $product1id, $warehouse2id, 10, 3, 9.7, 'Movement for unit test 2 wh 2', 'Inventory Code Test 2');
+        print __METHOD__." result=".$result."\n";
+        $this->assertLessThan($result, 0);
+
+        // Create an output movement (type = 2) of price 9.7 -> shoul dupdate PMP to 9.9/9.7 = 9.8
+        $result=$localobject->_create($user, $product1id, $warehouse2id, -5, 2, 999, 'Movement for unit test 3 wh 2', 'Inventory Code Test 2');
+        print __METHOD__." result=".$result."\n";
+        $this->assertLessThan($result, 0);
+
+        // Create an output movement (type = 1) of price 9.7 -> shoul dupdate PMP to 9.9/9.7 = 9.8
+        $result=$localobject->_create($user, $product1id, $warehouse2id, 1, 0, 0, 'Input from transfer wh 2', 'Transfert X 2');
+        print __METHOD__." result=".$result."\n";
+        $this->assertLessThan($result, 0);
+
+        // Create an output movement (type = 1) of price 9.7 -> shoul dupdate PMP to 9.9/9.7 = 9.8
+        $result=$localobject->_create($user, $product1id, $warehouse2id, -2, 1, 0, 'Output from transfer wh 2', 'Transfert Y 2');
+        print __METHOD__." result=".$result."\n";
+        $this->assertLessThan($result, 0);
+
+
+        return $localobject;
     }
 
     /**
@@ -230,26 +230,26 @@ 
      */
     public function testMouvementCheck($localobject)
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
 
-		$productid = $localobject->product_id;
-		$warehouseid = $localobject->entrepot_id;
+        $productid = $localobject->product_id;
+        $warehouseid = $localobject->entrepot_id;
 
-		print __METHOD__." productid=".$productid."\n";
+        print __METHOD__." productid=".$productid."\n";
 
-		$producttotest = new Product($db);
-		$producttotest->fetch($productid);
+        $producttotest = new Product($db);
+        $producttotest->fetch($productid);
 
-    	print __METHOD__." producttotest->stock_reel=".$producttotest->stock_reel."\n";
-    	$this->assertEquals($producttotest->stock_reel, 28);	// 28 is result of stock movement defined into testMouvementCreate
+        print __METHOD__." producttotest->stock_reel=".$producttotest->stock_reel."\n";
+        $this->assertEquals($producttotest->stock_reel, 28);	// 28 is result of stock movement defined into testMouvementCreate
 
-    	print __METHOD__." producttotest->pmp=".$producttotest->pmp."\n";
-    	$this->assertEquals($producttotest->pmp, 9.8);
+        print __METHOD__." producttotest->pmp=".$producttotest->pmp."\n";
+        $this->assertEquals($producttotest->pmp, 9.8);
 
-    	return $localobject;
+        return $localobject;
     }
 }

dolibarr/test/phpunit/ActionCommTest.php

Indentation +14 added lines, -14 removed lines

@@ -59,9 +59,9 @@ 
      */
     function __construct()
     {
-    	parent::__construct();
+        parent::__construct();
 
-    	//$this->sharedFixture
+        //$this->sharedFixture
         global $conf,$user,$langs,$db;
         $this->savconf=$conf;
         $this->savuser=$user;
@@ -205,18 +205,18 @@ 
      */
     public function testActionCommUpdate($localobject)
     {
-    	global $conf,$user,$langs,$db;
-    	$conf=$this->savconf;
-    	$user=$this->savuser;
-    	$langs=$this->savlangs;
-    	$db=$this->savdb;
-
-    	$localobject->label='New label';
-    	$result=$localobject->update($user);
-
-    	$this->assertLessThan($result, 0);
-    	print __METHOD__." id=".$id." result=".$result."\n";
-    	return $localobject->id;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
+
+        $localobject->label='New label';
+        $result=$localobject->update($user);
+
+        $this->assertLessThan($result, 0);
+        print __METHOD__." id=".$id." result=".$result."\n";
+        return $localobject->id;
     }
 
     /**

dolibarr/test/phpunit/WebservicesInvoicesTest.php

Indentation +314 added lines, -314 removed lines

@@ -33,9 +33,9 @@ 
 
 if (empty($user->id))
 {
-	print "Load permissions for admin user nb 1\n";
-	$user->fetch(1);
-	$user->getrights();
+    print "Load permissions for admin user nb 1\n";
+    $user->fetch(1);
+    $user->getrights();
 }
 $conf->global->MAIN_DISABLE_ALL_MAILS=1;
 
@@ -51,47 +51,47 @@ 
  */
 class WebservicesInvoicesTest extends PHPUnit_Framework_TestCase
 {
-	protected $savconf;
-	protected $savuser;
-	protected $savlangs;
-	protected $savdb;
-	protected $soapclient;
-
-	private static $socid;
-
-	protected $ns = 'http://www.dolibarr.org/ns/';
-
-	/**
-	 * Constructor
-	 * We save global variables into local variables
-	 *
-	 * @return DateLibTest
-	 */
-	function __construct()
-	{
-		parent::__construct();
-
-		//$this->sharedFixture
-		global $conf,$user,$langs,$db;
-		$this->savconf=$conf;
-		$this->savuser=$user;
-		$this->savlangs=$langs;
-		$this->savdb=$db;
-
-		// Set the WebService URL
-		$WS_DOL_URL = DOL_MAIN_URL_ROOT.'/webservices/server_invoice.php';
-		print __METHOD__." create nusoap_client for URL=".$WS_DOL_URL."\n";
-		$this->soapclient = new nusoap_client($WS_DOL_URL);
-		if ($this->soapclient)
-		{
-			$this->soapclient->soap_defencoding='UTF-8';
-			$this->soapclient->decodeUTF8(false);
-		}
-
-		print __METHOD__." db->type=".$db->type." user->id=".$user->id;
-		//print " - db ".$db->db;
-		print "\n";
-	}
+    protected $savconf;
+    protected $savuser;
+    protected $savlangs;
+    protected $savdb;
+    protected $soapclient;
+
+    private static $socid;
+
+    protected $ns = 'http://www.dolibarr.org/ns/';
+
+    /**
+     * Constructor
+     * We save global variables into local variables
+     *
+     * @return DateLibTest
+     */
+    function __construct()
+    {
+        parent::__construct();
+
+        //$this->sharedFixture
+        global $conf,$user,$langs,$db;
+        $this->savconf=$conf;
+        $this->savuser=$user;
+        $this->savlangs=$langs;
+        $this->savdb=$db;
+
+        // Set the WebService URL
+        $WS_DOL_URL = DOL_MAIN_URL_ROOT.'/webservices/server_invoice.php';
+        print __METHOD__." create nusoap_client for URL=".$WS_DOL_URL."\n";
+        $this->soapclient = new nusoap_client($WS_DOL_URL);
+        if ($this->soapclient)
+        {
+            $this->soapclient->soap_defencoding='UTF-8';
+            $this->soapclient->decodeUTF8(false);
+        }
+
+        print __METHOD__." db->type=".$db->type." user->id=".$user->id;
+        //print " - db ".$db->db;
+        print "\n";
+    }
 
     /**
      * setUpBeforeClass
@@ -102,38 +102,38 @@ 
     {
         global $conf,$user,$langs,$db;
 
-		// create a third_party, needed to create an invoice
-		//
-		// The third party is created in setUpBeforeClass() and not in the
-		// constructor to avoid creating several objects (the constructor is
-		// called for each test).
-		//
-		// The third party must be created before beginning the DB transaction
-		// because there is a foreign key constraint between invoices and third
-		// parties (tables: lx_facture and llx_societe) and with MySQL,
-		// constraints are checked immediately, they are not deferred to
-		// transaction commit. So if the invoice is created in the same
-		// transaction than the third party, the FK constraint fails.
-		// See this post for more detail: http://stackoverflow.com/a/5014744/5187108
-		$societe=new Societe($db);
-		$societe->ref='';
-		$societe->name='name';
-		$societe->ref_ext='ref-phpunit';
-		$societe->status=1;
-		$societe->client=1;
-		$societe->code_client='CU0901-1234';
-		$societe->code_fournisseur='SU0901-1234';
-		$societe->fournisseur=0;
-		$societe->date_creation=$now;
-		$societe->tva_assuj=0;
-		$societe->particulier=0;
-
-		$societe->create($user);
-
-		self::$socid = $societe->id;
-		print __METHOD__." societe created id=".$societe->id."\n";
-
-		$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
+        // create a third_party, needed to create an invoice
+        //
+        // The third party is created in setUpBeforeClass() and not in the
+        // constructor to avoid creating several objects (the constructor is
+        // called for each test).
+        //
+        // The third party must be created before beginning the DB transaction
+        // because there is a foreign key constraint between invoices and third
+        // parties (tables: lx_facture and llx_societe) and with MySQL,
+        // constraints are checked immediately, they are not deferred to
+        // transaction commit. So if the invoice is created in the same
+        // transaction than the third party, the FK constraint fails.
+        // See this post for more detail: http://stackoverflow.com/a/5014744/5187108
+        $societe=new Societe($db);
+        $societe->ref='';
+        $societe->name='name';
+        $societe->ref_ext='ref-phpunit';
+        $societe->status=1;
+        $societe->client=1;
+        $societe->code_client='CU0901-1234';
+        $societe->code_fournisseur='SU0901-1234';
+        $societe->fournisseur=0;
+        $societe->date_creation=$now;
+        $societe->tva_assuj=0;
+        $societe->particulier=0;
+
+        $societe->create($user);
+
+        self::$socid = $societe->id;
+        print __METHOD__." societe created id=".$societe->id."\n";
+
+        $db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
 
         print __METHOD__."\n";
     }
@@ -145,36 +145,36 @@ 
      */
     public static function tearDownAfterClass()
     {
-    	global $conf,$user,$langs,$db;
-		$db->rollback();
+        global $conf,$user,$langs,$db;
+        $db->rollback();
 
-		print __METHOD__."\n";
+        print __METHOD__."\n";
     }
 
-	/**
-	 * Init phpunit tests
-	 *
-	 * @return	void
-	 */
+    /**
+     * Init phpunit tests
+     *
+     * @return	void
+     */
     protected function setUp()
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
 
-		print __METHOD__."\n";
+        print __METHOD__."\n";
     }
 
-	/**
-	 * End phpunit tests
-	 *
-	 * @return	void
-	 */
+    /**
+     * End phpunit tests
+     *
+     * @return	void
+     */
     protected function tearDown()
     {
-    	print __METHOD__."\n";
+        print __METHOD__."\n";
     }
 
 
@@ -185,93 +185,93 @@ 
      */
     public function testWSInvoicesCreateInvoice()
     {
-    	global $conf,$user,$langs,$db;
-    	$conf=$this->savconf;
-    	$user=$this->savuser;
-    	$langs=$this->savlangs;
-    	$db=$this->savdb;
-
-    	$WS_METHOD  = 'createInvoice';
-
-    	$body = array (
-    			"id" => null,
-				"ref" => null,
-				"ref_ext" => "ref-phpunit-2",
-				"thirdparty_id" => self::$socid,
-				"fk_user_author" => null,
-				"fk_user_valid" => null,
-				"date" => "2015-04-19 20:16:53",
-				"date_due" => "",
-				"date_creation" => "",
-				"date_validation" => "",
-				"date_modification" =>  "",
-				"type" => "",
-				"total_net" => "36.30",
-				"total_vat" => "6.00",
-				"total" => "42.30",
-				"payment_mode_id" => 50,
-				"note_private" => "Synchronised from Prestashop",
-				"note_public" => "",
-				"status" => "1",
-				"close_code" => null ,
-				"close_note" => null,
-				"project_id" => null,
-				"lines" => array(
-					array("id" => null,
-					"type" => 0,
-					"desc" => "Horloge Vinyle Serge",
-					"vat_rate" => 20,
-					"qty" => 1,
-					"unitprice" => "30.000000",
-					"total_net" => "30.000000",
-					"total_vat" => "6.00",
-					"total" => "36.000000",
-					"date_start" => "",
-					"date_end" => "",
-					"payment_mode_id" => "",
-					"product_id" => "",
-					"product_ref" => "",
-					"product_label" => "",
-					"product_desc" => "" ))
-					);
-
-    	// Call the WebService method and store its result in $result.
-    	$authentication=array(
-    	'dolibarrkey'=>$conf->global->WEBSERVICES_KEY,
-    	'sourceapplication'=>'DEMO',
-    	'login'=>'admin',
-    	'password'=>'admin',
-    	'entity'=>'');
-
-    	// Test URL
-    	$result='';
-    	$parameters = array('authentication'=>$authentication,'invoice'=>$body);
-    	print __METHOD__." call method ".$WS_METHOD."\n";
-    	try {
-    		$result = $this->soapclient->call($WS_METHOD,$parameters,$this->ns,'');
-    	}
-    	catch(SoapFault $exception)
-    	{
-    		echo $exception;
-    		$result=0;
-    	}
-    	if (! $result || ! empty($result['faultstring']))
-    	{
-    		//var_dump($soapclient);
-    		print $this->soapclient->error_str;
-    		print "\n<br>\n";
-    		print $this->soapclient->request;
-    		print "\n<br>\n";
-    		print $this->soapclient->response;
-    		print "\n";
-    	}
-
-    	print __METHOD__." result=".$result['result']['result_code']."\n";
-    	$this->assertEquals('OK',$result['result']['result_code']);
-    	$this->assertEquals('ref-phpunit-2', $result['ref_ext']);
-
-
-    	return $result;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
+
+        $WS_METHOD  = 'createInvoice';
+
+        $body = array (
+                "id" => null,
+                "ref" => null,
+                "ref_ext" => "ref-phpunit-2",
+                "thirdparty_id" => self::$socid,
+                "fk_user_author" => null,
+                "fk_user_valid" => null,
+                "date" => "2015-04-19 20:16:53",
+                "date_due" => "",
+                "date_creation" => "",
+                "date_validation" => "",
+                "date_modification" =>  "",
+                "type" => "",
+                "total_net" => "36.30",
+                "total_vat" => "6.00",
+                "total" => "42.30",
+                "payment_mode_id" => 50,
+                "note_private" => "Synchronised from Prestashop",
+                "note_public" => "",
+                "status" => "1",
+                "close_code" => null ,
+                "close_note" => null,
+                "project_id" => null,
+                "lines" => array(
+                    array("id" => null,
+                    "type" => 0,
+                    "desc" => "Horloge Vinyle Serge",
+                    "vat_rate" => 20,
+                    "qty" => 1,
+                    "unitprice" => "30.000000",
+                    "total_net" => "30.000000",
+                    "total_vat" => "6.00",
+                    "total" => "36.000000",
+                    "date_start" => "",
+                    "date_end" => "",
+                    "payment_mode_id" => "",
+                    "product_id" => "",
+                    "product_ref" => "",
+                    "product_label" => "",
+                    "product_desc" => "" ))
+                    );
+
+        // Call the WebService method and store its result in $result.
+        $authentication=array(
+        'dolibarrkey'=>$conf->global->WEBSERVICES_KEY,
+        'sourceapplication'=>'DEMO',
+        'login'=>'admin',
+        'password'=>'admin',
+        'entity'=>'');
+
+        // Test URL
+        $result='';
+        $parameters = array('authentication'=>$authentication,'invoice'=>$body);
+        print __METHOD__." call method ".$WS_METHOD."\n";
+        try {
+            $result = $this->soapclient->call($WS_METHOD,$parameters,$this->ns,'');
+        }
+        catch(SoapFault $exception)
+        {
+            echo $exception;
+            $result=0;
+        }
+        if (! $result || ! empty($result['faultstring']))
+        {
+            //var_dump($soapclient);
+            print $this->soapclient->error_str;
+            print "\n<br>\n";
+            print $this->soapclient->request;
+            print "\n<br>\n";
+            print $this->soapclient->response;
+            print "\n";
+        }
+
+        print __METHOD__." result=".$result['result']['result_code']."\n";
+        $this->assertEquals('OK',$result['result']['result_code']);
+        $this->assertEquals('ref-phpunit-2', $result['ref_ext']);
+
+
+        return $result;
     }
 
     /**
@@ -285,49 +285,49 @@ 
      */
     public function testWSInvoicesGetInvoiceByRefExt($result)
     {
-    	global $conf,$user,$langs,$db;
-    	$conf=$this->savconf;
-    	$user=$this->savuser;
-    	$langs=$this->savlangs;
-    	$db=$this->savdb;
-
-    	$WS_METHOD  = 'getInvoice';
-
-    	// Call the WebService method and store its result in $result.
-    	$authentication=array(
-    	'dolibarrkey'=>$conf->global->WEBSERVICES_KEY,
-    	'sourceapplication'=>'DEMO',
-    	'login'=>'admin',
-    	'password'=>'admin',
-    	'entity'=>'');
-
-    	// Test URL
-    	$result='';
-    	$parameters = array('authentication'=>$authentication, 'id'=>null, 'ref'=>null, 'ref_ext'=>'ref-phpunit-2');
-    	print __METHOD__." call method ".$WS_METHOD."\n";
-    	try {
-    		$result = $this->soapclient->call($WS_METHOD,$parameters,$this->ns,'');
-    	}
-    	catch(SoapFault $exception)
-    	{
-    		echo $exception;
-    		$result=0;
-    	}
-    	if (! $result || ! empty($result['faultstring']))
-    	{
-    		print $this->soapclient->error_str;
-    		print "\n<br>\n";
-    		print $this->soapclient->request;
-    		print "\n<br>\n";
-    		print $this->soapclient->response;
-    		print "\n";
-    	}
-    	print __METHOD__." result=".$result['result']['result_code']."\n";
-    	$this->assertEquals('OK',$result['result']['result_code']);
-    	$this->assertEquals('ref-phpunit-2', $result['invoice']['ref_ext']);
-
-
-    	return $result;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
+
+        $WS_METHOD  = 'getInvoice';
+
+        // Call the WebService method and store its result in $result.
+        $authentication=array(
+        'dolibarrkey'=>$conf->global->WEBSERVICES_KEY,
+        'sourceapplication'=>'DEMO',
+        'login'=>'admin',
+        'password'=>'admin',
+        'entity'=>'');
+
+        // Test URL
+        $result='';
+        $parameters = array('authentication'=>$authentication, 'id'=>null, 'ref'=>null, 'ref_ext'=>'ref-phpunit-2');
+        print __METHOD__." call method ".$WS_METHOD."\n";
+        try {
+            $result = $this->soapclient->call($WS_METHOD,$parameters,$this->ns,'');
+        }
+        catch(SoapFault $exception)
+        {
+            echo $exception;
+            $result=0;
+        }
+        if (! $result || ! empty($result['faultstring']))
+        {
+            print $this->soapclient->error_str;
+            print "\n<br>\n";
+            print $this->soapclient->request;
+            print "\n<br>\n";
+            print $this->soapclient->response;
+            print "\n";
+        }
+        print __METHOD__." result=".$result['result']['result_code']."\n";
+        $this->assertEquals('OK',$result['result']['result_code']);
+        $this->assertEquals('ref-phpunit-2', $result['invoice']['ref_ext']);
+
+
+        return $result;
     }
 
     /**
@@ -341,93 +341,93 @@ 
      */
     public function testWSInvoicesUpdateInvoiceByRefExt($result)
     {
-    	global $conf,$user,$langs,$db;
-    	$conf=$this->savconf;
-    	$user=$this->savuser;
-    	$langs=$this->savlangs;
-    	$db=$this->savdb;
-
-    	$WS_METHOD  = 'updateInvoice';
-
-    	// update status to 2
-    	$body = array (
-    		"id" => null,
-			"ref" => null,
-			"ref_ext" => "ref-phpunit-2",
-			"thirdparty_id" => self::$socid,
-			"fk_user_author" => null,
-			"fk_user_valid" => null,
-			"date" => "2015-04-19 20:16:53",
-			"date_due" => "",
-			"date_creation" => "",
-			"date_validation" => "",
-			"date_modification" =>  "",
-			"type" => "",
-			"total_net" => "36.30",
-			"total_vat" => "6.00",
-			"total" => "42.30",
-			"payment_mode_id" => 50,
-			"note_private" => "Synchronised from Prestashop",
-			"note_public" => "",
-			"status" => "2",
-			"close_code" => null ,
-			"close_note" => null,
-			"project_id" => null,
-			"lines"  => array(
-				array(
-				"id"  => null,
-				"type" => 0,
-				"desc" => "Horloge Vinyle Serge",
-				"vat_rate" => 20,
-				"qty" => "1",
-				"unitprice" => "30.000000",
-				"total_net" => "30.000000",
-				"total_vat" => "6.00",
-				"total" => "36.000000",
-				"date_start" => "",
-				"date_end" => "",
-				"payment_mode_id" => "",
-				"product_id" => "",
-				"product_ref" => "",
-				"product_label" => "",
-				"product_desc" => "" ))
-			);
-
-    	// Call the WebService method and store its result in $result.
-    	$authentication=array(
-    	'dolibarrkey'=>$conf->global->WEBSERVICES_KEY,
-    	'sourceapplication'=>'DEMO',
-    	'login'=>'admin',
-    	'password'=>'admin',
-    	'entity'=>'');
-
-    	// Test URL
-    	$result='';
-    	$parameters = array('authentication'=>$authentication,'invoice'=>$body);
-    	print __METHOD__." call method ".$WS_METHOD."\n";
-    	try {
-    		$result = $this->soapclient->call($WS_METHOD,$parameters,$this->ns,'');
-    	}
-    	catch(SoapFault $exception)
-    	{
-    		echo $exception;
-    		$result=0;
-    	}
-    	if (! $result || ! empty($result['faultstring']))
-    	{
-    		print $this->soapclient->error_str;
-    		print "\n<br>\n";
-    		print $this->soapclient->request;
-    		print "\n<br>\n";
-    		print $this->soapclient->response;
-    		print "\n";
-    	}
-
-    	print __METHOD__." result=".$result['result']['result_code'].$result['result']['result_label']."\n";
-    	$this->assertEquals('OK',$result['result']['result_code']);
-    	$this->assertEquals('ref-phpunit-2', $result['ref_ext']);
-
-
-    	return $result;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
+
+        $WS_METHOD  = 'updateInvoice';
+
+        // update status to 2
+        $body = array (
+            "id" => null,
+            "ref" => null,
+            "ref_ext" => "ref-phpunit-2",
+            "thirdparty_id" => self::$socid,
+            "fk_user_author" => null,
+            "fk_user_valid" => null,
+            "date" => "2015-04-19 20:16:53",
+            "date_due" => "",
+            "date_creation" => "",
+            "date_validation" => "",
+            "date_modification" =>  "",
+            "type" => "",
+            "total_net" => "36.30",
+            "total_vat" => "6.00",
+            "total" => "42.30",
+            "payment_mode_id" => 50,
+            "note_private" => "Synchronised from Prestashop",
+            "note_public" => "",
+            "status" => "2",
+            "close_code" => null ,
+            "close_note" => null,
+            "project_id" => null,
+            "lines"  => array(
+                array(
+                "id"  => null,
+                "type" => 0,
+                "desc" => "Horloge Vinyle Serge",
+                "vat_rate" => 20,
+                "qty" => "1",
+                "unitprice" => "30.000000",
+                "total_net" => "30.000000",
+                "total_vat" => "6.00",
+                "total" => "36.000000",
+                "date_start" => "",
+                "date_end" => "",
+                "payment_mode_id" => "",
+                "product_id" => "",
+                "product_ref" => "",
+                "product_label" => "",
+                "product_desc" => "" ))
+            );
+
+        // Call the WebService method and store its result in $result.
+        $authentication=array(
+        'dolibarrkey'=>$conf->global->WEBSERVICES_KEY,
+        'sourceapplication'=>'DEMO',
+        'login'=>'admin',
+        'password'=>'admin',
+        'entity'=>'');
+
+        // Test URL
+        $result='';
+        $parameters = array('authentication'=>$authentication,'invoice'=>$body);
+        print __METHOD__." call method ".$WS_METHOD."\n";
+        try {
+            $result = $this->soapclient->call($WS_METHOD,$parameters,$this->ns,'');
+        }
+        catch(SoapFault $exception)
+        {
+            echo $exception;
+            $result=0;
+        }
+        if (! $result || ! empty($result['faultstring']))
+        {
+            print $this->soapclient->error_str;
+            print "\n<br>\n";
+            print $this->soapclient->request;
+            print "\n<br>\n";
+            print $this->soapclient->response;
+            print "\n";
+        }
+
+        print __METHOD__." result=".$result['result']['result_code'].$result['result']['result_label']."\n";
+        $this->assertEquals('OK',$result['result']['result_code']);
+        $this->assertEquals('ref-phpunit-2', $result['ref_ext']);
+
+
+        return $result;
     }
 }

dolibarr/test/phpunit/CommonInvoiceTest.php

Indentation +3 added lines, -3 removed lines

@@ -59,9 +59,9 @@ 
      */
     function __construct()
     {
-    	parent::__construct();
+        parent::__construct();
 
-    	//$this->sharedFixture
+        //$this->sharedFixture
         global $conf,$user,$langs,$db;
         $this->savconf=$conf;
         $this->savuser=$user;
@@ -110,7 +110,7 @@ 
      * End phpunit tests
      *
      * @return  void
-    */
+     */
     protected function tearDown()
     {
         print __METHOD__."\n";

dolibarr/test/phpunit/AdminLibTest.php

Indentation +15 added lines, -15 removed lines

@@ -59,9 +59,9 @@ 
      */
     function __construct()
     {
-    	parent::__construct();
+        parent::__construct();
 
-    	//$this->sharedFixture
+        //$this->sharedFixture
         global $conf,$user,$langs,$db;
         $this->savconf=$conf;
         $this->savuser=$user;
@@ -152,18 +152,18 @@ 
      */
     public function testEnableModule()
     {
-    	global $conf, $db, $langs, $user;
-
-		require_once dirname(__FILE__).'/../../htdocs/core/modules/modExpenseReport.class.php';
-		print "Enable module modExpenseReport";
-		$moduledescriptor=new modExpenseReport($db);
-		$moduledescriptor->init();
-		$conf->setValues($db);
-
-		require_once dirname(__FILE__).'/../../htdocs/core/modules/modApi.class.php';
-		print "Enable module modAPI";
-		$moduledescriptor=new modApi($db);
-		$moduledescriptor->init();
-		$conf->setValues($db);
+        global $conf, $db, $langs, $user;
+
+        require_once dirname(__FILE__).'/../../htdocs/core/modules/modExpenseReport.class.php';
+        print "Enable module modExpenseReport";
+        $moduledescriptor=new modExpenseReport($db);
+        $moduledescriptor->init();
+        $conf->setValues($db);
+
+        require_once dirname(__FILE__).'/../../htdocs/core/modules/modApi.class.php';
+        print "Enable module modAPI";
+        $moduledescriptor=new modApi($db);
+        $moduledescriptor->init();
+        $conf->setValues($db);
     }
 }