From 51f1577c84506e4cdb6db2c0662b16b471a12f87 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 3 Aug 2014 23:32:36 +0200
Subject: [PATCH] Fix: Field for user into event is "owner".

---
 htdocs/comm/action/fiche.php                  | 26 +++++++++----------
 .../install/mysql/tables/llx_actioncomm.sql   |  4 +--
 htdocs/langs/en_US/commercial.lang            |  2 +-
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/htdocs/comm/action/fiche.php b/htdocs/comm/action/fiche.php
index 520cb5d175a..d17b1acb4f0 100644
--- a/htdocs/comm/action/fiche.php
+++ b/htdocs/comm/action/fiche.php
@@ -518,18 +518,18 @@ if ($action == 'create')
     // Location
     print '<tr><td>'.$langs->trans("Location").'</td><td colspan="3"><input type="text" name="location" size="50" value="'.$object->location.'"></td></tr>';
 
+	// Assigned to
+	$var=false;
+	print '<tr><td class="nowrap">'.$langs->trans("ActionAffectedTo").'</td><td>';
+	$form->select_users(GETPOST("affectedto")?GETPOST("affectedto"):(! empty($object->usertodo->id) && $object->usertodo->id > 0 ? $object->usertodo->id : $user->id),'affectedto',1);
+	print '</td></tr>';
+
 	print '</table>';
 
 	print '<br><br>';
 
 	print '<table class="border" width="100%">';
 
-	// Assigned to
-	$var=false;
-	print '<tr><td width="30%" class="nowrap">'.$langs->trans("ActionAffectedTo").'</td><td>';
-	$form->select_users(GETPOST("affectedto")?GETPOST("affectedto"):(! empty($object->usertodo->id) && $object->usertodo->id > 0 ? $object->usertodo->id : $user->id),'affectedto',1);
-	print '</td></tr>';
-
 	// Busy
 	print '<tr><td width="30%" class="nowrap">'.$langs->trans("Busy").'</td><td>';
 	print '<input id="transparency" type="checkbox" name="transparency"'.($actioncomm->transparency?' checked="checked"':'').'>';
@@ -772,15 +772,15 @@ if ($id > 0)
         // Location
         print '<tr><td>'.$langs->trans("Location").'</td><td colspan="3"><input type="text" name="location" size="50" value="'.$object->location.'"></td></tr>';
 
-		print '</table><br><br><table class="border" width="100%">';
-
 		// Assigned to
-		print '<tr><td width="30%" class="nowrap">'.$langs->trans("ActionAffectedTo").'</td><td colspan="3">';
+		print '<tr><td class="nowrap">'.$langs->trans("ActionAffectedTo").'</td><td colspan="3">';
 		print $form->select_dolusers($object->usertodo->id>0?$object->usertodo->id:-1,'affectedto',1);
 		print '</td></tr>';
 
+        print '</table><br><br><table class="border" width="100%">';
+
 		// Busy
-		print '<tr><td class="nowrap">'.$langs->trans("Busy").'</td><td>';
+		print '<tr><td width="30%" class="nowrap">'.$langs->trans("Busy").'</td><td>';
 		print '<input id="transparency" type="checkbox" name="transparency"'.($object->transparency?' checked="checked"':'').'">';
 		print '</td></tr>';
 
@@ -947,15 +947,15 @@ if ($id > 0)
         // Location
         print '<tr><td>'.$langs->trans("Location").'</td><td colspan="2">'.$object->location.'</td></tr>';
 
-		print '</table><br><br><table class="border" width="100%">';
-
 		// Assigned to
 		print '<tr><td width="30%" class="nowrap">'.$langs->trans("ActionAffectedTo").'</td><td colspan="3">';
 		if ($object->usertodo->id > 0) print $object->usertodo->getNomUrl(1);
 		print '</td></tr>';
 
+		print '</table><br><br><table class="border" width="100%">';
+
 		// Busy
-		print '<tr><td class="nowrap">'.$langs->trans("Busy").'</td><td colspan="3">';
+		print '<tr><td width="30%" class="nowrap">'.$langs->trans("Busy").'</td><td colspan="3">';
 		if ($object->usertodo->id > 0) print yn(($object->transparency > 0)?1:0);	// We show nothing if event is assigned to nobody
 		print '</td></tr>';
 
diff --git a/htdocs/install/mysql/tables/llx_actioncomm.sql b/htdocs/install/mysql/tables/llx_actioncomm.sql
index 1dce458fb72..c42cf377b85 100644
--- a/htdocs/install/mysql/tables/llx_actioncomm.sql
+++ b/htdocs/install/mysql/tables/llx_actioncomm.sql
@@ -45,9 +45,9 @@ create table llx_actioncomm
   fk_parent			integer NOT NULL default 0,
 
   fk_user_action	integer,						-- user id of owner of action (currently also user id of actor that must do action. In future, actors assigned to action will be an array into table llx_actioncomm_resources)
+  transparency      integer,						-- transparency (ical standard). used to say if user assigned to event are busy or not by event (in future version, this field is deprecated and will be stored into table llx_actioncomm_resources)
 
-  transparency      integer,						-- transparency (ical standard). used to say if people assigned to event are busy or not by event (in future version, this field is deprecated and will be stored into table llx_actioncomm_resources)
-  fk_user_done		integer,						-- user id of people that has made action (deprecated)
+  fk_user_done		integer,						-- user id of user that has made action (deprecated)
   
   priority			smallint,
   fulldayevent		smallint NOT NULL default 0,
diff --git a/htdocs/langs/en_US/commercial.lang b/htdocs/langs/en_US/commercial.lang
index a863cf37b17..3f2f5a6a96a 100644
--- a/htdocs/langs/en_US/commercial.lang
+++ b/htdocs/langs/en_US/commercial.lang
@@ -62,7 +62,7 @@ LastProspectContactDone=Contact done
 DateActionPlanned=Date event planned for
 DateActionDone=Date event done
 ActionAskedBy=Event reported by
-ActionAffectedTo=Event assigned to
+ActionAffectedTo=Event owned by
 ActionDoneBy=Event done by
 ActionUserAsk=Reported by
 ErrorStatusCantBeZeroIfStarted=If field '<b>Date done</b>' is filled, action is started (or finished), so field '<b>Status</b>' can't be 0%%.