New: Input of action is easier.

htdocs/admin/company.php

@@ -65,7 +65,7 @@ if ( (isset($_POST["action"]) && $_POST["action"] == 'update')
 				{
 					create_exdir($conf->societe->dir_logos);
 				}        
-				if (dol_move_uploaded_file($_FILES["logo"]["tmp_name"],$conf->societe->dir_logos.'/'.$original_file,1))
+				if (dol_move_uploaded_file($_FILES["logo"]["tmp_name"],$conf->societe->dir_logos.'/'.$original_file,1) > 0)
 				{
 					dolibarr_set_const($db, "MAIN_INFO_SOCIETE_LOGO",$original_file);
 					
@@ -660,7 +660,7 @@ else
 		$s.='   ';
 		if ($conf->use_javascript_ajax)
 		{
-			$s.='<a href="#" onclick="javascript: CheckVAT(document.formsoc.tva_intra_code.value,document.formsoc.tva_intra_num.value);" alt="'.$langs->trans("VATIntraCheckableOnEUSite").'">'.$langs->trans("VATIntraCheck").'</a>';
+			$s.='<a href="#" onClick="javascript: CheckVAT(document.formsoc.tva_intra_code.value,document.formsoc.tva_intra_num.value);" alt="'.$langs->trans("VATIntraCheckableOnEUSite").'">'.$langs->trans("VATIntraCheck").'</a>';
 			print $form->textwithhelp($s,$langs->trans("VATIntraCheckDesc",$langs->trans("VATIntraCheck")),1);
 		}
 		else

htdocs/comm/action/fiche.php

@@ -20,11 +20,11 @@
  */
 
 /**
-        \file       htdocs/comm/action/fiche.php
-        \ingroup    agenda
-        \brief      Page for action card
-        \version    $Id$
-*/
+ *       \file       htdocs/comm/action/fiche.php
+ *       \ingroup    agenda
+ *       \brief      Page for action card
+ *       \version    $Id$
+ */
 
 require_once("./pre.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/contact.class.php");
@@ -110,6 +110,13 @@ if ($_POST["action"] == 'add_action')
                    $_POST["a2day"],
                    $_POST["a2year"]);
 	
+	if (! $datep2 && $_POST["percentage"] == 100)
+	{
+		$error=1;
+	   	$_GET["action"] = 'create';
+	   	$mesg='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->trans("DateEnd")).'</div>';
+	}
+                   
 	// Initialisation objet cactioncomm
     if (! $_POST["actioncode"])
     {
@@ -395,6 +402,10 @@ if ($_POST["action"] == 'update')
 
 
 
+/*
+ * View
+ */
+
 llxHeader();
 
 $html = new Form($db);
@@ -413,7 +424,7 @@ if ($_GET["action"] == 'create')
 		$result=$contact->fetch($_GET["contactid"]);
 	}
 
-	print '<form name="action" action="fiche.php" method="post">';
+	print '<form name="formaction" action="fiche.php" method="post">';
 	print '<input type="hidden" name="action" value="add_action">';
     if (! empty($_REQUEST["backtopage"])) print '<input type="hidden" name="backtopage" value="'.($_REQUEST["backtopage"] != 1 ? $_REQUEST["backtopage"] : $_SERVER["HTTP_REFERER"]).'">';
 
@@ -440,14 +451,10 @@ if ($_GET["action"] == 'create')
 	print '</td></tr>';
 
 	// Title
-	print '<tr><td>'.$langs->trans("Title").'</td><td><input type="text" name="label" size="30" value="'.$actioncomm->label.'"></td></tr>';
+	print '<tr><td>'.$langs->trans("Title").'</td><td><input type="text" name="label" size="60" value="'.$actioncomm->label.'"></td></tr>';
 	
 	// Location
-	print '<tr><td>'.$langs->trans("Location").'</td><td><input type="text" name="location" size="30" value="'.$actioncomm->location.'"></td></tr>';
-	
-	print '</table>';
-	print '<br>';
-	print '<table class="border" width="100%">';
+	print '<tr><td>'.$langs->trans("Location").'</td><td><input type="text" name="location" size="60" value="'.$actioncomm->location.'"></td></tr>';
 	
 	// Societe, contact
 	print '<tr><td width="30%" nowrap="nowrap">'.$langs->trans("ActionOnCompany").'</td><td>';
@@ -472,8 +479,18 @@ if ($_GET["action"] == 'create')
 		print '</td></tr>';
 	}
 
+	print '</table>';
+	print '<br>';
+	print '<table class="border" width="100%">';
+	
+	// Created by
+	/*print '<tr><td width="30%" nowrap="nowrap">'.$langs->trans("ActionUserAsk").'</td><td>';
+	print $user->getNomUrl();
+	print '</td></tr>';
+	*/
+	
 	// Affecte a
-	print '<tr><td nowrap>'.$langs->trans("ActionAffectedTo").'</td><td>';
+	print '<tr><td width="30%" nowrap="nowrap">'.$langs->trans("ActionAffectedTo").'</td><td>';
 	$html->select_users($_REQUEST["affectedto"]?$_REQUEST["affectedto"]:$actioncomm->usertodo,'affectedto',1);
 	print '</td></tr>';
 
@@ -520,20 +537,25 @@ if ($_GET["action"] == 'create')
 	*/
 	
 	// Avancement
-	if ($_REQUEST["afaire"] == 1)
+	print '<tr><td width="10%">'.$langs->trans("Status").' / '.$langs->trans("Percentage").'</td>';
+	print '<td>';
+	$percent=0;
+	if (isset($_POST['percentage']))
 	{
-		print '<input type="hidden" name="percentage" value="0">';
-		print '<input type="hidden" name="todo" value="on">';
-		print '<tr><td width="10%">'.$langs->trans("Status").' / '.$langs->trans("Percentage").'</td><td>'.$langs->trans("StatusActionToDo").' / 0%</td></tr>';
+		$percent=$_POST['percentage'];
 	}
-	elseif ($_REQUEST["afaire"] == 2)
-	{
-		print '<input type="hidden" name="percentage" value="100">';
-		print '<tr><td>'.$langs->trans("Status").' / '.$langs->trans("Percentage").'</td><td>'.$langs->trans("StatusActionDone").' / 100%</td></tr>';
-	} else
+	else
 	{
-		print '<tr><td>'.$langs->trans("Status").' / '.$langs->trans("Percentage").'</td><td><input type="text" name="percentage" value="0" size="4">%</td></tr>';
+		if ($_REQUEST["afaire"] == 1) $percent=0;
+		if ($_REQUEST["afaire"] == 2) $percent=100;
 	}
+	print $html->form_select_status_action('formaction',$percent,1);
+	print '</td></tr>';
+
+	// Priority
+	print '<tr><td nowrap>'.$langs->trans("Priority").'</td><td colspan="3">';
+	print '<input type="text" name="priority" value="'.$act->priority.'" size="5">';
+	print '</td></tr>';
 
 	add_row_for_calendar_link();
 
@@ -548,7 +570,7 @@ if ($_GET["action"] == 'create')
 	}
 	else
 	{
-		print '<textarea name="note" cols="90" rows="'.ROWS_8.'"></textarea>';
+		print '<textarea name="note" cols="90" rows="'.ROWS_7.'"></textarea>';
 	}
 	print '</td></tr>';
 
@@ -633,7 +655,7 @@ if ($_GET["id"])
     if ($_REQUEST["action"] == 'edit')
     {
         // Fiche action en mode edition
-        print '<form action="fiche.php" method="post">';
+        print '<form name="formaction" action="fiche.php" method="post">';
         print '<input type="hidden" name="action" value="update">';
         print '<input type="hidden" name="id" value="'.$_REQUEST["id"].'">';
         if (! empty($_REQUEST["backtopage"])) print '<input type="hidden" name="from" value="'.($_REQUEST["from"] ? $_REQUEST["from"] : $_SERVER["HTTP_REFERER"]).'">';
@@ -696,15 +718,18 @@ if ($_GET["id"])
 		if ($act->percentage > 0 && $act->percentage < 100 && $act->datef && $act->datef < (time() - $conf->global->MAIN_DELAY_ACTIONS_TODO)) print img_warning($langs->trans("Late"));
 		print '</td></tr>';
 
-		// Priorite
+		// Status
+        print '<tr><td nowrap>'.$langs->trans("Status").' / '.$langs->trans("Percentage").'</td><td colspan="3">';
+		$percent=isset($_REQUEST["percentage"])?$_REQUEST["percentage"]:$act->percentage;
+		print $html->form_select_status_action('formaction',$percent,1);
+        print '</td></tr>';
+
+		// Priority
 		print '<tr><td nowrap>'.$langs->trans("Priority").'</td><td colspan="3">';
 		print '<input type="text" name="priority" value="'.$act->priority.'" size="5">';
 		print '</td></tr>';
 
-		// Status
-        print '<tr><td nowrap>'.$langs->trans("Status").' / '.$langs->trans("Percentage").'</td><td colspan="3"><input name="percentage" value="'.(isset($_REQUEST["percentage"])?$_REQUEST["percentage"]:$act->percentage).'" size="4">%</td></tr>';
-
-		// Object linked
+        // Object linked
         if ($act->objet_url)
         {
             print '<tr><td>'.$langs->trans("LinkedObject").'</td>';
@@ -722,7 +747,7 @@ if ($_GET["id"])
 	    }
 	    else
 	    {
-			print '<textarea name="note" cols="90" rows="'.ROWS_8.'">'.dol_htmlentitiesbr_decode($act->note).'</textarea>';
+			print '<textarea name="note" cols="90" rows="'.ROWS_7.'">'.dol_htmlentitiesbr_decode($act->note).'</textarea>';
 	    }
 
         print '</td></tr>';
@@ -797,17 +822,17 @@ if ($_GET["id"])
 		if ($act->percentage > 0 && $act->percentage < 100 && $act->datef && $act->datef < (time() - $conf->global->MAIN_DELAY_ACTIONS_TODO)) print img_warning($langs->trans("Late"));
 		print '</td></tr>';
 
-		// Priorite
-		print '<tr><td nowrap>'.$langs->trans("Priority").'</td><td colspan="3">';
-		print $act->priority;
-		print '</td></tr>';
-
         // Statut
         print '<tr><td nowrap>'.$langs->trans("Status").' / '.$langs->trans("Percentage").'</td><td colspan="3">';
         print $act->getLibStatut(4);
         print '</td></tr>';
 
-		// Objet lie
+		// Priority
+		print '<tr><td nowrap>'.$langs->trans("Priority").'</td><td colspan="3">';
+		print $act->priority;
+		print '</td></tr>';
+
+        // Objet lie
         if ($act->objet_url)
         {
             print '<tr><td>'.$langs->trans("LinkedObject").'</td>';

htdocs/html.form.class.php

@@ -26,18 +26,17 @@
  */
 
 /**
- \file       htdocs/html.form.class.php
- \brief      Fichier de la classe des fonctions prdfinie de composants html
- \version	$Id$
+ *	\file       htdocs/html.form.class.php
+ *	\brief      Fichier de la classe des fonctions prdfinie de composants html
+ *	\version	$Id$
  */
 
 
 /**
- \class      Form
- \brief      Classe permettant la gnration de composants html
- \remarks	Only common components must be here.
+ *	\class      Form
+ *	\brief      Classe permettant la gnration de composants html
+ *	\remarks	Only common components must be here.
  */
-
 class Form
 {
 	var $db;
@@ -1585,6 +1584,44 @@ class Form
 
 
 
+	/**
+	 *      \brief      Show list of action status
+	 */
+	function form_select_status_action($formname,$selected,$canedit=1)
+	{
+		global $langs,$conf;
+
+		$listofstatus=array('0'=>$langs->trans("ActionRunningNotStarted"),'50'=>$langs->trans("ActionRunningShort"),'100'=>$langs->trans("ActionDoneShort"));
+
+		if ($conf->use_javascript_ajax)
+		{
+			print "\n";
+			print '<script type="text/javascript">'."\n";
+			print 'function select_status(mypercentage) {'."\n";
+			print 'document.'.$formname.'.percentageshown.value=mypercentage;'."\n";
+			print 'document.'.$formname.'.percentage.value=mypercentage;'."\n";
+			print 'if (mypercentage == 0) { document.'.$formname.'.percentageshown.disabled=true; }'."\n";
+			print 'else if (mypercentage == 100) { document.'.$formname.'.percentageshown.disabled=true; }'."\n";
+			print 'else { document.'.$formname.'.percentageshown.disabled=false; }'."\n";
+			print '}'."\n";
+			print '</script>'."\n";
+			print '<select '.($canedit?'':'disabled="true" ').'name="status" class="flat" onChange="select_status(document.'.$formname.'.status.value)">';
+			foreach($listofstatus as $key => $val)
+			{
+				print '<option value="'.$key.'"'.($selected == $key?' selected="true"':'').'>'.$val.'</option>';
+			}
+			print '</select>';
+			if ($selected == 0 || $selected == 100) $canedit=0;
+			print ' <input type="text" name="percentageshown" class="flat" value="'.$selected.'" size="2"'.($canedit?'':' disabled="true"').' onChange="select_status(document.'.$formname.'.percentageshown.value)">%';
+			print ' <input type="hidden" name="percentage" value="'.$selected.'">';
+		}
+		else
+		{
+			print ' <input type="text" name="percentage" class="flat" value="'.$selected.'" size="2"'.($canedit?'':' disabled="true"').'>%';
+		}
+	}
+
+	
 	/**
 	 *      \brief      Retourne la liste des types de paiements possibles
 	 *      \param      selected        Id du type de paiement pr-slectionn
@@ -2699,7 +2736,7 @@ class Form
 				{
 					// Zone de saisie manuelle de la date
 					print '<input id="'.$prefix.'" name="'.$prefix.'" type="text" size="10" maxlength="11" value="'.$formated_date.'"';
-					print ' onChange="dpChangeDay(\''.$prefix.'\',\''.$conf->format_date_short_java.'\')"';
+					print ' onChange="dpChangeDay(\''.$prefix.'\',\''.$conf->format_date_short_java.'\'); "';
 					print '>';
 						
 					// Icone calendrier
@@ -2716,11 +2753,11 @@ class Form
 					// Calendrier popup version defaut
 					if ($langs->defaultlang != "")
 					{
-						print '<script language="javascript" type="text/javascript">';
+						print '<script type="text/javascript">';
 						print 'selectedLanguage = "'.substr($langs->defaultlang,0,2).'"';
 						print '</script>';
 					}
-					print '<script language="javascript" type="text/javascript" src="'.DOL_URL_ROOT.'/lib/lib_calendar.js"></script>';
+					print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/lib/lib_calendar.js"></script>';
 					print '<input id="'.$prefix.'" type="text" name="'.$prefix.'" size="10" value="'.$formated_date.'"';
 					print ' onChange="dpChangeDay(\''.$prefix.'\',\''.$conf->format_date_short_java.'\')"';
 					print '> ';

htdocs/langs/en_US/admin.lang

@@ -147,7 +147,7 @@ ActiveOn=Activated on
 SourceFile=Source file
 AutomaticIfJavascriptDisabled=Automatic if Javascript is disabled
 AvailableOnlyIfJavascriptNotDisabled=Available only if JavaScript is not disabled
-AvailableOnlyIfJavascriptAndAjaxNotDisabled=Available only if JavaScript and Ajax are not disabled
+AvailableOnlyIfJavascriptAndAjaxNotDisabled=Available only if JavaScript is not disabled
 Required=Required
 Security=Security
 Passwords=Passwords

htdocs/langs/en_US/main.lang

@@ -256,7 +256,11 @@ Comments=Comments
 ActionsToDo=Actions to do
 ActionsDone=Actions done
 ActionsToDoShort=To do
+ActionsRunningshort=Started
 ActionsDoneShort=Done
+ActionRunningNotStarted=Not started
+ActionRunningShort=Started
+ActionDoneShort=Finished
 CompanyFundation=Company/Fundation
 ContactsForCompany=Contacts for this third party
 ActionsOnCompany=Actions about this third party

htdocs/langs/fr_FR/admin.lang

@@ -147,7 +147,7 @@ ActiveOn=Active sur
 SourceFile=Fichier source
 AutomaticIfJavascriptDisabled=Automatique si Javascript désactivé
 AvailableOnlyIfJavascriptNotDisabled=Disponible uniquement si Javascript non désactivé
-AvailableOnlyIfJavascriptAndAjaxNotDisabled=Disponible uniquement si Javascript et Ajax non désactivé
+AvailableOnlyIfJavascriptAndAjaxNotDisabled=Disponible uniquement si Javascript non désactivé
 Required=Requis
 Security=Sécurité
 Passwords=Mots de passe

htdocs/langs/fr_FR/main.lang

@@ -258,6 +258,9 @@ ActionsToDo=Actions
 ActionsDone=Actions effectuées
 ActionsToDoShort=À faire
 ActionsDoneShort=Effectuées
+ActionRunningNotStarted=Non commencé
+ActionRunningShort=En cours
+ActionDoneShort=Terminé
 CompanyFundation=Société ou institution
 ContactsForCompany=Contacts de ce tiers
 ActionsOnCompany=Actions vis à vis de ce tiers

htdocs/lib/datepicker.php

@@ -45,7 +45,7 @@ print '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://ww
 print '<html><head>';
 if (isset($_GET["mode"]) && $_GET["mode"] == 'test')
 {
-	print '<script language="javascript" type="text/javascript" src="'.DOL_URL_ROOT.'/lib/lib_head.js"></script>'."\n";
+	print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/lib/lib_head.js"></script>'."\n";
 }
 else
 {
@@ -65,7 +65,7 @@ $tradTemp=array($langs->trans("January"),
 				$langs->trans("November"),
 				$langs->trans("December")
 				);
-print '<script language="javascript" type="text/javascript">';
+print '<script type="text/javascript">';
 print 'var tradMonths = '.php2js($tradTemp).';';
 print '</script>'."\n";
 print '</head><body>'."\n";

htdocs/main.inc.php

@@ -644,7 +644,7 @@ function dol_loginfunction($langs,$conf,$mysoc)
 	print '}'."\n";
 	print '-->'."\n";
 	print '</style>'."\n";
-	print '<script language="javascript" type="text/javascript">'."\n";
+	print '<script type="text/javascript">'."\n";
 	print "function donnefocus() {\n";
 	if (! $_REQUEST["username"]) print "document.getElementById('username').focus();\n";
 	else print "document.getElementById('password').focus();\n";
@@ -845,16 +845,16 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
 		// Output javascript links
 		if (! $disablejs && $conf->use_javascript_ajax)
 		{
-			print '<script language="javascript" type="text/javascript" src="'.DOL_URL_ROOT.'/lib/lib_head.js"></script>'."\n";
+			print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/lib/lib_head.js"></script>'."\n";
 		}
 		if (! $disablejs && $conf->use_javascript_ajax)
 		{
 			require_once DOL_DOCUMENT_ROOT.'/lib/ajax.lib.php';
 
 			// This one is required for all Ajax features
-			print '<script language="javascript" type="text/javascript" src="'.DOL_URL_ROOT.'/includes/scriptaculous/lib/prototype.js"></script>'."\n";
+			print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/scriptaculous/lib/prototype.js"></script>'."\n";
 			// This one is required fox boxes
-			print '<script language="javascript" type="text/javascript" src="'.DOL_URL_ROOT.'/includes/scriptaculous/src/scriptaculous.js"></script>'."\n";
+			print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/scriptaculous/src/scriptaculous.js"></script>'."\n";
 
 			// Those ones are required only with option "confirm by ajax popup"
 			if ($conf->global->MAIN_CONFIRM_AJAX)
@@ -862,17 +862,17 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
 				// PWC css
 				print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/alert.css">'."\n";
 				// Scriptaculous used by PWC
-				print '<script language="javascript" type="text/javascript" src="'.DOL_URL_ROOT.'/includes/scriptaculous/src/effects.js"></script>'."\n";
-				print '<script language="javascript" type="text/javascript" src="'.DOL_URL_ROOT.'/includes/scriptaculous/src/controls.js"></script>'."\n";
+				print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/scriptaculous/src/effects.js"></script>'."\n";
+				print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/scriptaculous/src/controls.js"></script>'."\n";
 				// PWC js
-				print '<script language="javascript" type="text/javascript" src="'.DOL_URL_ROOT.'/includes/pwc/window.js"></script>'."\n";
+				print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/pwc/window.js"></script>'."\n";
 			}
 		}
 		if (is_array($arrayofjs))
 		{
 			foreach($arrayofjs as $jsfile)
 			{
-				print '<script language="javascript" type="text/javascript" src="'.DOL_URL_ROOT.'/'.$jsfile.'"></script>'."\n";
+				print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/'.$jsfile.'"></script>'."\n";
 			}
 		}
 
@@ -1147,7 +1147,7 @@ function llxFooter($foot='',$limitIEbug=1)
 	if (! empty($_SERVER['DOL_TUNING']))
 	{
 		$micro_end_time=dol_microtime_float(true);
-		print '<script language="javascript" type="text/javascript">window.status="Build time: '.ceil(1000*($micro_end_time-$micro_start_time)).' ms';
+		print '<script type="text/javascript">window.status="Build time: '.ceil(1000*($micro_end_time-$micro_start_time)).' ms';
 		if (function_exists("memory_get_usage"))
 		{
 			print ' - Memory usage: '.memory_get_usage();
@@ -1162,7 +1162,7 @@ function llxFooter($foot='',$limitIEbug=1)
 
 	if ($conf->use_javascript_ajax)
 	{
-		print '<script language="javascript" type="text/javascript" src="'.DOL_URL_ROOT.'/lib/lib_foot.js"></script>';
+		print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/lib/lib_foot.js"></script>';
 	}
 
 	// Juste pour eviter bug IE qui reorganise mal div precedents si celui-ci absent

htdocs/user/passwordforgotten.php

@@ -181,7 +181,7 @@ print '  font-size: 12px;';
 print '}'."\n";
 print '-->'."\n";
 print '</style>'."\n";
-print '<script language="javascript" type="text/javascript">'."\n";
+print '<script type="text/javascript">'."\n";
 print "function donnefocus() {\n";
 if (! $_REQUEST["username"]) print "document.getElementById('username').focus();\n";
 else print "document.getElementById('password').focus();\n";