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

Dolibarr · May 19, 2014 · ff1eb98 · ff1eb98
2 parents 5a5c858 + 5641540
commit ff1eb98
Show file tree

Hide file tree

Showing 16 changed files with 35 additions and 36 deletions.
diff --git a/htdocs/admin/boxes.php b/htdocs/admin/boxes.php
@@ -57,7 +57,7 @@
 
     $db->begin();
 
-	// Initialize distinctfkuser with all already existing values of fk_user (user that use a personalized view of boxes for pos)
+	// Initialize distinct fkuser with all already existing values of fk_user (user that use a personalized view of boxes for page "pos")
 	$distinctfkuser=array();
 	if (! $error)
 	{
@@ -85,14 +85,31 @@
 		}
 	}
 
+	$distinctfkuser['0']='0';	// Add entry for fk_user = 0. We must use string as key and val
+
 	foreach($distinctfkuser as $fk_user)
 	{
-	    if (! $error && $fk_user != 0)    // We will add fk_user = 0 later.
+	    if (! $error && $fk_user != '')
 	    {
+	    	$nbboxonleft=$nbboxonright=0;
+	    	$sql = "SELECT box_order FROM ".MAIN_DB_PREFIX."boxes WHERE position = ".GETPOST("pos","alpha")." AND fk_user = ".$fk_user." AND entity = ".$conf->entity;
+	        dol_syslog("boxes.php activate box sql=".$sql);
+	        $resql = $db->query($sql);
+	        if ($resql)
+	        {
+	        	while($obj = $db->fetch_object($resql))
+	        	{
+					$boxorder=$obj->box_order;
+					if (preg_match('/A/',$boxorder)) $nbboxonleft++;
+					if (preg_match('/B/',$boxorder)) $nbboxonright++;
+	        	}
+	        }
+	        else dol_print_error($db);
+
 	        $sql = "INSERT INTO ".MAIN_DB_PREFIX."boxes (";
 	        $sql.= "box_id, position, box_order, fk_user, entity";
 	        $sql.= ") values (";
-	        $sql.= GETPOST("boxid","int").", ".GETPOST("pos","alpha").", 'A01', ".$fk_user.", ".$conf->entity;
+	        $sql.= GETPOST("boxid","int").", ".GETPOST("pos","alpha").", '".(($nbboxonleft > $nbboxonright) ? 'B01' : 'A01')."', ".$fk_user.", ".$conf->entity;
 	        $sql.= ")";
 
 	        dol_syslog("boxes.php activate box sql=".$sql);
@@ -105,24 +122,6 @@
 	    }
 	}
 
-	// If value 0 was not included, we add it.
-	if (! $error)
-	{
-	    $sql = "INSERT INTO ".MAIN_DB_PREFIX."boxes (";
-	    $sql.= "box_id, position, box_order, fk_user, entity";
-	    $sql.= ") values (";
-	    $sql.= GETPOST("boxid","int").", ".GETPOST("pos","alpha").", 'A01', 0, ".$conf->entity;
-	    $sql.= ")";
-
-	    dol_syslog("boxes.php activate box sql=".$sql);
-	    $resql = $db->query($sql);
-        if (! $resql)
-        {
-		    $errmesg=$db->lasterror();
-            $error++;
-        }
-	}
-
 	if (! $error)
 	{
 		header("Location: boxes.php");

diff --git a/test/phpunit/CategorieTest.php b/test/phpunit/CategorieTest.php
@@ -336,4 +336,4 @@ public function testCategorieStatic()
     }
 
 }
-?>
+?>
diff --git a/test/phpunit/CompanyBankAccountTest.php b/test/phpunit/CompanyBankAccountTest.php
@@ -233,4 +233,4 @@ public function testCompanyBankAccountOther($localobject)
     }
 
 }
-?>
+?>
diff --git a/test/phpunit/CoreTest.php b/test/phpunit/CoreTest.php
@@ -297,4 +297,4 @@ function test_sql_and_script_inject($val, $type)
 		$this->assertEquals($result,$expectedresult);
     }
 }
-?>
+?>
diff --git a/test/phpunit/DateLibTzFranceTest.php b/test/phpunit/DateLibTzFranceTest.php
@@ -199,4 +199,4 @@ public function testDolPrintDateTzFrance()
     }
 
 }
-?>
+?>
diff --git a/test/phpunit/ExportTest.php b/test/phpunit/ExportTest.php
@@ -265,4 +265,4 @@ public function testExportModulesDatasets()
         return true;
     }
 }
-?>
+?>
diff --git a/test/phpunit/FactureTest.php b/test/phpunit/FactureTest.php
@@ -329,4 +329,4 @@ public function objCompare($oA,$oB,$ignoretype=true,$fieldstoignorearray=array('
         return $retAr;
     }
 }
-?>
+?>
diff --git a/test/phpunit/FactureTestRounding.php b/test/phpunit/FactureTestRounding.php
@@ -333,4 +333,4 @@ public function testFactureAddLine3()
     }
 
 }
-?>
+?>
diff --git a/test/phpunit/ImportTest.php b/test/phpunit/ImportTest.php
@@ -134,4 +134,4 @@ public function testImportSample1()
     }
 
 }
-?>
+?>
diff --git a/test/phpunit/JsonLibTest.php b/test/phpunit/JsonLibTest.php
@@ -170,4 +170,4 @@ public function testJsonEncode()
     }
 
 }
-?>
+?>
diff --git a/test/phpunit/ModulesTest.php b/test/phpunit/ModulesTest.php
@@ -146,4 +146,4 @@ public function testModulesInit()
     }
 
 }
-?>
+?>
diff --git a/test/phpunit/PropalTest.php b/test/phpunit/PropalTest.php
@@ -287,4 +287,4 @@ public function testVerifyNumRef()
     }
 
 }
-?>
+?>
diff --git a/test/phpunit/WebservicesInvoicesTest.php b/test/phpunit/WebservicesInvoicesTest.php
@@ -176,4 +176,4 @@ public function testWSInvoicesXxx()
     }
 
 }
-?>
+?>
diff --git a/test/phpunit/WebservicesOrdersTest.php b/test/phpunit/WebservicesOrdersTest.php
@@ -175,4 +175,4 @@ public function testWSOrderXxx()
     }
 
 }
-?>
+?>
diff --git a/test/phpunit/WebservicesOtherTest.php b/test/phpunit/WebservicesOtherTest.php
@@ -176,4 +176,4 @@ public function testWSOtherGetVersions()
     }
 
 }
-?>
+?>
diff --git a/test/phpunit/WebservicesThirdpartyTest.php b/test/phpunit/WebservicesThirdpartyTest.php
@@ -176,4 +176,4 @@ public function testWSThirdpartyXxx()
     }
 
 }
-?>
+?>