From 92e8f54e9a9658c3fdf90243ee0c33ab943a523e Mon Sep 17 00:00:00 2001
From: Gauthier <gauthier.verdol@atm-consulting.fr>
Date: Mon, 10 Mar 2014 10:53:20 +0100
Subject: [PATCH 01/10] error on ajax_constantonoff function

---
 htdocs/core/lib/ajax.lib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/lib/ajax.lib.php b/htdocs/core/lib/ajax.lib.php
index cc5ca841c52..f111551cc51 100644
--- a/htdocs/core/lib/ajax.lib.php
+++ b/htdocs/core/lib/ajax.lib.php
@@ -383,7 +383,7 @@ function ajax_constantonoff($code, $input=array(), $entity=null, $revertonoff=0)
 
 	$out= "\n<!-- Ajax code to switch constant ".$code." -->".'
 	<script type="text/javascript">
-		$(function() {
+		$(document).ready(function() {
 			var input = '.json_encode($input).';
 			var url = \''.DOL_URL_ROOT.'/core/ajax/constantonoff.php\';
 			var code = \''.$code.'\';

From fa56fe4e8b1d7cdb239b077661e0e34a8d443107 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Mon, 10 Mar 2014 19:36:32 +0100
Subject: [PATCH 02/10] Corrected Unknown error message typo

---
 htdocs/comm/action/document.php        | 2 +-
 htdocs/comm/propal/document.php        | 2 +-
 htdocs/compta/deplacement/document.php | 2 +-
 htdocs/compta/facture/document.php     | 2 +-
 htdocs/compta/sociales/document.php    | 2 +-
 htdocs/contrat/document.php            | 2 +-
 htdocs/fichinter/document.php          | 2 +-
 htdocs/fourn/facture/document.php      | 2 +-
 htdocs/langs/en_US/main.lang           | 2 +-
 htdocs/product/document.php            | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/htdocs/comm/action/document.php b/htdocs/comm/action/document.php
index 9ca99f8634b..972858a808f 100644
--- a/htdocs/comm/action/document.php
+++ b/htdocs/comm/action/document.php
@@ -261,7 +261,7 @@ if ($object->id > 0)
 }
 else
 {
-	print $langs->trans("UnkownError");
+	print $langs->trans("ErrorUnknown");
 }
 
 $db->close();
diff --git a/htdocs/comm/propal/document.php b/htdocs/comm/propal/document.php
index 50bc205d9f5..d3766ae27ce 100644
--- a/htdocs/comm/propal/document.php
+++ b/htdocs/comm/propal/document.php
@@ -137,7 +137,7 @@ if ($object->id > 0)
 }
 else
 {
-	print $langs->trans("UnkownError");
+	print $langs->trans("ErrorUnknown");
 }
 
 llxFooter();
diff --git a/htdocs/compta/deplacement/document.php b/htdocs/compta/deplacement/document.php
index 4c44fffa6e5..fb9df1fcb37 100644
--- a/htdocs/compta/deplacement/document.php
+++ b/htdocs/compta/deplacement/document.php
@@ -128,7 +128,7 @@ if ($object->id)
 }
 else
 {
-	print $langs->trans("UnkownError");
+	print $langs->trans("ErrorUnknown");
 }
 
 llxFooter();
diff --git a/htdocs/compta/facture/document.php b/htdocs/compta/facture/document.php
index cc16e5dcf77..1eb5909544b 100644
--- a/htdocs/compta/facture/document.php
+++ b/htdocs/compta/facture/document.php
@@ -160,7 +160,7 @@ if ($id > 0 || ! empty($ref))
 }
 else
 {
-	print $langs->trans("UnkownError");
+	print $langs->trans("ErrorUnknown");
 }
 
 $db->close();
diff --git a/htdocs/compta/sociales/document.php b/htdocs/compta/sociales/document.php
index 2e86a7a6986..88c888de62e 100644
--- a/htdocs/compta/sociales/document.php
+++ b/htdocs/compta/sociales/document.php
@@ -167,7 +167,7 @@ if ($object->id)
 }
 else
 {
-    print $langs->trans("UnkownError");
+    print $langs->trans("ErrorUnknown");
 }
 
 
diff --git a/htdocs/contrat/document.php b/htdocs/contrat/document.php
index c29d3b3186c..ea951f85941 100644
--- a/htdocs/contrat/document.php
+++ b/htdocs/contrat/document.php
@@ -130,7 +130,7 @@ if ($object->id)
 }
 else
 {
-	print $langs->trans("UnkownError");
+	print $langs->trans("ErrorUnknown");
 }
 
 
diff --git a/htdocs/fichinter/document.php b/htdocs/fichinter/document.php
index 76fff7b9834..27e1c4995c1 100644
--- a/htdocs/fichinter/document.php
+++ b/htdocs/fichinter/document.php
@@ -128,7 +128,7 @@ if ($object->id)
 }
 else
 {
-	print $langs->trans("UnkownError");
+	print $langs->trans("ErrorUnknown");
 }
 
 llxFooter();
diff --git a/htdocs/fourn/facture/document.php b/htdocs/fourn/facture/document.php
index 6c47f66ec7d..57cece25772 100644
--- a/htdocs/fourn/facture/document.php
+++ b/htdocs/fourn/facture/document.php
@@ -183,7 +183,7 @@ if ($object->id > 0)
 }
 else
 {
-    print $langs->trans('UnkownError');
+    print $langs->trans('ErrorUnknown');
 }
 
 
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index d889dedc9d6..c6e8f96bebe 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -34,7 +34,7 @@ ErrorFailedToOpenFile=Failed to open file %s
 ErrorCanNotCreateDir=Can not create dir %s
 ErrorCanNotReadDir=Can not read dir %s
 ErrorConstantNotDefined=Parameter %s not defined
-ErrorUnknown=Unkown error
+ErrorUnknown=Unknown error
 ErrorSQL=SQL Error
 ErrorLogoFileNotFound=Logo file '%s' was not found
 ErrorGoToGlobalSetup=Go to 'Company/Foundation' setup to fix this
diff --git a/htdocs/product/document.php b/htdocs/product/document.php
index 4a5d1691613..3137f31b793 100644
--- a/htdocs/product/document.php
+++ b/htdocs/product/document.php
@@ -147,7 +147,7 @@ if ($object->id)
 }
 else
 {
-	print $langs->trans("UnkownError");
+	print $langs->trans("ErrorUnknown");
 }
 
 

From 4209ad740c17d40bd45d8ff14bb012795a36ef8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Mon, 10 Mar 2014 23:20:48 +0100
Subject: [PATCH 03/10] Updated changelog

---
 ChangeLog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3683cb01472..b11ccfa1ef8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,7 +8,7 @@ Fix: Do not report trigger errors twice.
 Fix: Error when creating event was not reported.
 Fix: Bug of import of agenda when using https link
 Fix: Field nature not saved correctly
-Fix: Substituion of extra field was ko for order
+Fix: Substitution of extra field was ko for order
 Fix: Bad translation of date format for pt_BR.
 Fix: priority field of agenda record is smallint.
 Fix: Missing loading of lang in some pages.
@@ -28,7 +28,7 @@ Fix: Enable extrafields for customer order, proposal and invoice lines. This fea
 Fix: user right on Holiday for month report nor working.
 Fix: [ bug #1250 ] "Supplier Ref. product" sidebar search box does not work
 Fix: Bad space in predefined messages. 
-Fix: Signature was not added for email sent from thirdparty page.
+Fix: [ bug #1256 ] Signature was not added for email sent from thirdparty page.
 Fix: Action event SHIPPING_VALIDATE is not implemented
 Fix: The customer code was set to uppercase when using numbering module leopard. We
      must keep data safe of any change.

From 78ec0054d95acc96dc25f91e8eac46bf8d42d6a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Mon, 10 Mar 2014 23:33:09 +0100
Subject: [PATCH 04/10] Added bug number for agenda extrafield problems

---
 ChangeLog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index b11ccfa1ef8..f3c94e889ab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -32,7 +32,7 @@ Fix: [ bug #1256 ] Signature was not added for email sent from thirdparty page.
 Fix: Action event SHIPPING_VALIDATE is not implemented
 Fix: The customer code was set to uppercase when using numbering module leopard. We
      must keep data safe of any change.
-Fix: Loading actions extrafields fails.
+Fix: [ bug #1291 ] Loading actions extrafields fails.
 Fix: [ bug #1123 ] Paid deposit invoices are always shown as partially paid when fully paid
 Fix: Corrected project contact types translation.
 Fix: [ bug #1206 ] PMP price is bad calculated.

From 20262a01649d874a6973eb286d2c54d49752bf1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Mon, 10 Mar 2014 23:58:16 +0100
Subject: [PATCH 05/10] Fix bug #1295: Error when creating an agenda extrafield
 with a number as reference

---
 ChangeLog                       | 1 +
 htdocs/core/db/mysql.class.php  | 2 +-
 htdocs/core/db/mysqli.class.php | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3683cb01472..c0a7917a086 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -40,6 +40,7 @@ Fix: [ bug #520 ] Product statistics and detailed lists are wrong.
 Fix: [ bug #1240 ] traduction.
 Fix: [ bug #1238 ] When creating accompte with a %, free product are used for calculation.
 Fix: [ bug #1280 ] service with not end of date was tagged as expired.
+Fix: [ bug #1295 ] Error when creating an agenda extrafield with a number as reference
 
 ***** ChangeLog for 3.5 compared to 3.4.* *****
 For users:
diff --git a/htdocs/core/db/mysql.class.php b/htdocs/core/db/mysql.class.php
index ce1f6b9e3ea..923f04f992a 100644
--- a/htdocs/core/db/mysql.class.php
+++ b/htdocs/core/db/mysql.class.php
@@ -985,7 +985,7 @@ class DoliDBMysql extends DoliDB
     {
         // cles recherchees dans le tableau des descriptions (field_desc) : type,value,attribute,null,default,extra
         // ex. : $field_desc = array('type'=>'int','value'=>'11','null'=>'not null','extra'=> 'auto_increment');
-        $sql= "ALTER TABLE ".$table." ADD ".$field_name." ";
+        $sql= "ALTER TABLE ".$table." ADD `".$field_name."` ";
         $sql.= $field_desc['type'];
         if(preg_match("/^[^\s]/i",$field_desc['value']))
         if (! in_array($field_desc['type'],array('date','datetime')))
diff --git a/htdocs/core/db/mysqli.class.php b/htdocs/core/db/mysqli.class.php
index 8a653fc6579..2ed4c74bb17 100644
--- a/htdocs/core/db/mysqli.class.php
+++ b/htdocs/core/db/mysqli.class.php
@@ -979,7 +979,7 @@ class DoliDBMysqli extends DoliDB
     {
         // cles recherchees dans le tableau des descriptions (field_desc) : type,value,attribute,null,default,extra
         // ex. : $field_desc = array('type'=>'int','value'=>'11','null'=>'not null','extra'=> 'auto_increment');
-        $sql= "ALTER TABLE ".$table." ADD ".$field_name." ";
+        $sql= "ALTER TABLE ".$table." ADD `".$field_name."` ";
         $sql.= $field_desc['type'];
         if(preg_match("/^[^\s]/i",$field_desc['value']))
         if (! in_array($field_desc['type'],array('date','datetime')))

From 241ae7a4d1f0d60656c7179bb758b106a326de12 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 11 Mar 2014 20:53:47 +0100
Subject: [PATCH 06/10] Fix: Miscellaneous bugs on tasks management

Conflicts:
	htdocs/core/lib/project.lib.php
---
 htdocs/core/class/html.formother.class.php |  6 ++++--
 htdocs/core/lib/project.lib.php            | 13 ++++++-------
 htdocs/projet/tasks.php                    | 20 +++++++++-----------
 htdocs/projet/tasks/time.php               | 19 +++++++++++--------
 4 files changed, 30 insertions(+), 28 deletions(-)

diff --git a/htdocs/core/class/html.formother.class.php b/htdocs/core/class/html.formother.class.php
index aec3884ac15..a78c43fca60 100644
--- a/htdocs/core/class/html.formother.class.php
+++ b/htdocs/core/class/html.formother.class.php
@@ -481,6 +481,8 @@ class FormOther
             {
                 $var = !$var;
 
+				//var_dump($selectedtask."--".$selectedtask."--".$lines[$i]->fk_project."_".$lines[$i]->id);
+
                 // Break on a new project
                 if ($parent == 0)
                 {
@@ -508,10 +510,10 @@ class FormOther
                 }
 
                 // Print task
-                if ($lines[$i]->id > 0)
+                if ($lines[$i]->id >= 0)
                 {
                     print '<option value="'.$lines[$i]->fk_project.'_'.$lines[$i]->id.'"';
-                    if ($lines[$i]->id == $selectedtask) print ' selected="selected"';
+                    if (($lines[$i]->id == $selectedtask) || ($lines[$i]->fk_project.'_'.$lines[$i]->id == $selectedtask)) print ' selected="selected"';
                     print '>';
                     print $langs->trans("Project").' '.$lines[$i]->projectref;
                     if (empty($lines[$i]->public))
diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php
index 751ebbdfc5f..3f22eb93187 100644
--- a/htdocs/core/lib/project.lib.php
+++ b/htdocs/core/lib/project.lib.php
@@ -268,8 +268,8 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
 					{
 						// Note that having a user assigned to a task into a project user has no permission on, should not be possible
 						// because assignement on task can be done only on contact of project.
-						// If assignement was done and after, was removed from contact of project, then we can hide the line. 
-						$showline=0;	 
+						// If assignement was done and after, was removed from contact of project, then we can hide the line.
+						$showline=0;
 					}
 				}
 			}
@@ -285,7 +285,6 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
 
 				print '<tr '.$bc[$var].' id="row-'.$lines[$i]->id.'">'."\n";
 
-				// Project
 				if ($showproject)
 				{
 					print "<td>";
@@ -383,7 +382,7 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
 				if (! $showlineingray) $inc++;
 
 				$level++;
-				if ($lines[$i]->id) projectLinesa($inc, $lines[$i]->id, $lines, $level, $var, $showproject, $taskrole, $projectsListId, 0, $showalsopublicproj);
+				if ($lines[$i]->id) projectLinesa($inc, $lines[$i]->id, $lines, $level, $var, $showproject, $taskrole, $projectsListId, $addordertick);
 				$level--;
 				$total += $lines[$i]->duration;
 			}
@@ -394,7 +393,7 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
 		}
 	}
 
-	if ($total>0)
+	if ($total>0 && $level==0)
 	{
 		print '<tr class="liste_total">';
 		print '<td class="liste_total">'.$langs->trans("Total").'</td>';
@@ -404,9 +403,9 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
 		print '<td></td>';
 		print '<td></td>';
 		print '<td></td>';
-		if ($addordertick) print '<td class="hideonsmartphone"></td>';
 		print '<td align="right" class="nowrap liste_total">'.convertSecondToTime($total, 'allhourmin').'</td>';
 		print '<td></td>';
+		if ($addordertick) print '<td class="hideonsmartphone"></td>';
 		print '</tr>';
 	}
 
@@ -501,7 +500,7 @@ function projectLinesb(&$inc, $parent, $lines, &$level, &$projectsrole, &$tasksr
 
 			// Time spent
 			print '<td align="right">';
-			if ($lines[$i]->duration) 
+			if ($lines[$i]->duration)
 			{
 				print '<a href="'.DOL_URL_ROOT.'/projet/tasks/time.php?id='.$lines[$i]->id.'">';
 				print convertSecondToTime($lines[$i]->duration,'allhourmin');
diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php
index b423abe25c4..db473165d54 100644
--- a/htdocs/projet/tasks.php
+++ b/htdocs/projet/tasks.php
@@ -47,17 +47,15 @@ $object = new Project($db);
 $taskstatic = new Task($db);
 $extrafields_project = new ExtraFields($db);
 $extrafields_task = new ExtraFields($db);
-if ($ref)
+if ($id > 0 || $ref)
 {
-	$object->fetch(0,$ref);
+	$object->fetch($id,$ref);
 	$id=$object->id;
-}
+	$ref=$object->ref;
 
-// fetch optionals attributes and labels
-if (!empty($id)) {
+	// fetch optionals attributes and labels
 	$extralabels_projet=$extrafields_project->fetch_name_optionals_label($object->table_element);
 	$extralabels_task=$extrafields_task->fetch_name_optionals_label($taskstatic->table_element);
-
 }
 
 // Security check
@@ -295,7 +293,7 @@ if ($action == 'create' && $user->rights->projet->creer && (empty($object->socie
 
 	// List of projects
 	print '<tr><td class="fieldrequired">'.$langs->trans("ChildOfTask").'</td><td>';
-	print $formother->selectProjectTasks('',$projectid?$projectid:$object->id, 'task_parent', 0, 0, 1, 1);
+	print $formother->selectProjectTasks(GETPOST('task_parent'),$projectid?$projectid:$object->id, 'task_parent', 0, 0, 1, 1);
 	print '</td></tr>';
 
 	print '<tr><td>'.$langs->trans("AffectedTo").'</td><td>';
@@ -351,11 +349,11 @@ else
 {
 	/*
 	 * Fiche projet en mode visu
-	*/
+	 */
 
 	/*
 	 * Actions
-	*/
+	 */
 	print '<div class="tabsAction">';
 
 	if ($user->rights->projet->all->creer || $user->rights->projet->creer)
@@ -424,12 +422,12 @@ else
 	if (count($tasksarray) > 0)
 	{
 		// Show all lines in taskarray (recursive function to go down on tree)
-		$j=0;
+		$j=0; $level=0;
 		$nboftaskshown=projectLinesa($j, 0, $tasksarray, $level, true, 0, $tasksrole, $id, 1);
 	}
 	else
 	{
-		print '<tr><td colspan="'.(! empty($object->id) ? "5" : "4").'">'.$langs->trans("NoTasks").'</td></tr>';
+		print '<tr><td colspan="9">'.$langs->trans("NoTasks").'</td></tr>';
 	}
 	print "</table>";
 
diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php
index f6532e09d31..304781e8309 100644
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@@ -60,12 +60,12 @@ if ($action == 'addtimespent' && $user->rights->projet->creer)
 	$timespent_durationmin = GETPOST('timespent_durationmin','int');
 	if (empty($timespent_durationhour) && empty($timespent_durationmin))
 	{
-		$mesg='<div class="error">'.$langs->trans('ErrorFieldRequired',$langs->transnoentitiesnoconv("Duration")).'</div>';
+		setEventMessage($langs->trans('ErrorFieldRequired',$langs->transnoentitiesnoconv("Duration")),'errors');
 		$error++;
 	}
 	if (empty($_POST["userid"]))
 	{
-		$mesg='<div class="error">'.$langs->trans('ErrorUserNotAffectedToTask').'</div>';
+		setEventMessage($langs->trans('ErrorUserNotAffectedToTask'),'errors');
 		$error++;
 	}
 
@@ -82,11 +82,12 @@ if ($action == 'addtimespent' && $user->rights->projet->creer)
 		$result=$object->addTimeSpent($user);
 		if ($result >= 0)
 		{
-
+			setEventMessage($langs->trans("RecordSaved"));
 		}
 		else
 		{
-			$mesg='<div class="error">'.$langs->trans($object->error).'</div>';
+			setEventMessage($langs->trans($object->error),'errors');
+			$error++;
 		}
 	}
 	else
@@ -101,7 +102,7 @@ if ($action == 'updateline' && ! $_POST["cancel"] && $user->rights->projet->cree
 
 	if (empty($_POST["new_durationhour"]) && empty($_POST["new_durationmin"]))
 	{
-		$mesg='<div class="error">'.$langs->trans('ErrorFieldRequired',$langs->transnoentitiesnoconv("Duration")).'</div>';
+		setEventMessage($langs->trans('ErrorFieldRequired',$langs->transnoentitiesnoconv("Duration")),'errors');
 		$error++;
 	}
 
@@ -120,11 +121,12 @@ if ($action == 'updateline' && ! $_POST["cancel"] && $user->rights->projet->cree
 		$result=$object->updateTimeSpent($user);
 		if ($result >= 0)
 		{
-
+			setEventMessage($langs->trans("RecordSaved"));
 		}
 		else
 		{
-			$mesg='<div class="error">'.$langs->trans($object->error).'</div>';
+			setEventMessage($langs->trans($object->error),'errors');
+			$error++;
 		}
 	}
 	else
@@ -141,7 +143,8 @@ if ($action == 'confirm_delete' && $confirm == "yes" && $user->rights->projet->c
 	if (!$result)
 	{
 		$langs->load("errors");
-		$mesg='<div class="error">'.$langs->trans($object->error).'</div>';
+		setEventMessage($langs->trans($object->error),'errors');
+		$error++;
 		$action='';
 	}
 }

From 7684e9e4f728c5a4e1f0b993cef900747a4b1a9f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 11 Mar 2014 23:39:26 +0100
Subject: [PATCH 07/10] Fix: Add PHPUnit test to check main.lang files does not
 contains rubish values for keys SeparatorXXX Fix: Add PHPUnit test to check
 main.lang files does not contains rubish values for keys
 FormatDateShortJaxaXXX

---
 htdocs/langs/pt_BR/main.lang                  |   4 +-
 test/phpunit/AllTests.php                     |  14 +-
 ...nctions2Test.php => Functions2LibTest.php} |  12 +-
 ...FunctionsTest.php => FunctionsLibTest.php} |   4 +-
 test/phpunit/LangTest.php                     | 177 ++++++++++++++++++
 5 files changed, 197 insertions(+), 14 deletions(-)
 rename test/phpunit/{Functions2Test.php => Functions2LibTest.php} (96%)
 rename test/phpunit/{FunctionsTest.php => FunctionsLibTest.php} (99%)
 create mode 100755 test/phpunit/LangTest.php

diff --git a/htdocs/langs/pt_BR/main.lang b/htdocs/langs/pt_BR/main.lang
index e33b22f9ef9..2e36eda606b 100644
--- a/htdocs/langs/pt_BR/main.lang
+++ b/htdocs/langs/pt_BR/main.lang
@@ -10,8 +10,8 @@ SeparatorDecimal=,
 SeparatorThousand=None
 FormatDateShort=%d/%m/%Y
 FormatDateShortInput=%d/%m/%Y
-FormatDateShortJava=dd/mm/yyyy
-FormatDateShortJavaInput=dd/mm/yyyy
+FormatDateShortJava=dd/MM/yyyy
+FormatDateShortJavaInput=dd/MM/yyyy
 FormatDateShortJQuery=dd/mm/yy
 FormatDateShortJQueryInput=dd/mm/yy
 FormatHourShort=%I:%M %p
diff --git a/test/phpunit/AllTests.php b/test/phpunit/AllTests.php
index 89f17b4476b..65a373be905 100644
--- a/test/phpunit/AllTests.php
+++ b/test/phpunit/AllTests.php
@@ -74,13 +74,16 @@ class AllTests
 		$suite->addTestSuite('JsonLibTest');
 		require_once dirname(__FILE__).'/ImagesLibTest.php';
 		$suite->addTestSuite('ImagesLibTest');
-		require_once dirname(__FILE__).'/FunctionsTest.php';
-		$suite->addTestSuite('FunctionsTest');
-		require_once dirname(__FILE__).'/Functions2Test.php';
-		$suite->addTestSuite('Functions2Test');
+		require_once dirname(__FILE__).'/FunctionsLibTest.php';
+		$suite->addTestSuite('FunctionsLibTest');
+		require_once dirname(__FILE__).'/Functions2LibTest.php';
+		$suite->addTestSuite('Functions2LibTest');
 		require_once dirname(__FILE__).'/XCalLibTest.php';
 		$suite->addTestSuite('XCalLibTest');
 
+		require_once dirname(__FILE__).'/LangTest.php';
+		$suite->addTestSuite('LangTest');
+
         require_once dirname(__FILE__).'/SecurityTest.php';
         $suite->addTestSuite('SecurityTest');
 
@@ -166,6 +169,9 @@ class AllTests
         require_once dirname(__FILE__).'/ScriptsTest.php';
         $suite->addTestSuite('ScriptsTest');
 
+        require_once dirname(__FILE__).'/FormAdminTest.php';
+        $suite->addTestSuite('FormAdminTest');
+
         require_once dirname(__FILE__).'/ModulesTest.php';  // At end because it's the longer
         $suite->addTestSuite('ModulesTest');
 
diff --git a/test/phpunit/Functions2Test.php b/test/phpunit/Functions2LibTest.php
similarity index 96%
rename from test/phpunit/Functions2Test.php
rename to test/phpunit/Functions2LibTest.php
index 3c44e004fc9..6ac87d0c165 100755
--- a/test/phpunit/Functions2Test.php
+++ b/test/phpunit/Functions2LibTest.php
@@ -17,7 +17,7 @@
  */
 
 /**
- *      \file       test/phpunit/FunctionsTest.php
+ *      \file       test/phpunit/Functions2LibTest.php
  *		\ingroup    test
  *      \brief      PHPUnit test
  *		\remarks	To run this script as CLI:  phpunit filename.php
@@ -48,7 +48,7 @@ if (! defined("NOLOGIN"))        define("NOLOGIN",'1');       // If this page is
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class Functions2Test extends PHPUnit_Framework_TestCase
+class Functions2LibTest extends PHPUnit_Framework_TestCase
 {
     protected $savconf;
     protected $savuser;
@@ -128,20 +128,20 @@ class Functions2Test extends PHPUnit_Framework_TestCase
         print __METHOD__." result=".$result."\n";
         $this->assertEquals('νεο',$result);
     }
-    
+
     /**
      * isValidMailDomain
-     * 
+     *
      * @return void
      */
     public function testIsValidMailDomain()
     {
-    	
+
     }
 
     /**
      * isValidURL
-     * 
+     *
      * @return	void
      */
     public function testIsValidUrl()
diff --git a/test/phpunit/FunctionsTest.php b/test/phpunit/FunctionsLibTest.php
similarity index 99%
rename from test/phpunit/FunctionsTest.php
rename to test/phpunit/FunctionsLibTest.php
index 1fa41f0c460..c175a18a543 100755
--- a/test/phpunit/FunctionsTest.php
+++ b/test/phpunit/FunctionsLibTest.php
@@ -17,7 +17,7 @@
  */
 
 /**
- *      \file       test/phpunit/FunctionsTest.php
+ *      \file       test/phpunit/FunctionsLibTest.php
  *		\ingroup    test
  *      \brief      PHPUnit test
  *		\remarks	To run this script as CLI:  phpunit filename.php
@@ -48,7 +48,7 @@ if (! defined("NOLOGIN"))        define("NOLOGIN",'1');       // If this page is
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class FunctionsTest extends PHPUnit_Framework_TestCase
+class FunctionsLibTest extends PHPUnit_Framework_TestCase
 {
     protected $savconf;
     protected $savuser;
diff --git a/test/phpunit/LangTest.php b/test/phpunit/LangTest.php
new file mode 100755
index 00000000000..35f3f979487
--- /dev/null
+++ b/test/phpunit/LangTest.php
@@ -0,0 +1,177 @@
+<?php
+/* Copyright (C) 2013 Laurent Destailleur  <eldy@users.sourceforge.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * or see http://www.gnu.org/
+ */
+
+/**
+ *      \file       test/phpunit/LangTest.php
+ *		\ingroup    test
+ *      \brief      PHPUnit test
+ *		\remarks	To run this script as CLI:  phpunit filename.php
+ */
+
+global $conf,$user,$langs,$db;
+//define('TEST_DB_FORCE_TYPE','mysql');	// This is to force using mysql driver
+require_once 'PHPUnit/Autoload.php';
+require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
+require_once dirname(__FILE__).'/../../htdocs/core/lib/security.lib.php';
+require_once dirname(__FILE__).'/../../htdocs/core/lib/security2.lib.php';
+
+if (! defined('NOREQUIREUSER'))  define('NOREQUIREUSER','1');
+if (! defined('NOREQUIREDB'))    define('NOREQUIREDB','1');
+if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
+if (! defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN','1');
+if (! defined('NOCSRFCHECK'))    define('NOCSRFCHECK','1');
+if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1');
+if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1'); // If there is no menu to show
+if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1'); // If we don't need to load the html.form.class.php
+if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
+if (! defined("NOLOGIN"))        define("NOLOGIN",'1');       // If this page is public (can be called outside logged session)
+
+if (empty($user->id))
+{
+    print "Load permissions for admin user nb 1\n";
+    $user->fetch(1);
+    $user->getrights();
+}
+$conf->global->MAIN_DISABLE_ALL_MAILS=1;
+
+
+/**
+ * Class for PHPUnit tests
+ *
+ * @backupGlobals disabled
+ * @backupStaticAttributes enabled
+ * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
+ */
+class LangTest extends PHPUnit_Framework_TestCase
+{
+	protected $savconf;
+	protected $savuser;
+	protected $savlangs;
+	protected $savdb;
+
+	/**
+	 * Constructor
+	 * We save global variables into local variables
+	 *
+	 * @return SecurityTest
+	 */
+	function __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.
+
+    	print __METHOD__."\n";
+    }
+    public static function tearDownAfterClass()
+    {
+    	global $conf,$user,$langs,$db;
+		$db->rollback();
+
+		print __METHOD__."\n";
+    }
+
+	/**
+	 * 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;
+
+		print __METHOD__."\n";
+    }
+
+	/**
+	 * End phpunit tests
+	 *
+	 * @return	void
+	 */
+    protected function tearDown()
+    {
+    	print __METHOD__."\n";
+    }
+
+    /**
+     * testBank
+     *
+     * @return string
+     */
+    public function testLang()
+    {
+    	global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
+
+        include_once DOL_DOCUMENT_ROOT.'/core/class/translate.class.php';
+
+		$filesarray = scandir(DOL_DOCUMENT_ROOT.'/langs');
+		foreach($filesarray as $key => $code)
+		{
+			if (! preg_match('/^[a-z]+_[A-Z]+$/',$code)) continue;
+
+			print 'Check language file for code='.$code."\n";
+			$tmplangs=new Translate('',$conf);
+    		$langcode=$code;
+        	$tmplangs->setDefaultLang($langcode);
+			$tmplangs->load("main");
+
+			$result=$tmplangs->trans("SeparatorDecimal");
+			print __METHOD__." SeparatorDecimal=".$result."\n";
+			$this->assertContains($result,array('.',',','/',' ','','None'));
+
+			$result=$tmplangs->trans("SeparatorThousand");
+			print __METHOD__." SeparatorThousand=".$result."\n";
+			$this->assertContains($result,array('.',',','/',' ','','None','SeparatorThousand'));	// SeparatorThousand is returned when SeparatorThousand=Space
+
+			// Test java string contains only d,M,y,/,-,. and not m,...
+			$result=$tmplangs->trans("FormatDateShortJava");
+			print __METHOD__." FormatDateShortJava=".$result."\n";
+			$this->assertRegExp('/^[dMy\/\-\.]+$/',$result);
+			$result=$tmplangs->trans("FormatDateShortJavaInput");
+			print __METHOD__." FormatDateShortJavaInput=".$result."\n";
+			$this->assertRegExp('/^[dMy\/\-\.]+$/',$result);
+
+			unset($tmplangs);
+		}
+
+        return $result;
+    }
+}
+?>
\ No newline at end of file

From 4a983811d04afe120958e2b8dbf52e73dd052c69 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 12 Mar 2014 02:43:31 +0100
Subject: [PATCH 08/10] Fix: Avoid home project page to hung when too many
 tasks opened.

---
 htdocs/projet/index.php | 89 ++++++++++++++++++++++++++---------------
 1 file changed, 57 insertions(+), 32 deletions(-)

diff --git a/htdocs/projet/index.php b/htdocs/projet/index.php
index 6b1c0e7be9b..d3b0c611d13 100644
--- a/htdocs/projet/index.php
+++ b/htdocs/projet/index.php
@@ -26,6 +26,7 @@
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 
 
 $langs->load("projects");
@@ -81,7 +82,7 @@ print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 
 print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre">';
-print_liste_field_titre($langs->trans("ThirdParties"),"index.php","s.nom","","","",$sortfield,$sortorder);
+print_liste_field_titre($langs->trans("ThirdParties"),$_SERVER["PHP_SELF"],"s.nom","","","",$sortfield,$sortorder);
 print_liste_field_titre($langs->trans("NbOfProjects"),"","","","",'align="right"',$sortfield,$sortorder);
 print "</tr>\n";
 
@@ -132,13 +133,17 @@ else
 }
 print "</table>";
 
-print '</td></tr></table>';
 
 print '</div></div></div>';
 
 
+// Tasks for all resources of all opened projects and time spent for each task/resource
 print '<div class="fichecenter">';
-print '<BR>';
+
+print '<br>';
+
+print_fiche_titre($langs->trans("TimeSpent"),'','').'<br>';
+
 print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre">';
 print '<th>'.$langs->trans('TaskRessourceLinks').'</th>';
@@ -146,11 +151,11 @@ print '<th>'.$langs->trans('Projects').'</th>';
 print '<th>'.$langs->trans('Task').'</th>';
 print '<th>'.$langs->trans('DateStart').'</th>';
 print '<th>'.$langs->trans('DateEnd').'</th>';
-print '<th>'.$langs->trans('WorkloadOccupation').'</th>';
+print '<th>'.$langs->trans('TimeSpent').'</th>';
 print '</tr>';
 
 
-$sql = "SELECT p.title, p.rowid as projectid, t.label, t.rowid as taskid, u.rowid as userid, t.planned_workload, t.dateo, t.datee, tasktime.task_duration";
+$sql = "SELECT p.title, p.rowid as projectid, t.label, t.rowid as taskid, u.rowid as userid, t.planned_workload, t.dateo, t.datee, SUM(tasktime.task_duration) as timespent";
 $sql.= " FROM ".MAIN_DB_PREFIX."projet as p";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s on p.fk_soc = s.rowid";
 $sql.= " INNER JOIN ".MAIN_DB_PREFIX."projet_task as t on t.fk_projet = p.rowid";
@@ -160,6 +165,7 @@ $sql.= " WHERE p.entity = ".$conf->entity;
 if ($mine || ! $user->rights->projet->all->lire) $sql.= " AND p.rowid IN (".$projectsListId.")";
 if ($socid)	$sql.= "  AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
 $sql.= " AND p.fk_statut=1";
+$sql.= " GROUP BY p.title, p.rowid, t.label, t.rowid, u.rowid, t.planned_workload, t.dateo, t.datee";
 $sql.= " ORDER BY u.rowid, t.dateo, t.datee";
 
 $userstatic=new User($db);
@@ -171,42 +177,61 @@ if ( $resql )
 	$num = $db->num_rows($resql);
 	$i = 0;
 
-	while ($i < $num)
+	if ($num > (empty($conf->global->PROJECT_LIMIT_TASK_PROJECT_AREA)?1000:$conf->global->PROJECT_LIMIT_TASK_PROJECT_AREA))
 	{
-		$obj = $db->fetch_object($resql);
-		$var=!$var;
-
-		$username='';
-		$userstatic->fetch($obj->userid);
-		if (!empty($userstatic->id)) {
-			$username = $userstatic->getNomUrl(0,0);
-		}
-
-		print "<tr ".$bc[$var].">";
-		print '<td>'.$username.'</td>';
-		print '<td><a href="'.DOL_URL_ROOT.'/projet/fiche.php?id="'.$obj->projectid.'">'.$obj->title.'</a></td>';
-		print '<td><a href="'.DOL_URL_ROOT.'/projet/tasks/task.php?id='.$obj->taskid.'&withproject=1">'.$obj->label.'</a></td>';
-		print '<td>'.dol_print_date($db->jdate($obj->dateo)).'</td>';
-		print '<td>'.dol_print_date($db->jdate($obj->datee)).'</td>';
-		if (empty($obj->planned_workload)) {
-			$percentcompletion = '0';
-		} else {
-			$percentcompletion = intval(($obj->task_duration*100)/$obj->planned_workload);
-		}
-		print '<td><a href="'.DOL_URL_ROOT.'/projet/tasks/time.php?id='.$obj->taskid.'&withproject=1">'.$percentcompletion.' %</a></td>';
-		print "</tr>\n";
-
-		$i++;
+		print '<tr '.$bc[0].'>';
+		print '<td colspan="9">';
+		print $langs->trans("TooManyDataPleaseUseMoreFilters");
+		print '</td></tr>';
 	}
+	else
+	{
+		while ($i < $num)
+		{
+			$obj = $db->fetch_object($resql);
+			$var=!$var;
 
-	$db->free($resql);
+			$username='';
+			if ($obj->userid && $userstatic->id != $obj->userid)	// We have a user and it is not last loaded user
+			{
+				$result=$userstatic->fetch($obj->userid);
+				if (! $result) $userstatic->id=0;
+			}
+			if ($userstatic->id) $username = $userstatic->getNomUrl(0,0);
+
+			print "<tr ".$bc[$var].">";
+			print '<td>'.$username.'</td>';
+			print '<td><a href="'.DOL_URL_ROOT.'/projet/fiche.php?id='.$obj->projectid.'">'.$obj->title.'</a></td>';
+			print '<td><a href="'.DOL_URL_ROOT.'/projet/tasks/task.php?id='.$obj->taskid.'&withproject=1">'.$obj->label.'</a></td>';
+			print '<td>'.dol_print_date($db->jdate($obj->dateo)).'</td>';
+			print '<td>'.dol_print_date($db->jdate($obj->datee)).'</td>';
+			/* I disable this because information is wrong. This percent has no meaning for a particular resource. What do we want ?
+			 * Percent of completion ?
+			 * If we want to show completion, we must remove "user" into list,
+			if (empty($obj->planned_workload)) {
+				$percentcompletion = $langs->trans("Unknown");
+			} else {
+				$percentcompletion = intval($obj->task_duration*100/$obj->planned_workload);
+			}*/
+			print '<td><a href="'.DOL_URL_ROOT.'/projet/tasks/time.php?id='.$obj->taskid.'&withproject=1">';
+			//print $percentcompletion.' %';
+			print convertSecondToTime($obj->timespent, 'all');
+			print '</a></td>';
+			print "</tr>\n";
+
+			$i++;
+		}
+
+		$db->free($resql);
+	}
 }
 else
 {
 	dol_print_error($db);
 }
-print "</table></div>";
+print "</table>";
 
+print '</div>';
 
 
 

From e76f2170b3d351171aeb43ae5e16501e9eae39ac Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 12 Mar 2014 02:49:11 +0100
Subject: [PATCH 09/10] Fix: Avoid home project page to hung when too many
 tasks opened.

---
 htdocs/projet/index.php | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/htdocs/projet/index.php b/htdocs/projet/index.php
index d3b0c611d13..a4b71c62393 100644
--- a/htdocs/projet/index.php
+++ b/htdocs/projet/index.php
@@ -140,21 +140,6 @@ print '</div></div></div>';
 // Tasks for all resources of all opened projects and time spent for each task/resource
 print '<div class="fichecenter">';
 
-print '<br>';
-
-print_fiche_titre($langs->trans("TimeSpent"),'','').'<br>';
-
-print '<table class="noborder" width="100%">';
-print '<tr class="liste_titre">';
-print '<th>'.$langs->trans('TaskRessourceLinks').'</th>';
-print '<th>'.$langs->trans('Projects').'</th>';
-print '<th>'.$langs->trans('Task').'</th>';
-print '<th>'.$langs->trans('DateStart').'</th>';
-print '<th>'.$langs->trans('DateEnd').'</th>';
-print '<th>'.$langs->trans('TimeSpent').'</th>';
-print '</tr>';
-
-
 $sql = "SELECT p.title, p.rowid as projectid, t.label, t.rowid as taskid, u.rowid as userid, t.planned_workload, t.dateo, t.datee, SUM(tasktime.task_duration) as timespent";
 $sql.= " FROM ".MAIN_DB_PREFIX."projet as p";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s on p.fk_soc = s.rowid";
@@ -179,13 +164,27 @@ if ( $resql )
 
 	if ($num > (empty($conf->global->PROJECT_LIMIT_TASK_PROJECT_AREA)?1000:$conf->global->PROJECT_LIMIT_TASK_PROJECT_AREA))
 	{
-		print '<tr '.$bc[0].'>';
+/*		print '<tr '.$bc[0].'>';
 		print '<td colspan="9">';
 		print $langs->trans("TooManyDataPleaseUseMoreFilters");
-		print '</td></tr>';
+		print '</td></tr>';*/
 	}
 	else
 	{
+		print '<br>';
+
+		print_fiche_titre($langs->trans("TimeSpent"),'','').'<br>';
+
+		print '<table class="noborder" width="100%">';
+		print '<tr class="liste_titre">';
+		print '<th>'.$langs->trans('TaskRessourceLinks').'</th>';
+		print '<th>'.$langs->trans('Projects').'</th>';
+		print '<th>'.$langs->trans('Task').'</th>';
+		print '<th>'.$langs->trans('DateStart').'</th>';
+		print '<th>'.$langs->trans('DateEnd').'</th>';
+		print '<th>'.$langs->trans('TimeSpent').'</th>';
+		print '</tr>';
+
 		while ($i < $num)
 		{
 			$obj = $db->fetch_object($resql);
@@ -222,14 +221,15 @@ if ( $resql )
 			$i++;
 		}
 
-		$db->free($resql);
+		print "</table>";
 	}
+
+	$db->free($resql);
 }
 else
 {
 	dol_print_error($db);
 }
-print "</table>";
 
 print '</div>';
 

From dd7970b5493bf982fea5584e7381daf69f5037d2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 12 Mar 2014 12:57:26 +0100
Subject: [PATCH 10/10] Fix: Regression, so introduce option to restore old
 behaviour.

---
 htdocs/user/class/usergroup.class.php | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/htdocs/user/class/usergroup.class.php b/htdocs/user/class/usergroup.class.php
index fa9290b589e..debf67f95eb 100644
--- a/htdocs/user/class/usergroup.class.php
+++ b/htdocs/user/class/usergroup.class.php
@@ -178,9 +178,10 @@ class UserGroup extends CommonObject
 	 * 	Return array of users id for group this->id (or all if this->id not defined)
 	 *
 	 * 	@param	string	$excludefilter		Filter to exclude
+	 *  @param	int		$mode				0=Return array of user instance, 1=Return array of users id only
 	 * 	@return	array 						Array of users
 	 */
-	function listUsersForGroup($excludefilter='')
+	function listUsersForGroup($excludefilter='', $mode=0)
 	{
 		global $conf, $user;
 
@@ -211,11 +212,15 @@ class UserGroup extends CommonObject
 			{
 				if (! array_key_exists($obj->rowid, $ret))
 				{
-					$newuser=new User($this->db);
-					$newuser->fetch($obj->rowid);
-					$ret[$obj->rowid]=$newuser;
+					if ($mode != 1)
+					{
+						$newuser=new User($this->db);
+						$newuser->fetch($obj->rowid);
+						$ret[$obj->rowid]=$newuser;
+					}
+					else $ret[$obj->rowid]=$obj->rowid;
 				}
-				if (! empty($obj->usergroup_entity))
+				if ($mode != 1 && ! empty($obj->usergroup_entity))
 				{
 					$ret[$obj->rowid]->usergroup_entity[]=$obj->usergroup_entity;
 				}
@@ -744,4 +749,4 @@ class UserGroup extends CommonObject
 	}
 }
 
-?>
+?>
\ No newline at end of file