diff --git a/ChangeLog b/ChangeLog
index 811660a00b0..55975d60898 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,10 +14,13 @@ For users:
 - New: Can expand/collapse menus, categories and users list.
 - New: extra parameters are supported into ODT templates.
 - New: total per vat rate are available as tags for ODT templates.
-- New: Add more types for extra parameters (lists, phone, emails, checkbox, prices)
+- New: Add more types for extra parameters (lists, phone, emails, checkbox, prices).
 - New: Some part of interface use more CSS3 (ie: agenda)
-- New: [ task #707 ] Create option ProfIdx are mandatory to validate a invoice
-  
+- New: [ task #707 ] Create option ProfIdx are mandatory to validate a invoice.
+- New: Can define of we want to use VAT or not for subscriptions (foundation module).
+- New: Can define a default choice for choice "More action when recording
+  a subscription" (foundation module).
+
 For developers:
 - System of menu managers has been rewritten to reduce code to do same things. 
 - An external module can force its theme.
@@ -37,6 +40,36 @@ For translators:
 - Update language files.
 
 
+
+***** ChangeLog for 3.3.1 compared to 3.3 *****
+
+- Fix: [ bug #733 ] Mass emailing tools do not support <style HTML tag
+- Fix: Package for launchpad
+- Fix: [ bug #736 ] Missing column in llx_c_chargesociales  
+- Fix: Localtax2 for Spain must be based into buyer
+
+
+
+
+***** ChangeLog for 3.3.1 compared to 3.3 *****
+
+- Fix: [ bug #733 ] Mass emailing tools do not support <style HTML tag
+- Fix: Package for launchpad
+- Fix: [ bug #736 ] Missing column in llx_c_chargesociales  
+- Fix: Localtax2 for Spain must be based into buyer
+
+
+
+
+***** ChangeLog for 3.3.1 compared to 3.3 *****
+
+- Fix: [ bug #733 ] Mass emailing tools do not support <style HTML tag
+- Fix: Package for launchpad
+- Fix: [ bug #736 ] Missing column in llx_c_chargesociales  
+- Fix: Localtax2 for Spain must be based into buyer
+
+
+
 ***** ChangeLog for 3.3 compared to 3.2.3 *****
 For users:
 - New: Add holiday module, to declare and follow holidays of your employees.
diff --git a/build/debian/changelog b/build/debian/changelog
index 1b4daf52782..8a995f9f778 100644
--- a/build/debian/changelog
+++ b/build/debian/changelog
@@ -4,6 +4,6 @@ dolibarr (3.4.0+nmu1) unstable; urgency=low
   * New upstream release.
     closes: bug#634783
     
- -- Dolibarr team <contact@dolibarr.org>  Mon, 14 Jan 2013 12:00:00 +0100     
+ -- Dolibarr team <contact@dolibarr.org>  Sat, 2 Mar 2013 12:00:00 +0100     
 
-# For a changelog file dedicated to end users, see /usr/share/doc/dolibarr/ChangeLog.gz 
\ No newline at end of file
+# For a changelog file dedicated to end users, see /usr/share/doc/dolibarr/ChangeLog.gz  
diff --git a/build/launchpad/README b/build/launchpad/README
index 489712e91f8..2334b01f1d7 100644
--- a/build/launchpad/README
+++ b/build/launchpad/README
@@ -96,11 +96,11 @@ https://launchpad.net/dolibarr/stable
 		lp:dolibarr
 		merge packaging lp:~yourlogin/+junk/debian-dev
     	For beta:
-	    # bzr-builder format 0.3 deb-version {debupstream}-0~{revno}
+	    # bzr-builder format 0.3 deb-version {debupstream}-1~{revno}
 		lp:dolibarr/beta
 		merge packaging lp:~yourlogin/+junk/debian-beta
     	For stable:
-	    # bzr-builder format 0.3 deb-version {debupstream}-0~{revno}
+	    # bzr-builder format 0.3 deb-version {debupstream}-2~{revno}
 		lp:dolibarr/stable
 		merge packaging lp:~yourlogin/+junk/debian-stable
 - Run command
diff --git a/dev/README b/dev/README
index 84f5c762068..88011d07509 100644
--- a/dev/README
+++ b/dev/README
@@ -2,7 +2,7 @@ README (English)
 --------------------------------
 This directory contains sub-directories to provide tools or
 documentation for developers.
-Note: All files in this directory are in CVS only and are not
+Note: All files in this directory are in VCS only and are not
 provided with a standard release.
 
 
diff --git a/dev/findutf8bom.sh b/dev/findutf8bom.sh
new file mode 100755
index 00000000000..b7e290fec84
--- /dev/null
+++ b/dev/findutf8bom.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+#
+# Checks if files contains UTF-8 BOM
+# in dolibarr source tree excluding
+# git repository, custom modules and incuded libraries
+#
+# Raphaël Doursenaud - rdoursenaud@gpcsolutions.fr
+grep -rlI \
+--exclude-dir='.git' --exclude-dir='includes' --exclude-dir='custom' \
+$'\xEF\xBB\xBF' .
diff --git a/dev/findutf8bomincludes.sh b/dev/findutf8bomincludes.sh
new file mode 100755
index 00000000000..4a9458654d2
--- /dev/null
+++ b/dev/findutf8bomincludes.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+#
+# Checks if files contains UTF-8 BOM
+# in dolibarr includes tree excluding
+# git repository
+#
+# Raphaël Doursenaud - rdoursenaud@gpcsolutions.fr
+grep -rlI \
+--exclude-dir='.git' \
+$'\xEF\xBB\xBF' htdocs/includes
diff --git a/dev/removeutf8bom.sh b/dev/removeutf8bom.sh
new file mode 100755
index 00000000000..83ae6e68671
--- /dev/null
+++ b/dev/removeutf8bom.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+#
+# Removes UTF-8 BOM from a file list on STDIN
+# Use by piping the output of a findutf8bom script
+#
+# Raphaël Doursenaud - rdoursenaud@gpcsolutions.fr
+while read f; do
+	echo "Fixing $f"
+	sed -i '1s/^\xEF\xBB\xBF//' $f
+done
diff --git a/doc/images/README b/doc/images/README
index 1b33a1d490b..7b6a051aada 100644
--- a/doc/images/README
+++ b/doc/images/README
@@ -1,4 +1,4 @@
-README (English)
+README (English)
 --------------------------------
 
 * Most screen captures and icons are Dolibarr contributions, however,
diff --git a/htdocs/adherents/admin/adherent.php b/htdocs/adherents/admin/adherent.php
index ea481c64661..91bbbb33049 100644
--- a/htdocs/adherents/admin/adherent.php
+++ b/htdocs/adherents/admin/adherent.php
@@ -169,31 +169,54 @@ print $form->selectyesno('constvalue',(! empty($conf->global->ADHERENT_DEFAULT_S
 print '</td><td align="center" width="80">';
 print '<input type="submit" class="button" value="'.$langs->trans("Update").'" name="Button">';
 print "</td></tr>\n";
-print '</form>';
+print '</form>';
 
-// Insertion cotisations dans compte financier
+// Insert subscription into bank account
 $var=!$var;
 print '<form action="adherent.php" method="POST">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" name="action" value="update">';
 print '<input type="hidden" name="constname" value="ADHERENT_BANK_USE">';
-print '<tr '.$bc[$var].'><td>'.$langs->trans("AddSubscriptionIntoAccount").'</td>';
-if (! empty($conf->banque->enabled))
-{
-    print '<td>';
-    print $form->selectyesno('constvalue',$conf->global->ADHERENT_BANK_USE,1);
-    print '</td><td align="center" width="80">';
-    print '<input type="submit" class="button" value="'.$langs->trans("Update").'" name="Button">';
-    print '</td>';
-}
-else
-{
-    print '<td align="right" colspan="2">';
-    print $langs->trans("WarningModuleNotActive",$langs->transnoentities("Module85Name"));
-    print '</td>';
-}
+print '<tr '.$bc[$var].'><td>'.$langs->trans("MoreActionsOnSubscription").'</td>';
+$arraychoices=array('0'=>$langs->trans("None"));
+if (! empty($conf->banque->enabled)) $arraychoices['bankdirect']=$langs->trans("MoreActionBankDirect");
+if (! empty($conf->banque->enabled) && ! empty($conf->societe->enabled) && ! empty($conf->facture->enabled)) $arraychoices['invoiceonly']=$langs->trans("MoreActionInvoiceOnly");
+if (! empty($conf->banque->enabled) && ! empty($conf->societe->enabled) && ! empty($conf->facture->enabled)) $arraychoices['bankviainvoice']=$langs->trans("MoreActionBankViaInvoice");
+print '<td>';
+print $form->selectarray('constvalue',$arraychoices,$conf->global->ADHERENT_BANK_USE,0);
+print '</td><td align="center" width="80">';
+print '<input type="submit" class="button" value="'.$langs->trans("Update").'" name="Button">';
+print '</td>';
 print "</tr>\n";
-print '</form>';
+print '</form>';
+
+// Use vat for invoice creation
+if ($conf->facture->enabled)
+{
+	$var=!$var;
+	print '<form action="adherent.php" method="POST">';
+	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+	print '<input type="hidden" name="action" value="update">';
+	print '<input type="hidden" name="constname" value="ADHERENT_VAT_FOR_SUBSCRIPTIONS">';
+	print '<tr '.$bc[$var].'><td>'.$langs->trans("VATToUseForSubscriptions").'</td>';
+	if (! empty($conf->banque->enabled))
+	{
+		print '<td>';
+		print $form->selectarray('constvalue', array('0'=>$langs->trans("NoVatOnSubscription"),'defaultforfoundationcountry'=>$langs->trans("Default")), (empty($conf->global->ADHERENT_VAT_FOR_SUBSCRIPTIONS)?'0':$conf->global->ADHERENT_VAT_FOR_SUBSCRIPTIONS), 0);
+		print '</td><td align="center" width="80">';
+		print '<input type="submit" class="button" value="'.$langs->trans("Update").'" name="Button">';
+		print '</td>';
+	}
+	else
+	{
+		print '<td align="right" colspan="2">';
+		print $langs->trans("WarningModuleNotActive",$langs->transnoentities("Module85Name"));
+		print '</td>';
+	}
+	print "</tr>\n";
+	print '</form>';
+}
+
 print '</table>';
 print '<br>';
 
diff --git a/htdocs/adherents/card_subscriptions.php b/htdocs/adherents/card_subscriptions.php
index 199e2025b47..6b989004b3c 100644
--- a/htdocs/adherents/card_subscriptions.php
+++ b/htdocs/adherents/card_subscriptions.php
@@ -362,7 +362,11 @@ if ($user->rights->adherent->cotisation->creer && $action == 'cotisation' && ! $
 
                 // Add line to draft invoice
                 $idprodsubscription=0;
-                $vattouse=get_default_tva($mysoc, $customer, $idprodsubscription);
+                $vattouse=0;
+                if (isset($conf->global->ADHERENT_VAT_FOR_SUBSCRIPTIONS) && $conf->global->ADHERENT_VAT_FOR_SUBSCRIPTIONS == 'defaultforfoundationcountry')
+                {
+                	$vattouse=get_default_tva($mysoc, $mysoc, $idprodsubscription);
+                }
                 //print xx".$vattouse." - ".$mysoc." - ".$customer;exit;
                 $result=$invoice->addline($invoice->id,$label,0,1,$vattouse,0,0,$idprodsubscription,0,$datecotisation,$datesubend,0,0,'','TTC',$cotisation,1);
                 if ($result <= 0)
@@ -756,9 +760,9 @@ if ($rowid)
         }
         else
        {
-        	if (! empty($conf->global->ADHERENT_BANK_USE) && ! empty($conf->banque->enabled) && ! empty($conf->societe->enabled) && ! empty($conf->facture->enabled) && $object->fk_soc) $bankviainvoice=1;
-       		else if (! empty($conf->global->ADHERENT_BANK_USE) && ! empty($conf->banque->enabled)) $bankdirect=1;
-        	else if (empty($conf->global->ADHERENT_BANK_USE) && ! empty($conf->banque->enabled) && ! empty($conf->societe->enabled) && ! empty($conf->facture->enabled) && $object->fk_soc) $invoiceonly=1;
+        	if (! empty($conf->global->ADHERENT_BANK_USE) && $conf->global->ADHERENT_BANK_USE == 'bankviainvoice' && ! empty($conf->banque->enabled) && ! empty($conf->societe->enabled) && ! empty($conf->facture->enabled) && $object->fk_soc) $bankviainvoice=1;
+       		else if (! empty($conf->global->ADHERENT_BANK_USE) && $conf->global->ADHERENT_BANK_USE == 'bankdirect' && ! empty($conf->banque->enabled)) $bankdirect=1;
+        	else if (! empty($conf->global->ADHERENT_BANK_USE) && $conf->global->ADHERENT_BANK_USE == 'invoiceonly' && ! empty($conf->banque->enabled) && ! empty($conf->societe->enabled) && ! empty($conf->facture->enabled) && $object->fk_soc) $invoiceonly=1;
        }
 
         print "\n\n<!-- Form add subscription -->\n";
diff --git a/htdocs/adherents/cartes/carte.php b/htdocs/adherents/cartes/carte.php
index c45f1aed993..7c1d95502ca 100755
--- a/htdocs/adherents/cartes/carte.php
+++ b/htdocs/adherents/cartes/carte.php
@@ -107,13 +107,8 @@ if ((! empty($foruserid) || ! empty($foruserlogin) || ! empty($mode)) && ! $mesg
             '%MONTH%'=>$month,
             '%DAY%'=>$day,
             '%DOL_MAIN_URL_ROOT%'=>DOL_MAIN_URL_ROOT,
-            '%SERVER%'=>"http://".$_SERVER["SERVER_NAME"]."/",	// deprecated
-            // For backward compatibility
-            '%SOCIETE%'=>$objp->company,
-            '%ZIP%'=>$objp->zip,
-            '%COUNTRY%'=>$objp->country,
-            '%ANNEE%'=>$year,
-            '%SERVEUR%'=>"http://".$_SERVER["SERVER_NAME"]."/"	// deprecated
+            '%SERVER%'=>"http://".$_SERVER["SERVER_NAME"]."/",	
+            '%SOCIETE%'=>$objp->company
             );
             complete_substitutions_array($substitutionarray, $langs);
 
diff --git a/htdocs/admin/agenda_extsites.php b/htdocs/admin/agenda_extsites.php
index 2427b7941f7..52a77de8eae 100644
--- a/htdocs/admin/agenda_extsites.php
+++ b/htdocs/admin/agenda_extsites.php
@@ -57,30 +57,44 @@ if ($actionsave)
     if ($disableext) $disableext=0; else $disableext=1;
 	$res=dolibarr_set_const($db,'AGENDA_DISABLE_EXT',$disableext,'chaine',0);
 
-	$i=1;
+	$i=1; $errorsaved=0;
 	$error=0;
 
 	// Save agendas
 	while ($i <= $MAXAGENDA)
 	{
-		$color=trim(GETPOST('agenda_ext_color'.$i,'alpha'));
-		if ($color=='-1') $color='';
-
+		$name=trim(GETPOST('agenda_ext_name'.$i),'alpha');
+		$src=trim(GETPOST('agenda_ext_src'.$i,'alpha'));
+		$color=trim(GETPOST('agenda_ext_color'.$i,'alpha'));
+		if ($color=='-1') $color='';
+		
+		if (! empty($src) && ! preg_match('/^(http\s*|ftp\s*):/', $src))
+		{
+			setEventMessage($langs->trans("ErrorParamMustBeAnUrl"),'errors');
+			$error++;
+			$errorsaved++;
+			break;
+		}
+		
 		//print 'color='.$color;
-		$res=dolibarr_set_const($db,'AGENDA_EXT_NAME'.$i,trim(GETPOST('agenda_ext_name'.$i),'alpha'),'chaine',0);
+		$res=dolibarr_set_const($db,'AGENDA_EXT_NAME'.$i,$name,'chaine',0);
 		if (! $res > 0) $error++;
-		$res=dolibarr_set_const($db,'AGENDA_EXT_SRC'.$i,trim(GETPOST('agenda_ext_src'.$i,'alpha')),'chaine',0);
+		$res=dolibarr_set_const($db,'AGENDA_EXT_SRC'.$i,$src,'chaine',0);
 		if (! $res > 0) $error++;
 		$res=dolibarr_set_const($db,'AGENDA_EXT_COLOR'.$i,$color,'chaine',0);
 		if (! $res > 0) $error++;
 		$i++;
 	}
+	
 	// Save nb of agenda
-	$res=dolibarr_set_const($db,'AGENDA_EXT_NB',trim(GETPOST('AGENDA_EXT_NB','alpha')),'chaine',0);
-	if (! $res > 0) $error++;
-	if (empty($conf->global->AGENDA_EXT_NB)) $conf->global->AGENDA_EXT_NB=5;
-	$MAXAGENDA=empty($conf->global->AGENDA_EXT_NB)?5:$conf->global->AGENDA_EXT_NB;
-
+	if (! $error)
+	{
+		$res=dolibarr_set_const($db,'AGENDA_EXT_NB',trim(GETPOST('AGENDA_EXT_NB','alpha')),'chaine',0);
+		if (! $res > 0) $error++;
+		if (empty($conf->global->AGENDA_EXT_NB)) $conf->global->AGENDA_EXT_NB=5;
+		$MAXAGENDA=empty($conf->global->AGENDA_EXT_NB)?5:$conf->global->AGENDA_EXT_NB;
+	}
+	
     if (! $error)
     {
         $db->commit();
@@ -89,7 +103,7 @@ if ($actionsave)
     else
     {
         $db->rollback();
-        $mesg = "<font class=\"error\">".$langs->trans("Error")."</font>";
+        if (empty($errorsaved)) $mesg = "<font class=\"error\">".$langs->trans("Error")."</font>";
     }
 }
 
@@ -156,18 +170,22 @@ $var=true;
 while ($i <= $MAXAGENDA)
 {
 	$key=$i;
-	$var=!$var;
-	print "<tr ".$bc[$var].">";
-	print '<td width="180" nowrap="nowrap">'.$langs->trans("AgendaExtNb",$key)."</td>";
 	$name='AGENDA_EXT_NAME'.$key;
 	$src='AGENDA_EXT_SRC'.$key;
 	$color='AGENDA_EXT_COLOR'.$key;
-	print "<td><input type=\"text\" class=\"flat\" name=\"agenda_ext_name".$key."\" value=\"". $conf->global->$name . "\" size=\"28\"></td>";
-	print "<td><input type=\"text\" class=\"flat\" name=\"agenda_ext_src".$key."\" value=\"". $conf->global->$src . "\" size=\"60\"></td>";
+	
+	$var=!$var;
+	print "<tr ".$bc[$var].">";
+	// Nb
+	print '<td width="180" nowrap="nowrap">'.$langs->trans("AgendaExtNb",$key)."</td>";
+	// Name
+	print '<td><input type="text" class="flat" name="agenda_ext_name'.$key.'" value="'. (GETPOST('agenda_ext_name'.$key)?GETPOST('agenda_ext_name'.$key):$conf->global->$name) . '" size="28"></td>';
+	// URL
+	print '<td><input type="url" class="flat" name="agenda_ext_src'.$key.'" value="'. (GETPOST('agenda_ext_src'.$key)?GETPOST('agenda_ext_src'.$key):$conf->global->$src) . '" size="60"></td>';
+	// Color (Possible colors are limited by Google)
 	print '<td nowrap="nowrap" align="center">';
-	// Possible colors are limited by Google
 	//print $formadmin->select_colors($conf->global->$color, "google_agenda_color".$key, $colorlist);
-	print $formother->select_color($conf->global->$color, "agenda_ext_color".$key, 'extsitesconfig', 1, '');
+	print $formother->select_color((GETPOST("agenda_ext_color".$key)?GETPOST("agenda_ext_color".$key):$conf->global->$color), "agenda_ext_color".$key, 'extsitesconfig', 1, '');
 	print '</td>';
 	print "</tr>";
 	$i++;
@@ -187,7 +205,8 @@ dol_fiche_end();
 
 dol_htmloutput_mesg($mesg);
 
-$db->close();
 
 llxFooter();
+
+$db->close();
 ?>
\ No newline at end of file
diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index 3a8605f232b..8b80091d0a9 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -71,6 +71,7 @@ $hookmanager->initHooks(array('admin'));
 
 // Sort order to show dictionnary (0 is space). All other dictionnaries (added by modules) will be at end of this.
 $taborder=array(9,0,4,3,2,0,1,8,19,16,0,5,11,0,6,0,10,12,13,0,14,0,7,17,0,22,20,18,21,0,15,0,24,23);
+if (! empty($conf->global->MAIN_USE_REVENUESTAMP)) $taborder=array(9,0,4,3,2,0,1,8,19,16,0,5,11,0,6,0,10,25,12,13,0,14,0,7,17,0,22,20,18,21,0,15,0,24,23);
 
 // Name of SQL tables of dictionnaries
 $tabname=array();
@@ -98,6 +99,7 @@ $tabname[21]= MAIN_DB_PREFIX."c_availability";
 $tabname[22]= MAIN_DB_PREFIX."c_input_reason";
 $tabname[23]= MAIN_DB_PREFIX."accountingaccount";
 $tabname[24]= MAIN_DB_PREFIX."accounting_system";
+$tabname[25]= MAIN_DB_PREFIX."c_revenuestamp";
 
 // Dictionary labels
 $tablib=array();
@@ -124,7 +126,8 @@ $tablib[20]= "DictionnaryOrderMethods";
 $tablib[21]= "DictionnaryAvailability";
 $tablib[22]= "DictionnarySource";
 $tablib[23]= "DictionnaryAccountancyplan";
-$tablib[24]= "DictionnaryAccountancysystem";
+$tablib[24]= "DictionnaryAccountancysystem";
+$tablib[25]= "DictionnaryRevenueStamp";
 
 // Requete pour extraction des donnees des dictionnaires
 $tabsql=array();
@@ -151,7 +154,8 @@ $tabsql[20]= "SELECT rowid   as rowid, code, libelle, active FROM ".MAIN_DB_PREF
 $tabsql[21]= "SELECT c.rowid as rowid, code, label, active FROM ".MAIN_DB_PREFIX."c_availability AS c";
 $tabsql[22]= "SELECT rowid   as rowid, code, label, active FROM ".MAIN_DB_PREFIX."c_input_reason";
 $tabsql[23]= "SELECT rowid   as rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number as accountancy_code, account_parent, label, active FROM ".MAIN_DB_PREFIX."accountingaccount";
-$tabsql[24]= "SELECT s.rowid as rowid, pcg_version, s.fk_pays as country_id, p.code as country_code, p.libelle as pays, s.label, s.active FROM ".MAIN_DB_PREFIX."accounting_system as s, ".MAIN_DB_PREFIX."c_pays as p WHERE s.fk_pays=p.rowid and p.active=1";
+$tabsql[24]= "SELECT s.rowid as rowid, pcg_version, s.fk_pays as country_id, p.code as country_code, p.libelle as pays, s.label, s.active FROM ".MAIN_DB_PREFIX."accounting_system as s, ".MAIN_DB_PREFIX."c_pays as p WHERE s.fk_pays=p.rowid and p.active=1";
+$tabsql[25]= "SELECT t.rowid, t.taux, p.libelle as country, p.code as country_code, t.fk_pays as country_id, t.note, t.active, t.accountancy_code_sell, t.accountancy_code_buy FROM ".MAIN_DB_PREFIX."c_revenuestamp as t, llx_c_pays as p WHERE t.fk_pays=p.rowid";
 
 // Critere de tri du dictionnaire
 $tabsqlsort=array();
@@ -178,7 +182,8 @@ $tabsqlsort[20]="code ASC, libelle ASC";
 $tabsqlsort[21]="code ASC, label ASC";
 $tabsqlsort[22]="code ASC, label ASC";
 $tabsqlsort[23]="fk_pcg_version ASC, accountancy_code ASC";
-$tabsqlsort[24]="pcg_version ASC";
+$tabsqlsort[24]="pcg_version ASC";
+$tabsqlsort[25]="country ASC, taux ASC";
 
 // Nom des champs en resultat de select pour affichage du dictionnaire
 $tabfield=array();
@@ -205,7 +210,8 @@ $tabfield[20]= "code,libelle";
 $tabfield[21]= "code,label";
 $tabfield[22]= "code,label";
 $tabfield[23]= "fk_pcg_version,accountancy_code,account_parent,pcg_type,pcg_subtype,label";
-$tabfield[24]= "pcg_version,country_id,country,label";
+$tabfield[24]= "pcg_version,country_id,country,label";
+$tabfield[25]= "country_id,country,taux,accountancy_code_sell,accountancy_code_buy,note";
 
 // Nom des champs d'edition pour modification d'un enregistrement
 $tabfieldvalue=array();
@@ -232,7 +238,8 @@ $tabfieldvalue[20]= "code,libelle";
 $tabfieldvalue[21]= "code,label";
 $tabfieldvalue[22]= "code,label";
 $tabfieldvalue[23]= "fk_pcg_version,accountancy_code,account_parent,pcg_type,pcg_subtype,label";
-$tabfieldvalue[24]= "pcg_version,country,label";
+$tabfieldvalue[24]= "pcg_version,country,label";
+$tabfieldvalue[25]= "country,taux,accountancy_code_sell,accountancy_code_buy,note";
 
 // Nom des champs dans la table pour insertion d'un enregistrement
 $tabfieldinsert=array();
@@ -259,7 +266,8 @@ $tabfieldinsert[20]= "code,libelle";
 $tabfieldinsert[21]= "code,label";
 $tabfieldinsert[22]= "code,label";
 $tabfieldinsert[23]= "fk_pcg_version,account_number,account_parent,pcg_type,pcg_subtype,label";
-$tabfieldinsert[24]= "pcg_version,fk_pays,label";
+$tabfieldinsert[24]= "pcg_version,fk_pays,label";
+$tabfieldinsert[25]= "fk_pays,taux,accountancy_code_sell,accountancy_code_buy,note";
 
 // Nom du rowid si le champ n'est pas de type autoincrement
 // Example: "" if id field is "rowid" and has autoincrement on
@@ -288,7 +296,8 @@ $tabrowid[20]= "";
 $tabrowid[21]= "rowid";
 $tabrowid[22]= "rowid";
 $tabrowid[23]= "";
-$tabrowid[24]= "";
+$tabrowid[24]= "";
+$tabrowid[25]= "";
 
 // Condition to show dictionnary in setup page
 $tabcond=array();
@@ -315,7 +324,8 @@ $tabcond[20]= ! empty($conf->fournisseur->enabled);
 $tabcond[21]= ! empty($conf->propal->enabled);
 $tabcond[22]= (! empty($conf->commande->enabled) || ! empty($conf->propal->enabled));
 $tabcond[23]= (! empty($conf->global->ACCOUNTING_USEDICTTOEDIT) && ! empty($conf->accounting->enabled));	// The accountancy plan should be edited with specific pages. You can set ACCOUNTING_USEDICTTOEDIT to 1 if you want to use dictionnary editor.
-$tabcond[24]= (! empty($conf->global->ACCOUNTING_USEDICTTOEDIT) && ! empty($conf->accounting->enabled));	// The accountancy system should be edited with specific pages. You can set ACCOUNTING_USEDICTTOEDIT to 1 if you want to use dictionnary editor.
+$tabcond[24]= (! empty($conf->global->ACCOUNTING_USEDICTTOEDIT) && ! empty($conf->accounting->enabled));	// The accountancy system should be edited with specific pages. You can set ACCOUNTING_USEDICTTOEDIT to 1 if you want to use dictionnary editor.
+$tabcond[25]= (! empty($conf->global->MAIN_USE_REVENUESTAMP));	// The accountancy system should be edited with specific pages. You can set ACCOUNTING_USEDICTTOEDIT to 1 if you want to use dictionnary editor.
 
 // List of help for fields
 $tabhelp=array();
@@ -342,7 +352,8 @@ $tabhelp[20] = array();
 $tabhelp[21] = array();
 $tabhelp[22] = array();
 $tabhelp[23] = array();
-$tabhelp[24] = array();
+$tabhelp[24] = array();
+$tabhelp[25] = array();
 
 // Complete all arrays with entries found into modules
 complete_dictionnary_with_modules($taborder,$tabname,$tablib,$tabsql,$tabsqlsort,$tabfield,$tabfieldvalue,$tabfieldinsert,$tabrowid,$tabcond,$tabhelp);
@@ -717,7 +728,11 @@ if ($id)
             $align="left";
             if ($fieldlist[$field]=='source')          { $valuetoshow=$langs->trans("Contact"); }
             if ($fieldlist[$field]=='price')           { $valuetoshow=$langs->trans("PriceUHT"); }
-            if ($fieldlist[$field]=='taux')            { $valuetoshow=$langs->trans("Rate"); }
+            if ($fieldlist[$field]=='taux')            {
+				if ($tabname[$id] != MAIN_DB_PREFIX."c_revenuestamp") $valuetoshow=$langs->trans("Rate");
+				else $valuetoshow=$langs->trans("Amount");
+				$align='right';
+            }
             if ($fieldlist[$field]=='localtax1_type')  { $valuetoshow=$form->textwithtooltip($langs->trans("UseLocalTax")." 2",$langs->trans("LocalTaxDesc"),2,1,img_help(1,'')); $align="center"; $sortable=0; }
             if ($fieldlist[$field]=='localtax1')       { $valuetoshow=$langs->trans("Rate")." 2";}
             if ($fieldlist[$field]=='localtax2_type')  { $valuetoshow=$form->textwithtooltip($langs->trans("UseLocalTax")." 3",$langs->trans("LocalTaxDesc"),2,1,img_help(1,'')); $align="center"; $sortable=0; }
@@ -834,7 +849,11 @@ if ($id)
                 $valuetoshow=$langs->trans($valuetoshow);   // try to translate
                 if ($fieldlist[$field]=='source')          { $valuetoshow=$langs->trans("Contact"); }
                 if ($fieldlist[$field]=='price')           { $valuetoshow=$langs->trans("PriceUHT"); }
-                if ($fieldlist[$field]=='taux')            { $valuetoshow=$langs->trans("Rate"); }
+                if ($fieldlist[$field]=='taux')            {
+					if ($tabname[$id] != MAIN_DB_PREFIX."c_revenuestamp") $valuetoshow=$langs->trans("Rate");
+					else $valuetoshow=$langs->trans("Amount");
+					$align='right';
+	            }
                 if ($fieldlist[$field]=='localtax1_type')  { $valuetoshow=$form->textwithtooltip($langs->trans("UseLocalTax")." 2",$langs->trans("LocalTaxDesc"),2,1,img_help(1,'')); $align="center"; $sortable=0; }
                 if ($fieldlist[$field]=='localtax1')       { $valuetoshow=$langs->trans("Rate")." 2"; $sortable=0; }
                 if ($fieldlist[$field]=='localtax2_type')  { $valuetoshow=$form->textwithtooltip($langs->trans("UseLocalTax")." 3",$langs->trans("LocalTaxDesc"),2,1,img_help(1,'')); $align="center"; $sortable=0; }
diff --git a/htdocs/admin/ecm.php b/htdocs/admin/ecm.php
new file mode 100644
index 00000000000..908b36dbabb
--- /dev/null
+++ b/htdocs/admin/ecm.php
@@ -0,0 +1,111 @@
+<?php
+/* Copyright (C) 2013	Florian Henry	<florian.henry@open-concept.pro>
+ *
+ * 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/>.
+ */
+
+/**
+ *   	\file       htdocs/admin/ecm.php
+ *		\ingroup    core
+ *		\brief      Page to setup ECM (GED) module
+ */
+
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+
+$langs->load("admin");
+
+if (! $user->admin) accessforbidden();
+
+
+/*
+ * Action
+ */
+if (preg_match('/set_(.*)/',$action,$reg))
+{
+    $code=$reg[1];
+    if (dolibarr_set_const($db, $code, 1, 'chaine', 0, '', $conf->entity) > 0)
+    {
+        header("Location: ".$_SERVER["PHP_SELF"]);
+        exit;
+    }
+    else
+    {
+        dol_print_error($db);
+    }
+}
+
+if (preg_match('/del_(.*)/',$action,$reg))
+{
+    $code=$reg[1];
+    if (dolibarr_del_const($db, $code, $conf->entity) > 0)
+    {
+        header("Location: ".$_SERVER["PHP_SELF"]);
+        exit;
+    }
+    else
+    {
+        dol_print_error($db);
+    }
+}
+
+
+/*
+ * View
+ */
+
+$help_url='';
+llxHeader('',$langs->trans("ECMSetup"),$help_url);
+
+$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
+print_fiche_titre($langs->trans("ECMSetup"),$linkback,'setup');
+
+print '<table class="noborder" width="100%">';
+print '<tr class="liste_titre">';
+print '<td>'.$langs->trans("Description").'</td>';
+print '<td align="center" width="20">&nbsp;</td>';
+print '<td align="center" width="100">'.$langs->trans("Value").'</td>'."\n";
+print '</tr>';
+
+$var=true;
+$form = new Form($db);
+
+// Mail required for members
+$var=!$var;
+print '<tr '.$bc[$var].'>';
+print '<td>'.$langs->trans("ECMAutoTree").'</td>';
+print '<td align="center" width="20">&nbsp;</td>';
+
+print '<td align="center" width="100">';
+if ($conf->use_javascript_ajax)
+{
+	print ajax_constantonoff('ECM_AUTO_TREE_ENABLED');
+}
+else
+{
+	if($conf->global->ECM_AUTO_TREE_ENABLED == 0)
+	{
+		print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_ECM_AUTO_TREE_ENABLED">'.img_picto($langs->trans("Disabled"),'off').'</a>';
+	}
+	else if($conf->global->USER_MAIL_REQUIRED == 1)
+	{
+		print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_ECM_AUTO_TREE_ENABLED">'.img_picto($langs->trans("Enabled"),'on').'</a>';
+	}
+}
+print '</td></tr>';
+
+print '</table>';
+
+llxFooter();
+$db->close();
\ No newline at end of file
diff --git a/htdocs/admin/proxy.php b/htdocs/admin/proxy.php
index a8cfc1f3aa1..ac3c911577b 100755
--- a/htdocs/admin/proxy.php
+++ b/htdocs/admin/proxy.php
@@ -131,7 +131,6 @@ print "</tr>\n";
 $var=!$var;
 print '<tr '.$bc[$var].'>';
 print '<td>'.$langs->trans("ConnectionTimeout").'</td><td align="right">';
-//print $form->textwithpicto('',$langs->trans("SessionExplanation",ini_get("session.gc_probability"),ini_get("session.gc_divisor")));
 print '</td>';
 print '<td nowrap="nowrap">';
 print '<input class="flat" name="MAIN_USE_CONNECT_TIMEOUT" type="text" size="4" value="'.(isset($_POST["MAIN_USE_CONNECT_TIMEOUT"])?GETPOST("MAIN_USE_CONNECT_TIMEOUT"):$conf->global->MAIN_USE_CONNECT_TIMEOUT).'">';
@@ -142,7 +141,6 @@ print '</tr>';
 $var=!$var;
 print '<tr '.$bc[$var].'>';
 print '<td>'.$langs->trans("ResponseTimeout").'</td><td align="right">';
-//print $form->textwithpicto('',$langs->trans("SessionExplanation",ini_get("session.gc_probability"),ini_get("session.gc_divisor")));
 print '</td>';
 print '<td nowrap="nowrap">';
 print '<input class="flat" name="MAIN_USE_RESPONSE_TIMEOUT" type="text" size="4" value="'.$conf->global->MAIN_USE_RESPONSE_TIMEOUT.'">';
@@ -153,7 +151,6 @@ print '</tr>';
 $var=!$var;
 print '<tr '.$bc[$var].'>';
 print '<td>'.$langs->trans("MAIN_PROXY_USE").'</td><td align="right">';
-//print $form->textwithpicto('',$langs->trans("SessionExplanation",ini_get("session.gc_probability"),ini_get("session.gc_divisor")));
 print '</td>';
 print '<td nowrap="nowrap">';
 print $form->selectyesno('MAIN_PROXY_USE',$conf->global->MAIN_PROXY_USE,1);
@@ -163,7 +160,6 @@ print '</tr>';
 $var=!$var;
 print '<tr '.$bcdd[$var].'>';
 print '<td>'.$langs->trans("MAIN_PROXY_HOST").'</td><td align="right">';
-//print $form->textwithpicto('',$langs->trans("SessionExplanation",ini_get("session.gc_probability"),ini_get("session.gc_divisor")));
 print '</td>';
 print '<td nowrap="nowrap">';
 print '<input class="flat" name="MAIN_PROXY_HOST" type="text" size="16" value="'.$conf->global->MAIN_PROXY_HOST.'">';
@@ -173,7 +169,6 @@ print '</tr>';
 $var=!$var;
 print '<tr '.$bcdd[$var].'>';
 print '<td>'.$langs->trans("MAIN_PROXY_PORT").'</td><td align="right">';
-//print $form->textwithpicto('',$langs->trans("SessionExplanation",ini_get("session.gc_probability"),ini_get("session.gc_divisor")));
 print '</td>';
 print '<td nowrap="nowrap">';
 print '<input class="flat" name="MAIN_PROXY_PORT" type="text" size="4" value="'.$conf->global->MAIN_PROXY_PORT.'">';
@@ -183,7 +178,6 @@ print '</tr>';
 $var=!$var;
 print '<tr '.$bcdd[$var].'>';
 print '<td>'.$langs->trans("MAIN_PROXY_USER").'</td><td align="right">';
-//print $form->textwithpicto('',$langs->trans("SessionExplanation",ini_get("session.gc_probability"),ini_get("session.gc_divisor")));
 print '</td>';
 print '<td nowrap="nowrap">';
 print '<input class="flat" name="MAIN_PROXY_USER" type="text" size="16" value="'.$conf->global->MAIN_PROXY_USER.'">';
@@ -193,7 +187,6 @@ print '</tr>';
 $var=!$var;
 print '<tr '.$bcdd[$var].'>';
 print '<td>'.$langs->trans("MAIN_PROXY_PASS").'</td><td align="right">';
-//print $form->textwithpicto('',$langs->trans("SessionExplanation",ini_get("session.gc_probability"),ini_get("session.gc_divisor")));
 print '</td>';
 print '<td nowrap="nowrap">';
 print '<input class="flat" name="MAIN_PROXY_PASS" type="text" size="16" value="'.$conf->global->MAIN_PROXY_PASS.'">';
diff --git a/htdocs/admin/security_other.php b/htdocs/admin/security_other.php
index c082183a046..13c87d88bf7 100644
--- a/htdocs/admin/security_other.php
+++ b/htdocs/admin/security_other.php
@@ -146,7 +146,8 @@ print '<td width="100">&nbsp;</td>';
 print "</tr>\n";
 
 $var=!$var;
-if (empty($conf->global->MAIN_SESSION_TIMEOUT)) $conf->global->MAIN_SESSION_TIMEOUT=ini_get("session.gc_maxlifetime");
+$sessiontimeout=ini_get("session.gc_maxlifetime");
+if (empty($conf->global->MAIN_SESSION_TIMEOUT)) $conf->global->MAIN_SESSION_TIMEOUT=$sessiontimeout;
 print '<form action="'.$_SERVER["PHP_SELF"].'?action=MAIN_SESSION_TIMEOUT" method="POST">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<tr '.$bc[$var].'>';
diff --git a/htdocs/comm/action/class/ical.class.php b/htdocs/comm/action/class/ical.class.php
index 3e79d7ada4c..4dc47cdc395 100644
--- a/htdocs/comm/action/class/ical.class.php
+++ b/htdocs/comm/action/class/ical.class.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2006	Roman Ozana			<ozana@omdesign.cz>
  * Copyright (C) 2011	Juanjo Menent		<jmenent@2byte.es>
- * Copyright (C) 2012	Laurent Destailleur	<eldy@users.sourceforge.net>
+ * Copyright (C) 2013	Laurent Destailleur	<eldy@users.sourceforge.net>
  * Copyright (C) 2012	Regis Houssin		<regis.houssin@capnetworks.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -55,9 +55,15 @@ class ICal
     function read_file($file)
     {
         $this->file = $file;
-        $file_text = join("", file($file)); //load file
-        $file_text = preg_replace("/[\r\n]{1,} ([:;])/","\\1",$file_text);
-
+        $file_text='';
+        
+        $tmparray=file($file);
+        if (is_array($tmparray))
+        {
+        	$file_text = join("", $tmparray); //load file
+        	$file_text = preg_replace("/[\r\n]{1,} ([:;])/","\\1",$file_text);
+        }
+        
         return $file_text; // return all text
     }
 
diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php
index 92e63c6fa67..6eefcf27155 100644
--- a/htdocs/comm/propal.php
+++ b/htdocs/comm/propal.php
@@ -731,16 +731,16 @@ else if ($action == "addline" && $user->rights->propal->creer)
 
             	$desc=dol_concatdesc($desc,$product_desc);
 
-            	// Add custom code and origin country into description
-            	if (empty($conf->global->MAIN_PRODUCT_DISABLE_CUSTOMCOUNTRYCODE) && (! empty($prod->customcode) || ! empty($prod->country_code)))
-            	{
-            		$tmptxt='(';
-            		if (! empty($prod->customcode)) $tmptxt.=$langs->transnoentitiesnoconv("CustomCode").': '.$prod->customcode;
-            		if (! empty($prod->customcode) && ! empty($prod->country_code)) $tmptxt.=' - ';
-            		if (! empty($prod->country_code)) $tmptxt.=$langs->transnoentitiesnoconv("CountryOrigin").': '.getCountry($prod->country_code,0,$db,$langs,0);
-            		$tmptxt.=')';
-            		$desc.= dol_concatdesc($desc, $tmptxt);
-            	}
+            	// Add custom code and origin country into description
+            	if (empty($conf->global->MAIN_PRODUCT_DISABLE_CUSTOMCOUNTRYCODE) && (! empty($prod->customcode) || ! empty($prod->country_code)))
+            	{
+            		$tmptxt='(';
+            		if (! empty($prod->customcode)) $tmptxt.=$langs->transnoentitiesnoconv("CustomCode").': '.$prod->customcode;
+            		if (! empty($prod->customcode) && ! empty($prod->country_code)) $tmptxt.=' - ';
+            		if (! empty($prod->country_code)) $tmptxt.=$langs->transnoentitiesnoconv("CountryOrigin").': '.getCountry($prod->country_code,0,$db,$langs,0);
+            		$tmptxt.=')';
+            		$desc= dol_concatdesc($desc, $tmptxt);
+            	}
 			}
 
 			$type = $prod->type;
@@ -1180,37 +1180,6 @@ if ($action == 'create')
 
 	$object = new Propal($db);
 
-	$numpr='';
-	$obj = $conf->global->PROPALE_ADDON;
-	if ($obj)
-	{
-		if (! empty($conf->global->PROPALE_ADDON) && is_readable(DOL_DOCUMENT_ROOT ."/core/modules/propale/".$conf->global->PROPALE_ADDON.".php"))
-		{
-			require_once DOL_DOCUMENT_ROOT ."/core/modules/propale/".$conf->global->PROPALE_ADDON.'.php';
-			$modPropale = new $obj;
-			$numpr = $modPropale->getNextValue($soc,$object);
-		}
-	}
-
-	// Fix pour modele numerotation qui deconne
-	// Si numero deja pris (ne devrait pas arriver), on incremente par .num+1
-	$sql = "SELECT count(*) as nb";
-	$sql.= " FROM ".MAIN_DB_PREFIX."propal";
-	$sql.= " WHERE ref LIKE '".$numpr."%'";
-	$sql.= " AND entity = ".$conf->entity;
-
-	$resql=$db->query($sql);
-	if ($resql)
-	{
-		$obj=$db->fetch_object($resql);
-		$num = $obj->nb;
-		$db->free($resql);
-		if ($num > 0)
-		{
-			$numpr .= "." . ($num + 1);
-		}
-	}
-
 	print '<form name="addprop" action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 	print '<input type="hidden" name="action" value="add">';
@@ -1222,12 +1191,9 @@ if ($action == 'create')
 	}
 
 	print '<table class="border" width="100%">';
-
-	// Ref
-	print '<tr><td class="fieldrequired">'.$langs->trans("Ref").'</td>';
-	print '<td colspan="2">'.$numpr.'</td>';
-	print '<input type="hidden" name="ref" value="'.$numpr.'">';
-	print '</tr>';
+	
+	// Reference
+	print '<tr><td class="fieldrequired">'.$langs->trans('Ref').'</td><td colspan="2">'.$langs->trans("Draft").'</td></tr>';
 
 	// Ref customer
 	print '<tr><td>'.$langs->trans('RefCustomer').'</td><td colspan="2">';
@@ -1990,10 +1956,10 @@ else
 		if ($action != 'statut' && $action <> 'editline')
 		{
 			// Validate
-			if ($object->statut == 0 && $user->rights->propal->valider)
+			if ($object->statut == 0 && $object->total_ttc >= 0 && count($object->lines) > 0 && $user->rights->propal->valider)
 			{
 			    if (count($object->lines) > 0) print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=validate">'.$langs->trans('Validate').'</a>';
-			    else print '<a class="butActionRefused" href="#">'.$langs->trans('Validate').'</a>';
+			    //else print '<a class="butActionRefused" href="#">'.$langs->trans('Validate').'</a>';
 			}
 
 			// Edit
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index c80007c8947..4b3686db511 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -6,7 +6,7 @@
  * Copyright (C) 2005-2013 Regis Houssin			<regis.houssin@capnetworks.com>
  * Copyright (C) 2006      Andre Cianfarani			<acianfa@free.fr>
  * Copyright (C) 2008      Raphael Bertrand			<raphael.bertrand@resultic.fr>
- * Copyright (C) 2010-2012 Juanjo Menent			<jmenent@2byte.es>
+ * Copyright (C) 2010-2013 Juanjo Menent			<jmenent@2byte.es>
  * Copyright (C) 2010-2011 Philippe Grand			<philippe.grand@atoo-net.com>
  * Copyright (C) 2012      Christophe Battarel  <christophe.battarel@altairis.fr>
  *
@@ -720,7 +720,7 @@ class Propal extends CommonObject
 
             if ($this->id)
             {
-                if (empty($this->ref)) $this->ref='(PROV'.$this->id.')';
+                $this->ref='(PROV'.$this->id.')';
                 $sql = 'UPDATE '.MAIN_DB_PREFIX."propal SET ref='".$this->ref."' WHERE rowid=".$this->id;
 
                 dol_syslog(get_class($this)."::create sql=".$sql);
@@ -1178,11 +1178,29 @@ class Propal extends CommonObject
         $now=dol_now();
 
         if ($user->rights->propale->valider)
-        {
+        {	
             $this->db->begin();
+            
+            // Numbering module definition
+            $soc = new Societe($this->db);
+            $soc->fetch($this->socid);
+            
+            // Class of company linked to propal
+            $result=$soc->set_as_client();
+            
+            // Define new ref
+            if (! $error && (preg_match('/^[\(]?PROV/i', $this->ref)))
+            {
+            	$num = $this->getNextNumRef($soc);
+            }
+            else
+          {
+            	$num = $this->ref;
+            }
 
             $sql = "UPDATE ".MAIN_DB_PREFIX."propal";
-            $sql.= " SET fk_statut = 1, date_valid='".$this->db->idate($now)."', fk_user_valid=".$user->id;
+            $sql.= " SET ref = '".$num."',";
+            $sql.= " fk_statut = 1, date_valid='".$this->db->idate($now)."', fk_user_valid=".$user->id;
             $sql.= " WHERE rowid = ".$this->id." AND fk_statut = 0";
 
             dol_syslog(get_class($this).'::valid sql='.$sql);
diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php
index 03dde1a24ff..f68710ec740 100644
--- a/htdocs/commande/fiche.php
+++ b/htdocs/commande/fiche.php
@@ -657,15 +657,15 @@ else if ($action == 'addline' && $user->rights->commande->creer)
 
             	$desc=dol_concatdesc($desc,$product_desc);
 
-            	// Add custom code and origin country into description
-            	if (empty($conf->global->MAIN_PRODUCT_DISABLE_CUSTOMCOUNTRYCODE) && (! empty($prod->customcode) || ! empty($prod->country_code)))
-            	{
-            		$tmptxt='(';
-            		if (! empty($prod->customcode)) $tmptxt.=$langs->transnoentitiesnoconv("CustomCode").': '.$prod->customcode;
-            		if (! empty($prod->customcode) && ! empty($prod->country_code)) $tmptxt.=' - ';
-            		if (! empty($prod->country_code)) $tmptxt.=$langs->transnoentitiesnoconv("CountryOrigin").': '.getCountry($prod->country_code,0,$db,$langs,0);
-            		$tmptxt.=')';
-            		$desc.= dol_concatdesc($desc, $tmptxt);
+            	// Add custom code and origin country into description
+            	if (empty($conf->global->MAIN_PRODUCT_DISABLE_CUSTOMCOUNTRYCODE) && (! empty($prod->customcode) || ! empty($prod->country_code)))
+            	{
+            		$tmptxt='(';
+            		if (! empty($prod->customcode)) $tmptxt.=$langs->transnoentitiesnoconv("CustomCode").': '.$prod->customcode;
+            		if (! empty($prod->customcode) && ! empty($prod->country_code)) $tmptxt.=' - ';
+            		if (! empty($prod->country_code)) $tmptxt.=$langs->transnoentitiesnoconv("CountryOrigin").': '.getCountry($prod->country_code,0,$db,$langs,0);
+            		$tmptxt.=')';
+            		$desc= dol_concatdesc($desc, $tmptxt);
             	}
 			}
 
diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index 74b65ed6512..7766cfeb862 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -1121,7 +1121,7 @@ else if (($action == 'addline' || $action == 'addline_predef') && $user->rights-
 	                if (! empty($prod->customcode) && ! empty($prod->country_code)) $tmptxt.=' - ';
 	                if (! empty($prod->country_code)) $tmptxt.=$langs->transnoentitiesnoconv("CountryOrigin").': '.getCountry($prod->country_code,0,$db,$langs,0);
 	                $tmptxt.=')';
-	                $desc.= dol_concatdesc($desc, $tmptxt);
+	                $desc= dol_concatdesc($desc, $tmptxt);
 	            }
             }
 
diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php
index 5adfe49b86a..734978f853f 100644
--- a/htdocs/contact/class/contact.class.php
+++ b/htdocs/contact/class/contact.class.php
@@ -37,10 +37,8 @@ class Contact extends CommonObject
 	public $table_element='socpeople';
 
 	var $id;
-	var $civilite_id;  // In fact we stor civility_code
+	var $civilite_id;  // In fact we store civility_code
     var $lastname;
-	var $name;         // TODO deprecated
-	var $nom;          // TODO deprecated
 	var $firstname;
 	var $address;
 	var $zip;
diff --git a/htdocs/contact/fiche.php b/htdocs/contact/fiche.php
index 80277c904ad..ac8ab1d2e58 100644
--- a/htdocs/contact/fiche.php
+++ b/htdocs/contact/fiche.php
@@ -605,11 +605,11 @@ else
 							});
 
 							$("#copyaddressfromsoc").click(function() {
-								$(\'textarea[name="address"]\').text("'.addslashes($objsoc->address).'");
-								$(\'input[name="zipcode"]\').val("'.addslashes($objsoc->zip).'");
-								$(\'input[name="town"]\').val("'.addslashes($objsoc->town).'");
-								$(\'select[name="country_id"]\').val("'.addslashes($objsoc->country_id).'");
-								$(\'select[name="state_id"]\').val("'.addslashes($objsoc->state_id).'");
+								$(\'textarea[name="address"]\').text("'.dol_escape_js($objsoc->address).'");
+								$(\'input[name="zipcode"]\').val("'.dol_escape_js($objsoc->zip).'");
+								$(\'input[name="town"]\').val("'.dol_escape_js($objsoc->town).'");
+								$(\'select[name="country_id"]\').val("'.dol_escape_js($objsoc->country_id).'");
+								$(\'select[name="state_id"]\').val("'.dol_escape_js($objsoc->state_id).'");
             				});
 						})'."\n";
 				print '</script>'."\n";
diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index 950244c5b45..99c55c3fe65 100755
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -58,7 +58,7 @@ $userid=GETPOST('userid','int');
 $begin=GETPOST('begin');
 
 if (! $sortorder) $sortorder="ASC";
-if (! $sortfield) $sortfield="p.name";
+if (! $sortfield) $sortfield="p.lastname";
 if ($page < 0) { $page = 0; }
 $limit = $conf->liste_limit;
 $offset = $limit * $page;
@@ -114,7 +114,7 @@ llxHeader('',$title,'EN:Module_Third_Parties|FR:Module_Tiers|ES:M&oacute;dulo_Em
 $form=new Form($db);
 
 $sql = "SELECT s.rowid as socid, s.nom as name,";
-$sql.= " p.rowid as cidp, p.name as lastname, p.firstname, p.poste, p.email,";
+$sql.= " p.rowid as cidp, p.lastname as lastname, p.firstname, p.poste, p.email,";
 $sql.= " p.phone, p.phone_mobile, p.fax, p.fk_pays, p.priv, p.tms,";
 $sql.= " cp.code as country_code";
 $sql.= " FROM ".MAIN_DB_PREFIX."socpeople as p";
@@ -144,7 +144,7 @@ else
 
 if ($search_lastname)        // filtre sur le nom
 {
-    $sql .= " AND p.name LIKE '%".$db->escape($search_lastname)."%'";
+    $sql .= " AND p.lastname LIKE '%".$db->escape($search_lastname)."%'";
 }
 if ($search_firstname)     // filtre sur le prenom
 {
@@ -200,7 +200,7 @@ else if ($type == "p")        // filtre sur type
 }
 if ($sall)
 {
-    $sql .= " AND (p.name LIKE '%".$db->escape($sall)."%' OR p.firstname LIKE '%".$db->escape($sall)."%' OR p.email LIKE '%".$db->escape($sall)."%')";
+    $sql .= " AND (p.lastname LIKE '%".$db->escape($sall)."%' OR p.firstname LIKE '%".$db->escape($sall)."%' OR p.email LIKE '%".$db->escape($sall)."%')";
 }
 if (! empty($socid))
 {
@@ -256,7 +256,7 @@ if ($result)
 
     // Ligne des titres
     print '<tr class="liste_titre">';
-    print_liste_field_titre($langs->trans("Lastname"),$_SERVER["PHP_SELF"],"p.name", $begin, $param, '', $sortfield,$sortorder);
+    print_liste_field_titre($langs->trans("Lastname"),$_SERVER["PHP_SELF"],"p.lastname", $begin, $param, '', $sortfield,$sortorder);
     print_liste_field_titre($langs->trans("Firstname"),$_SERVER["PHP_SELF"],"p.firstname", $begin, $param, '', $sortfield,$sortorder);
     print_liste_field_titre($langs->trans("PostOrFunction"),$_SERVER["PHP_SELF"],"p.poste", $begin, $param, '', $sortfield,$sortorder);
     if (empty($conf->global->SOCIETE_DISABLE_CONTACTS)) print_liste_field_titre($langs->trans("Company"),$_SERVER["PHP_SELF"],"s.nom", $begin, $param, '', $sortfield,$sortorder);
diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index 249a4c9dca0..d005396d829 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -283,8 +283,25 @@ class Contrat extends CommonObject
 		global $langs, $conf;
 
 		$error=0;
+		
+		// Definition du nom de module de numerotation de commande
+		$soc = new Societe($this->db);
+		$soc->fetch($this->socid);
+		
+		// Class of company linked to order
+		$result=$soc->set_as_client();
+		
+		// Define new ref
+		if (! $error && (preg_match('/^[\(]?PROV/i', $this->ref)))
+		{
+			$num = $this->getNextNumRef($soc);
+		}
+		else
+		{
+			$num = $this->ref;
+		}
 
-		$sql = "UPDATE ".MAIN_DB_PREFIX."contrat SET statut = 1";
+		$sql = "UPDATE ".MAIN_DB_PREFIX."contrat SET ref = '".$num."', statut = 1";
 		$sql .= " WHERE rowid = ".$this->id . " AND statut = 0";
 
 		$resql = $this->db->query($sql);
@@ -647,6 +664,16 @@ class Contrat extends CommonObject
 			$error=0;
 
 			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."contrat");
+			
+			// Mise a jour ref
+			$sql = 'UPDATE '.MAIN_DB_PREFIX."contrat SET ref='(PROV".$this->id.")' WHERE rowid=".$this->id;
+			if ($this->db->query($sql))
+			{
+				if ($this->id)
+				{
+					$this->ref="(PROV".$this->id.")";
+				}
+			}
 
 			// Insert contacts commerciaux ('SALESREPSIGN','contrat')
 			$result=$this->add_contact($this->commercial_signature_id,'SALESREPSIGN','internal');
diff --git a/htdocs/contrat/fiche.php b/htdocs/contrat/fiche.php
index 7034f765d5f..27dfec3aed5 100644
--- a/htdocs/contrat/fiche.php
+++ b/htdocs/contrat/fiche.php
@@ -158,27 +158,35 @@ if (GETPOST('remonth') && GETPOST('reday') && GETPOST('reyear'))
 
 if ($action == 'add' && $user->rights->contrat->creer)
 {
-    $object->socid						= $socid;
-    $object->date_contrat				= $datecontrat;
+	
+	// Check
+	if (empty($datecontrat))
+	{
+		$error++;
+		$mesg='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Date")).'</div>';
+		$action='create';
+	}
+	
+	if ($socid<1)
+	{
+		setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Customer")),'errors');
+		$action='create';
+		$error++;
+	}
+	
+	if (! $error)
+	{
+    	$object->socid						= $socid;
+    	$object->date_contrat				= $datecontrat;
 
-    $object->commercial_suivi_id		= GETPOST('commercial_suivi_id','int');
-    $object->commercial_signature_id	= GETPOST('commercial_signature_id','int');
+    	$object->commercial_suivi_id		= GETPOST('commercial_suivi_id','int');
+    	$object->commercial_signature_id	= GETPOST('commercial_signature_id','int');
 
-    $object->note						= GETPOST('note','alpha');
-    $object->fk_project					= GETPOST('projectid','int');
-    $object->remise_percent				= GETPOST('remise_percent','alpha');
-    $object->ref						= GETPOST('ref','alpha');
+    	$object->note						= GETPOST('note','alpha');
+    	$object->fk_project					= GETPOST('projectid','int');
+    	$object->remise_percent				= GETPOST('remise_percent','alpha');
+    	$object->ref						= GETPOST('ref','alpha');
 
-    // Check
-    if (empty($datecontrat))
-    {
-        $error++;
-        $mesg='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Date")).'</div>';
-        $action='create';
-    }
-
-    if (! $error)
-    {
         $result = $object->create($user,$langs,$conf);
         if ($result > 0)
         {
@@ -612,7 +620,7 @@ if ($action == 'create')
     dol_htmloutput_errors($mesg,'');
 
     $soc = new Societe($db);
-    $soc->fetch($socid);
+    if ($socid>0) $soc->fetch($socid);
 
     $object->date_contrat = dol_now();
 
@@ -628,22 +636,39 @@ if ($action == 'create')
     print '<table class="border" width="100%">';
 
     // Ref
-    print '<tr><td>'.$langs->trans("Ref").'</td>';
-    print '<td><input type="text" maxlength="30" name="ref" size="20" value="'.$numct.'"></td></tr>';
+	print '<tr><td class="fieldrequired">'.$langs->trans('Ref').'</td><td colspan="2">'.$langs->trans("Draft").'</td></tr>';
 
     // Customer
-    print '<tr><td>'.$langs->trans("Customer").'</td><td>'.$soc->getNomUrl(1).'</td></tr>';
+	print '<tr>';
+	print '<td class="fieldrequired">'.$langs->trans('Customer').'</td>';
+	if($socid>0)
+	{
+		print '<td colspan="2">';
+		print $soc->getNomUrl(1);
+		print '<input type="hidden" name="socid" value="'.$soc->id.'">';
+		print '</td>';
+	}
+	else
+	{
+		print '<td colspan="2">';
+		print $form->select_company('','socid','s.client = 1',1);
+		print '</td>';
+	}
+	print '</tr>'."\n";
 
-    // Ligne info remises tiers
-    print '<tr><td>'.$langs->trans('Discount').'</td><td>';
-    if ($soc->remise_client) print $langs->trans("CompanyHasRelativeDiscount",$soc->remise_client);
-    else print $langs->trans("CompanyHasNoRelativeDiscount");
-    $absolute_discount=$soc->getAvailableDiscounts();
-    print '. ';
-    if ($absolute_discount) print $langs->trans("CompanyHasAbsoluteDiscount",price($absolute_discount),$langs->trans("Currency".$conf->currency));
-    else print $langs->trans("CompanyHasNoAbsoluteDiscount");
-    print '.';
-    print '</td></tr>';
+	if($socid>0)
+	{
+		// Ligne info remises tiers
+		print '<tr><td>'.$langs->trans('Discounts').'</td><td colspan="2">';
+		if ($soc->remise_client) print $langs->trans("CompanyHasRelativeDiscount",$soc->remise_client);
+		else print $langs->trans("CompanyHasNoRelativeDiscount");
+		print '. ';
+		$absolute_discount=$soc->getAvailableDiscounts();
+		if ($absolute_discount) print $langs->trans("CompanyHasAbsoluteDiscount",price($absolute_discount),$langs->trans("Currency".$conf->currency));
+		else print $langs->trans("CompanyHasNoAbsoluteDiscount");
+		print '.';
+		print '</td></tr>';
+	}
 
     // Commercial suivi
     print '<tr><td width="20%" nowrap><span class="fieldrequired">'.$langs->trans("TypeContact_contrat_internal_SALESREPFOLL").'</span></td><td>';
@@ -760,8 +785,19 @@ else
          */
         if ($action == 'valid')
         {
-            //$numfa = contrat_get_num($soc);
-            $ret=$form->form_confirm($_SERVER['PHP_SELF']."?id=".$object->id,$langs->trans("ValidateAContract"),$langs->trans("ConfirmValidateContract"),"confirm_valid",'',0,1);
+        	$ref = substr($object->ref, 1, 4);
+        	if ($ref == 'PROV')
+        	{
+        		$numref = $object->getNextNumRef($soc);
+        	}
+        	else
+        	{
+        		$numref = $object->ref;
+        	}
+        	
+        	$text=$langs->trans('ConfirmValidateContract',$numref);
+            
+            $ret=$form->form_confirm($_SERVER['PHP_SELF']."?id=".$object->id,$langs->trans("ValidateAContract"),$text,"confirm_valid",'',0,1);
             if ($ret == 'html') print '<br>';
         }
 
diff --git a/htdocs/contrat/index.php b/htdocs/contrat/index.php
index 66a2b08eeab..cdc0de87bf5 100644
--- a/htdocs/contrat/index.php
+++ b/htdocs/contrat/index.php
@@ -331,7 +331,7 @@ if ($result)
 		$var=!$var;
 
 		print '<tr '.$bc[$var].'>';
-		print '<td width="100" nowrap="nowrap">';
+		print '<td width="110" nowrap="nowrap">';
 		$staticcontrat->ref=($obj->ref?$obj->ref:$obj->cid);
 		$staticcontrat->id=$obj->cid;
 		print $staticcontrat->getNomUrl(1,16);
@@ -397,7 +397,7 @@ if ($resql)
 		$obj = $db->fetch_object($resql);
 		$var=!$var;
 		print '<tr '.$bc[$var].'>';
-		print '<td width="100" nowrap="nowrap">';
+		print '<td width="110" nowrap="nowrap">';
 		$staticcontrat->ref=($obj->ref?$obj->ref:$obj->fk_contrat);
 		$staticcontrat->id=$obj->fk_contrat;
 		print $staticcontrat->getNomUrl(1,16);
@@ -478,7 +478,7 @@ if ($resql)
 		$var=!$var;
 		print '<tr '.$bc[$var].'>';
 
-		print '<td width="100" nowrap="nowrap">';
+		print '<td width="110" nowrap="nowrap">';
 		$staticcontrat->ref=($obj->ref?$obj->ref:$obj->fk_contrat);
 		$staticcontrat->id=$obj->fk_contrat;
 		print $staticcontrat->getNomUrl(1,16);
@@ -558,7 +558,7 @@ if ($resql)
 		$var=!$var;
 		print '<tr '.$bc[$var].'>';
 
-		print '<td width="100" nowrap="nowrap">';
+		print '<td width="110" nowrap="nowrap">';
 		$staticcontrat->ref=($obj->ref?$obj->ref:$obj->fk_contrat);
 		$staticcontrat->id=$obj->fk_contrat;
 		print $staticcontrat->getNomUrl(1,16);
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 764eb19b66e..234054f9da2 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -335,7 +335,7 @@ abstract class CommonObject
         $sql = "SELECT ec.rowid, ec.statut, ec.fk_socpeople as id";    // This field contains id of llx_socpeople or id of llx_user
         if ($source == 'internal') $sql.=", '-1' as socid";
         if ($source == 'external' || $source == 'thirdparty') $sql.=", t.fk_soc as socid";
-        $sql.= ", t.civilite as civility, t.name as lastname, t.firstname, t.email";
+        $sql.= ", t.civilite as civility, t.lastname as lastname, t.firstname, t.email";
         $sql.= ", tc.source, tc.element, tc.code, tc.libelle";
         $sql.= " FROM ".MAIN_DB_PREFIX."c_type_contact tc";
         $sql.= ", ".MAIN_DB_PREFIX."element_contact ec";
@@ -348,7 +348,7 @@ abstract class CommonObject
         if ($source == 'external' || $source == 'thirdparty') $sql.= " AND tc.source = 'external'";
         $sql.= " AND tc.active=1";
         if ($statut >= 0) $sql.= " AND ec.statut = '".$statut."'";
-        $sql.=" ORDER BY t.name ASC";
+        $sql.=" ORDER BY t.lastname ASC";
 
         dol_syslog(get_class($this)."::liste_contact sql=".$sql);
         $resql=$this->db->query($sql);
@@ -722,9 +722,10 @@ abstract class CommonObject
      *	@param	string	$table		To force other table element or element line
      *	@param	int		$id			To force other object id
      *	@param	string	$format		Data format ('text' by default, 'date')
+     *	@param	string	$id_field	To force rowid field name
      *	@return	int					<0 if KO, >0 if OK
      */
-    function setValueFrom($field, $value, $table='', $id='', $format='text')
+    function setValueFrom($field, $value, $table='', $id='', $format='text', $id_field='rowid')
     {
         global $conf;
 
@@ -736,7 +737,7 @@ abstract class CommonObject
         $sql = "UPDATE ".MAIN_DB_PREFIX.$table." SET ";
         if ($format == 'text') $sql.= $field." = '".$this->db->escape($value)."'";
         else if ($format == 'date') $sql.= $field." = '".$this->db->idate($value)."'";
-        $sql.= " WHERE rowid = ".$id;
+        $sql.= " WHERE ".$id_field." = ".$id;
 
         dol_syslog(get_class($this)."::setValueFrom sql=".$sql, LOG_DEBUG);
         $resql = $this->db->query($sql);
diff --git a/htdocs/core/class/menu.class.php b/htdocs/core/class/menu.class.php
index 409301cc367..411158dea84 100644
--- a/htdocs/core/class/menu.class.php
+++ b/htdocs/core/class/menu.class.php
@@ -54,7 +54,7 @@ class Menu
      * @param	string	$url        Url to follow on click
      * @param   string	$titre      Label of menu to add
      * @param   string	$level      Level of menu to add
-     * @param   int		$enabled    Menu active or not
+     * @param   int		$enabled    Menu active or not (0=Not active, 1=Active, 2=Active but grey)
      * @param   string	$target		Target lien
      * @param	string	$mainmenu	Main menu ('home', 'companies', 'products', ...)
      * @param	string	$leftmenu	Left menu ('setup', 'system', 'admintools', ...)
diff --git a/htdocs/core/db/mssql.class.php b/htdocs/core/db/mssql.class.php
index f8eb9914cf7..9378cc20694 100644
--- a/htdocs/core/db/mssql.class.php
+++ b/htdocs/core/db/mssql.class.php
@@ -508,6 +508,7 @@ class DoliDBMssql
 	function plimit($limit=0,$offset=0)
 	{
 		global $conf;
+        if (empty($limit)) return "";
 		if ($limit < 0) $limit=$conf->liste_limit;
 		if ($offset > 0) return " LIMIT $offset,$limit ";
 		else return " LIMIT $limit ";
diff --git a/htdocs/core/db/mysql.class.php b/htdocs/core/db/mysql.class.php
index 7b22c8165c3..386624132f7 100644
--- a/htdocs/core/db/mysql.class.php
+++ b/htdocs/core/db/mysql.class.php
@@ -488,6 +488,7 @@ class DoliDBMysql
 	function plimit($limit=0,$offset=0)
 	{
 		global $conf;
+        if (empty($limit)) return "";
 		if ($limit < 0) $limit=$conf->liste_limit;
 		if ($offset > 0) return " LIMIT $offset,$limit ";
 		else return " LIMIT $limit ";
diff --git a/htdocs/core/db/mysqli.class.php b/htdocs/core/db/mysqli.class.php
index 6ea19ba8c11..7d9d67f839c 100644
--- a/htdocs/core/db/mysqli.class.php
+++ b/htdocs/core/db/mysqli.class.php
@@ -490,6 +490,7 @@ class DoliDBMysqli
     function plimit($limit=0,$offset=0)
     {
         global $conf;
+        if (empty($limit)) return "";
         if ($limit < 0) $limit=$conf->liste_limit;
         if ($offset > 0) return " LIMIT $offset,$limit ";
         else return " LIMIT $limit ";
diff --git a/htdocs/core/db/pgsql.class.php b/htdocs/core/db/pgsql.class.php
index df73e562e70..122a8e072ba 100644
--- a/htdocs/core/db/pgsql.class.php
+++ b/htdocs/core/db/pgsql.class.php
@@ -700,6 +700,7 @@ class DoliDBPgsql
 	function plimit($limit=0,$offset=0)
 	{
 		global $conf;
+        if (empty($limit)) return "";
 		if ($limit < 0) $limit=$conf->liste_limit;
 		if ($offset > 0) return " LIMIT ".$limit." OFFSET ".$offset." ";
 		else return " LIMIT $limit ";
diff --git a/htdocs/core/db/sqlite.class.php b/htdocs/core/db/sqlite.class.php
index 8725e9a3efe..3034a0f09f5 100644
--- a/htdocs/core/db/sqlite.class.php
+++ b/htdocs/core/db/sqlite.class.php
@@ -629,6 +629,7 @@ class DoliDBSqlite
     function plimit($limit=0,$offset=0)
     {
         global $conf;
+        if (empty($limit)) return "";
         if ($limit < 0) $limit=$conf->liste_limit;
         if ($offset > 0) return " LIMIT $offset,$limit ";
         else return " LIMIT $limit ";
diff --git a/htdocs/core/getmenu_jmobile.php b/htdocs/core/getmenu_jmobile.php
index a0ab2e5728d..f7eaada8283 100644
--- a/htdocs/core/getmenu_jmobile.php
+++ b/htdocs/core/getmenu_jmobile.php
@@ -88,10 +88,13 @@ if (! class_exists('MenuManager'))
 	}
 }
 $menumanager = new MenuManager($db, empty($user->societe_id)?0:1);
+$menumanager->loadMenu();
 
 $menumanager->showmenu('jmobile');
 
-print '</body></html>'."\n";
+print '</body>';
+
+print '</html>'."\n";
 
 $db->close();
 ?>
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 99df1e73053..e9ee09ae4b3 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -491,7 +491,7 @@ function dol_strtoupper($utf8_string)
  *											On Windows LOG_ERR=4, LOG_WARNING=5, LOG_NOTICE=LOG_INFO=6, LOG_DEBUG=6 si define_syslog_variables ou PHP 5.3+, 7 si dolibarr
  *											On Linux   LOG_ERR=3, LOG_WARNING=4, LOG_INFO=6, LOG_DEBUG=7
  *  @param	int			$ident				1=Increase ident of 1, -1=Decrease ident of 1
- *  @param	string		$suffixinfilename	When output is a file, append this suffix into default log filename. 	
+ *  @param	string		$suffixinfilename	When output is a file, append this suffix into default log filename.
  *  @return	void
  */
 function dol_syslog($message, $level = LOG_INFO, $ident = 0, $suffixinfilename='')
@@ -706,7 +706,7 @@ function dol_format_address($object)
 			$ret.="\n".$object->state;
 		}
 	}
-	
+
 	else                                        		// Other: title firstname name \n address lines \n zip town \n country
 	{
 		$ret .= ($ret ? "\n" : '' ).$object->zip;
@@ -1646,32 +1646,33 @@ function img_picto($alt, $picto, $options = '', $pictoisfullpath = false)
 	global $conf;
 
 	// Define fullpathpicto to use into src
-	if ($pictoisfullpath) {
+	if ($pictoisfullpath)
+	{
 		// Clean parameters
-		if (! preg_match('/(\.png|\.gif)$/i',$picto))
-			$picto .= '.png';
+		if (! preg_match('/(\.png|\.gif)$/i',$picto)) $picto .= '.png';
 		$fullpathpicto = $picto;
 	}
 	else
 	{
-		// By default, we search into theme directory
+		// By default, we search $url/theme/$theme/img/$picto
 		$url = DOL_URL_ROOT;
-		$path = 'theme/'.$conf->theme;
-		if (! empty($conf->global->MAIN_FORCETHEMEDIR))
-			$path = preg_replace('/^\//', '', $conf->global->MAIN_FORCETHEMEDIR).'/'.$path;
-		// If we ask an image into module/img (not into a theme path)
+		$theme = $conf->theme;
+
+		$path = 'theme/'.$theme;
+		if (! empty($conf->global->MAIN_OVERWRITE_THEME_RES)) $path = $conf->global->MAIN_OVERWRITE_THEME_RES.'/theme/'.$conf->global->MAIN_OVERWRITE_THEME_RES;
+		if (! empty($conf->global->MAIN_FORCETHEMEDIR)) $path = preg_replace('/^\//', '', $conf->global->MAIN_FORCETHEMEDIR).'/'.$path;	// TODO What if there is both FORCETHEMDIR and OVERWRITE_THEM_RES
+		// If we ask an image into $url/$mymodule/img (instead of default path)
 		if (preg_match('/^([^@]+)@([^@]+)$/i',$picto,$regs))
 		{
 			$picto = $regs[1];
-			$path = $regs[2];
+			$path = $regs[2];	// $path is $mymodule
 		}
 		// Clean parameters
-		if (! preg_match('/(\.png|\.gif)$/i',$picto))
-			$picto .= '.png';
-		// If img file not into standard path, we use alternate path
-		if (defined('DOL_URL_ROOT_ALT') && DOL_URL_ROOT_ALT && ! file_exists(DOL_DOCUMENT_ROOT.'/'.$path.'/img/'.$picto))
-			$url = DOL_URL_ROOT_ALT;
+		if (! preg_match('/(\.png|\.gif)$/i',$picto)) $picto .= '.png';
+		// If img file is not into standard path, we use alternate path (Avoid using DOL_URL_ROOT_ALT for performane)
+		if (defined('DOL_URL_ROOT_ALT') && DOL_URL_ROOT_ALT && ! file_exists(DOL_DOCUMENT_ROOT.'/'.$path.'/img/'.$picto)) $url = DOL_URL_ROOT_ALT;
 
+		// $url is '' or '/custom', $path is current theme or
 		$fullpathpicto = $url.'/'.$path.'/img/'.$picto;
 	}
 
@@ -2719,10 +2720,10 @@ function get_localtax($tva, $local, $thirdparty_buyer="", $thirdparty_seller="")
 	dol_syslog("get_localtax tva=".$tva." local=".$local." thirdparty_buyer id=".(is_object($thirdparty_buyer)?$thirdparty_buyer->id:'')." thirdparty_seller id=".$thirdparty_seller->id);
 
 	// Some test to guess with no need to make database access
-	if ($mysoc->country_code == 'ES') // For spain and localtaxes 1, tax is qualified if buyer use local taxe
+	if ($mysoc->country_code == 'ES') // For spain localtaxes 1 and 2, tax is qualified if buyer use local taxe
 	{
 		if ($local == 1 && ! $thirdparty_buyer->localtax1_assuj) return 0;
-		if ($local == 2 && ! $thirdparty_seller->localtax2_assuj) return 0;
+		if ($local == 2 && ! $thirdparty_buyer->localtax2_assuj) return 0;
 	}
 	else
 	{
@@ -4179,7 +4180,7 @@ function printCommonFooter($zone='private')
 	{
 		$micro_end_time=dol_microtime_float(true);
 		print "\n".'<script type="text/javascript">'."\n";
-		print 'console.log("';
+		print 'window.console && console.log("';
 		if (! empty($conf->global->MEMCACHED_SERVER)) print 'MEMCACHED_SERVER='.$conf->global->MEMCACHED_SERVER.' - ';
 		print 'MAIN_OPTIMIZE_SPEED='.(isset($conf->global->MAIN_OPTIMIZE_SPEED)?$conf->global->MAIN_OPTIMIZE_SPEED:'off');
 		print ' - Build time: '.ceil(1000*($micro_end_time-$micro_start_time)).' ms';
diff --git a/htdocs/core/menus/smartphone/smartphone.lib.php b/htdocs/core/menus/smartphone/smartphone.lib.php
index 6271b32b877..ad71482fe10 100755
--- a/htdocs/core/menus/smartphone/smartphone.lib.php
+++ b/htdocs/core/menus/smartphone/smartphone.lib.php
@@ -33,7 +33,7 @@
  * @param  	array		&$tabMenu       If array with menu entries already loaded, we put this array here (in most cases, it's empty)
  * @return	void
  */
-function print_smartphone_menu($db,$atarget,$type_user,$limitmenuto,&$tabMenu)
+function print_smartphone_menu($db,$atarget,$type_user,$limitmenuto,&$tabMenu,&$menu)
 {
 	require_once DOL_DOCUMENT_ROOT.'/core/class/menubase.class.php';
 
diff --git a/htdocs/core/menus/smartphone/smartphone_menu.php b/htdocs/core/menus/smartphone/smartphone_menu.php
index c547df7b588..1b8b87de0dd 100755
--- a/htdocs/core/menus/smartphone/smartphone_menu.php
+++ b/htdocs/core/menus/smartphone/smartphone_menu.php
@@ -45,7 +45,15 @@ class MenuSmart
 	{
     	$this->type_user=$type_user;
 		$this->db=$db;
-		
+	}
+
+	/**
+	 * Load this->tabMenu
+	 *
+	 * @return	void
+	 */
+	function loadMenu()
+	{	
 		// On sauve en session le menu principal choisi
 		if (isset($_GET["mainmenu"])) $_SESSION["mainmenu"]=$_GET["mainmenu"];
 		if (isset($_GET["idmenu"]))   $_SESSION["idmenu"]=$_GET["idmenu"];
@@ -86,8 +94,8 @@ class MenuSmart
 		 
 		require_once DOL_DOCUMENT_ROOT.'/core/class/menubase.class.php';
 		$tabMenu=array();
-		$menuArbo = new Menubase($db,'smartphone');
-		$menuArbo->menuLoad($mainmenu, $leftmenu, $type_user, 'smartphone', $tabMenu);
+		$menuArbo = new Menubase($this->db,'smartphone');
+		$menuArbo->menuLoad($mainmenu, $leftmenu, $this->type_user, 'smartphone', $tabMenu);
 		$this->tabMenu=$tabMenu;		
 	}
 
@@ -110,7 +118,11 @@ class MenuSmart
         	$conf->global->MAIN_SEARCHFORM_CONTACT=0;
         }
     	
-        print_smartphone_menu($this->db,$this->atarget,$this->hideifnotallowed,$mode,$this->tabMenu);
+        $this->menu=new Menu();
+        
+        print_smartphone_menu($this->db,$this->atarget,$this->hideifnotallowed,$mode,$this->tabMenu,$this->menu);
+        
+        unset($this->menu);
         
         return 1;
 	}
diff --git a/htdocs/core/menus/standard/auguria.lib.php b/htdocs/core/menus/standard/auguria.lib.php
index 03141313182..e96fe021411 100644
--- a/htdocs/core/menus/standard/auguria.lib.php
+++ b/htdocs/core/menus/standard/auguria.lib.php
@@ -32,9 +32,10 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/menubase.class.php';
  * @param 	string	$atarget		Target
  * @param 	int		$type_user     	0=Internal,1=External,2=All
  * @param  	array	&$tabMenu       If array with menu entries already loaded, we put this array here (in most cases, it's empty)
+ * @param	array	&$menu			Object Menu to return back list of menu entries
  * @return	void
  */
-function print_auguria_menu($db,$atarget,$type_user,&$tabMenu)
+function print_auguria_menu($db,$atarget,$type_user,&$tabMenu,&$menu)
 {
 	global $user,$conf,$langs,$dolibarr_main_db_name;
 
@@ -122,7 +123,7 @@ function print_start_menu_entry_auguria($idsel,$classname)
  * Output menu entry
  *
  * @param	string	$text		Text
- * @param	int		$showmode	1 or 2
+ * @param	int		$showmode	1 = allowed or 2 = not allowed
  * @param	string	$url		Url
  * @param	string	$id			Id
  * @param	string	$idsel		Id sel
@@ -150,6 +151,10 @@ function print_text_menu_entry_auguria($text, $showmode, $url, $id, $idsel, $cla
 	{
 		print '<div class="'.$id.' '.$idsel.'"><span class="mainmenu_'.$idsel.' '.$id.'" id="mainmenuspan_'.$idsel.'"></span></div>';
 		print '<a class="tmenudisabled" id="mainmenua_'.$idsel.'" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">';
+		print '<span class="mainmenuaspan">';
+		print $text;
+		print '</span>';
+		print '</a>';
 	}
 }
 
@@ -181,18 +186,19 @@ function print_end_menu_array_auguria()
 /**
  * Core function to output left menu auguria
  *
- * @param	DoliDB		$db                  Database handler
- * @param 	array		$menu_array_before   Table of menu entries to show before entries of menu handler
- * @param   array		$menu_array_after    Table of menu entries to show after entries of menu handler
- * @param  	array		&$tabMenu       If array with menu entries already loaded, we put this array here (in most cases, it's empty)
+ * @param	DoliDB		$db                 Database handler
+ * @param 	array		$menu_array_before  Table of menu entries to show before entries of menu handler
+ * @param   array		$menu_array_after   Table of menu entries to show after entries of menu handler
+ * @param  	array		&$tabMenu       	If array with menu entries already loaded, we put this array here (in most cases, it's empty)
+ * @param	array		&$menu				Object Menu to return back list of menu entries
  * @return	void
  */
-function print_left_auguria_menu($db,$menu_array_before,$menu_array_after,&$tabMenu)
+function print_left_auguria_menu($db,$menu_array_before,$menu_array_after,&$tabMenu,&$menu)
 {
 	global $user,$conf,$langs,$dolibarr_main_db_name,$mysoc;
 
 	$overwritemenufor = array();
-	$newmenu = new Menu();
+	$newmenu = $menu;
 
 	$mainmenu=$_SESSION["mainmenu"];
 	$leftmenu=$_SESSION["leftmenu"];
diff --git a/htdocs/core/menus/standard/auguria_menu.php b/htdocs/core/menus/standard/auguria_menu.php
index 36ca1269761..b7c76af0d32 100644
--- a/htdocs/core/menus/standard/auguria_menu.php
+++ b/htdocs/core/menus/standard/auguria_menu.php
@@ -47,12 +47,21 @@ class MenuManager
      */
     function __construct($db, $type_user)
     {
-    	global $conf, $user, $langs;
-
     	$this->type_user=$type_user;
     	$this->db=$db;
-
-    	// On sauve en session le menu principal choisi
+    }
+
+    
+   	/**
+   	 * Load this->tabMenu
+   	 *
+   	 * @return	void
+   	 */
+   	function loadMenu()
+   	{
+    	global $conf, $user, $langs;
+
+   		// On sauve en session le menu principal choisi
     	if (isset($_GET["mainmenu"])) $_SESSION["mainmenu"]=$_GET["mainmenu"];
     	if (isset($_GET["idmenu"]))   $_SESSION["idmenu"]=$_GET["idmenu"];
 
@@ -92,8 +101,8 @@ class MenuManager
 
     	require_once DOL_DOCUMENT_ROOT.'/core/class/menubase.class.php';
     	$tabMenu=array();
-    	$menuArbo = new Menubase($db,'auguria');
-    	$menuArbo->menuLoad($mainmenu, $leftmenu, $type_user, 'auguria', $tabMenu);
+    	$menuArbo = new Menubase($this->db,'auguria');
+    	$menuArbo->menuLoad($mainmenu, $leftmenu, $this->type_user, 'auguria', $tabMenu);
 
     	// Modules system tools
     	// TODO Find a way to add parent menu only if child menu exists. For the moment, no other method than hard coded methods.
@@ -158,9 +167,14 @@ class MenuManager
         }
 
         $res='ErrorBadParameterForMode';
-        if ($mode == 'top')  $res=print_auguria_menu($this->db,$this->atarget,$this->type_user,$this->tabMenu);
-        if ($mode == 'left') $res=print_left_auguria_menu($this->db,$this->menu_array,$this->menu_array_after,$this->tabMenu);
+        
+        $this->menu=new Menu();
+        
+        if ($mode == 'top')  $res=print_auguria_menu($this->db,$this->atarget,$this->type_user,$this->tabMenu,$this->menu);
+        if ($mode == 'left') $res=print_left_auguria_menu($this->db,$this->menu_array,$this->menu_array_after,$this->tabMenu,$this->menu);
 
+        unset($this->menu);
+        
         return $res;
     }
 }
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index c6aaa2e392c..e5ea13ea1ae 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -31,10 +31,11 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/menubase.class.php';
  * @param 	DoliDB	$db				Database handler
  * @param 	string	$atarget		Target
  * @param 	int		$type_user     	0=Menu for backoffice, 1=Menu for front office
- * @param  array	&$tabMenu       If array with menu entries already loaded, we put this array here (in most cases, it's empty)
+ * @param  	array	&$tabMenu       If array with menu entries already loaded, we put this array here (in most cases, it's empty)
+ * @param	array	&$menu			Object Menu to return back list of menu entries
  * @return	void
  */
-function print_eldy_menu($db,$atarget,$type_user,&$tabMenu)
+function print_eldy_menu($db,$atarget,$type_user,&$tabMenu,&$menu)
 {
 	global $user,$conf,$langs,$dolibarr_main_db_name;
 
@@ -72,6 +73,7 @@ function print_eldy_menu($db,$atarget,$type_user,&$tabMenu)
 		print_start_menu_entry($idsel,$classname);
 		print_text_menu_entry($langs->trans("ThirdParties"), $showmode, DOL_URL_ROOT.'/societe/index.php?mainmenu=companies&amp;leftmenu=', $id, $idsel, $classname, $atarget);
 		print_end_menu_entry();
+		$menu->add(DOL_URL_ROOT.'/societe/index.php?mainmenu=companies&amp;leftmenu=', $langs->trans("ThirdParties"), 0, $showmode, $atarget, $mainmenu, $leftmenu);
 	}
 
 	// Products-Services
@@ -312,7 +314,7 @@ function print_start_menu_entry($idsel,$classname)
  * Output menu entry
  *
  * @param	string	$text		Text
- * @param	int		$showmode	1 or 2
+ * @param	int		$showmode	1 = allowed or 2 = not allowed
  * @param	string	$url		Url
  * @param	string	$id			Id
  * @param	string	$idsel		Id sel
@@ -340,6 +342,10 @@ function print_text_menu_entry($text, $showmode, $url, $id, $idsel, $classname,
 	{
 		print '<div class="'.$id.' '.$idsel.'"><span class="'.$id.'" id="mainmenuspan_'.$idsel.'"></span></div>';
 		print '<a class="tmenudisabled" id="mainmenua_'.$idsel.'" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">';
+		print '<span class="mainmenuaspan">';
+		print $text;
+		print '</span>';
+		print '</a>';
 	}
 }
 
@@ -375,13 +381,14 @@ function print_end_menu_array()
  * @param 	array		$menu_array_before  Table of menu entries to show before entries of menu handler
  * @param   array		$menu_array_after   Table of menu entries to show after entries of menu handler
  * @param	array		&$tabMenu       	If array with menu entries already loaded, we put this array here (in most cases, it's empty)
+ * @param	array		&$menu				Object Menu to return back list of menu entries
  * @return	void
  */
-function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu)
+function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu,&$menu)
 {
 	global $user,$conf,$langs,$dolibarr_main_db_name,$mysoc;
 
-	$newmenu = new Menu();
+	$newmenu = $menu;
 
 	$mainmenu=$_SESSION["mainmenu"];
 	$leftmenu=$_SESSION["leftmenu"];
@@ -653,7 +660,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 			{
 				$langs->load("contracts");
 				$newmenu->add("/contrat/index.php?leftmenu=contracts", $langs->trans("Contracts"), 0, $user->rights->contrat->lire, '', $mainmenu, 'contracts');
-				$newmenu->add("/societe/societe.php?leftmenu=contracts", $langs->trans("NewContract"), 1, $user->rights->contrat->creer);
+				$newmenu->add("/contrat/fiche.php?&action=create&amp;leftmenu=contracts", $langs->trans("NewContract"), 1, $user->rights->contrat->creer);
 				$newmenu->add("/contrat/liste.php?leftmenu=contracts", $langs->trans("List"), 1, $user->rights->contrat->lire);
 				$newmenu->add("/contrat/services.php?leftmenu=contracts", $langs->trans("MenuServices"), 1, $user->rights->contrat->lire);
 				if ($leftmenu=="contracts") $newmenu->add("/contrat/services.php?leftmenu=contracts&amp;mode=0", $langs->trans("MenuInactiveServices"), 2, $user->rights->contrat->lire);
@@ -1241,15 +1248,14 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
  * @param  array	&$tabMenu       If array with menu entries already loaded, we put this array here (in most cases, it's empty)
  * @return	void
  */
-function print_jmobile_eldy_menu($db,$atarget,$type_user,&$tabMenu)
+function print_jmobile_eldy_menu($db,$atarget,$type_user,&$tabMenu,&$menu)
 {
-	print '<ul data-role="listview" data-inset="true">
-	<li><a href="#">Acura</a></li>
-	<li><a href="#">Audi</a></li>
-	<li><a href="#">BMW</a></li>
-	<li><a href="#">Cadillac</a></li>
-	<li><a href="#">Ferrari</a></li>
-	</ul>';
+	print '<ul data-role="listview" data-inset="true">';
+	foreach ($tabMenu as $key => $val)
+	{
+		print '<li><a href="#">'.$key.'</a></li>';
+	}
+	print '</ul>';
 }
 
 /**
diff --git a/htdocs/core/menus/standard/eldy_menu.php b/htdocs/core/menus/standard/eldy_menu.php
index afebe8d9e6a..ffe5470728e 100644
--- a/htdocs/core/menus/standard/eldy_menu.php
+++ b/htdocs/core/menus/standard/eldy_menu.php
@@ -48,7 +48,16 @@ class MenuManager
     {
     	$this->type_user=$type_user;
         $this->db=$db;
-
+    }
+    
+    
+    /**
+     * Load this->tabMenu
+     * 
+     * @return	void
+     */
+    function loadMenu()
+    {
 		// On sauve en session le menu principal choisi
 		if (isset($_GET["mainmenu"])) $_SESSION["mainmenu"]=$_GET["mainmenu"];
 		if (isset($_GET["idmenu"]))   $_SESSION["idmenu"]=$_GET["idmenu"];
@@ -89,8 +98,8 @@ class MenuManager
 
         require_once DOL_DOCUMENT_ROOT.'/core/class/menubase.class.php';
         $tabMenu=array();
-        $menuArbo = new Menubase($db,'eldy');
-        $menuArbo->menuLoad($mainmenu, $leftmenu, $type_user, 'eldy', $tabMenu);
+        $menuArbo = new Menubase($this->db,'eldy');
+        $menuArbo->menuLoad($mainmenu, $leftmenu, $this->type_user, 'eldy', $tabMenu);
         $this->tabMenu=$tabMenu;
     }
 
@@ -112,12 +121,19 @@ class MenuManager
         	$conf->global->MAIN_SEARCHFORM_SOCIETE=0;
         	$conf->global->MAIN_SEARCHFORM_CONTACT=0;
         }
-
-        $res='ErrorBadParameterForMode';
-        if ($mode == 'top')  $res=print_eldy_menu($this->db,$this->atarget,$this->type_user,$this->tabMenu);
-        if ($mode == 'left') $res=print_left_eldy_menu($this->db,$this->menu_array,$this->menu_array_after,$this->tabMenu);
-        if ($mode == 'jmobile') $res=print_jmobile_eldy_menu($this->db,$this->menu_array,$this->menu_array_after,$this->tabMenu);
 
+        $res='ErrorBadParameterForMode';
+        
+        $this->menu=new Menu();
+        
+        if ($mode == 'top')  $res=print_eldy_menu($this->db,$this->atarget,$this->type_user,$this->tabMenu,$this->menu);
+        if ($mode == 'left') $res=print_left_eldy_menu($this->db,$this->menu_array,$this->menu_array_after,$this->tabMenu,$this->menu);
+        if ($mode == 'jmobile') $res=print_jmobile_eldy_menu($this->db,$this->menu_array,$this->menu_array_after,$this->tabMenu,$this->menu);
+
+        unset($this->menu);
+        
+        //print 'xx'.$mode;
+        //var_dump($this->menu);
         return $res;
     }
 
diff --git a/htdocs/core/menus/standard/empty.php b/htdocs/core/menus/standard/empty.php
index 35e8500e746..83b49382da3 100644
--- a/htdocs/core/menus/standard/empty.php
+++ b/htdocs/core/menus/standard/empty.php
@@ -29,7 +29,7 @@ class MenuManager
 	var $type_user=0;					// Put 0 for internal users, 1 for external users
 	var $atarget="";               		// To store default target to use onto links
 
-	var $menu_array;
+	var $menu;
 	var $menu_array_after;
 
 
@@ -46,6 +46,17 @@ class MenuManager
 	}
 
 
+	/**
+	 * Load this->tabMenu
+	 *
+	 * @return	void
+	 */
+	function loadMenu()
+	{
+		
+	}	
+	
+
 	/**
 	 *  Show menu
 	 *
@@ -58,6 +69,8 @@ class MenuManager
 
 		$id='mainmenu';
 
+		$this->menu=new Menu();
+		
 		if ($mode == 'top')
 		{
 			print_start_menu_array_empty();
@@ -74,40 +87,35 @@ class MenuManager
 
 		if ($mode == 'left')
 		{
-			$newmenu = new Menu();
-
 			// Put here left menu entries
 			// ***** START *****
 
 			$langs->load("admin");  // Load translation file admin.lang
-			$newmenu->add("/admin/index.php?leftmenu=setup", $langs->trans("Setup"),0);
-			$newmenu->add("/admin/company.php", $langs->trans("MenuCompanySetup"),1);
-			$newmenu->add("/admin/modules.php", $langs->trans("Modules"),1);
-			$newmenu->add("/admin/menus.php", $langs->trans("Menus"),1);
-			$newmenu->add("/admin/ihm.php", $langs->trans("GUISetup"),1);
-			$newmenu->add("/admin/boxes.php", $langs->trans("Boxes"),1);
-			$newmenu->add("/admin/delais.php",$langs->trans("Alerts"),1);
-			$newmenu->add("/admin/proxy.php?mainmenu=home", $langs->trans("Security"),1);
-			$newmenu->add("/admin/limits.php?mainmenu=home", $langs->trans("MenuLimits"),1);
-			$newmenu->add("/admin/pdf.php?mainmenu=home", $langs->trans("PDF"),1);
-			$newmenu->add("/admin/mails.php?mainmenu=home", $langs->trans("Emails"),1);
-			$newmenu->add("/admin/sms.php?mainmenu=home", $langs->trans("SMS"),1);
-			$newmenu->add("/admin/dict.php?mainmenu=home", $langs->trans("DictionnarySetup"),1);
-			$newmenu->add("/admin/const.php?mainmenu=home", $langs->trans("OtherSetup"),1);
+			$this->menu->add("/admin/index.php?leftmenu=setup", $langs->trans("Setup"),0);
+			$this->menu->add("/admin/company.php", $langs->trans("MenuCompanySetup"),1);
+			$this->menu->add("/admin/modules.php", $langs->trans("Modules"),1);
+			$this->menu->add("/admin/menus.php", $langs->trans("Menus"),1);
+			$this->menu->add("/admin/ihm.php", $langs->trans("GUISetup"),1);
+			$this->menu->add("/admin/boxes.php", $langs->trans("Boxes"),1);
+			$this->menu->add("/admin/delais.php",$langs->trans("Alerts"),1);
+			$this->menu->add("/admin/proxy.php?mainmenu=home", $langs->trans("Security"),1);
+			$this->menu->add("/admin/limits.php?mainmenu=home", $langs->trans("MenuLimits"),1);
+			$this->menu->add("/admin/pdf.php?mainmenu=home", $langs->trans("PDF"),1);
+			$this->menu->add("/admin/mails.php?mainmenu=home", $langs->trans("Emails"),1);
+			$this->menu->add("/admin/sms.php?mainmenu=home", $langs->trans("SMS"),1);
+			$this->menu->add("/admin/dict.php?mainmenu=home", $langs->trans("DictionnarySetup"),1);
+			$this->menu->add("/admin/const.php?mainmenu=home", $langs->trans("OtherSetup"),1);
 
 			// ***** END *****
 
 			// do not change code after this
 
-			// override menu_array by value array in $newmenu
-			$this->menu_array=$newmenu->liste;
-
 			$alt=0;
-			$num=count($this->menu_array);
+			$num=count($this->menu->liste);
 			for ($i = 0; $i < $num; $i++)
 			{
 				$alt++;
-				if (empty($this->menu_array[$i]['level']))
+				if (empty($this->menu->liste[$i]['level']))
 				{
 					if (($alt%2==0))
 					{
@@ -121,7 +129,7 @@ class MenuManager
 
 				// Place tabulation
 				$tabstring='';
-				$tabul=($this->menu_array[$i]['level'] - 1);
+				$tabul=($this->menu->liste[$i]['level'] - 1);
 				if ($tabul > 0)
 				{
 					for ($j=0; $j < $tabul; $j++)
@@ -130,31 +138,31 @@ class MenuManager
 					}
 				}
 
-				if ($this->menu_array[$i]['level'] == 0) {
-					if ($this->menu_array[$i]['enabled'])
+				if ($this->menu->liste[$i]['level'] == 0) {
+					if ($this->menu->liste[$i]['enabled'])
 					{
-						print '<div class="menu_titre">'.$tabstring.'<a class="vmenu" href="'.dol_buildpath($this->menu_array[$i]['url'],1).'"'.($this->menu_array[$i]['target']?' target="'.$this->menu_array[$i]['target'].'"':'').'>'.$this->menu_array[$i]['titre'].'</a></div>'."\n";
+						print '<div class="menu_titre">'.$tabstring.'<a class="vmenu" href="'.dol_buildpath($this->menu->liste[$i]['url'],1).'"'.($this->menu->liste[$i]['target']?' target="'.$this->menu->liste[$i]['target'].'"':'').'>'.$this->menu->liste[$i]['titre'].'</a></div>'."\n";
 					}
 					else
 					{
-						print '<div class="menu_titre">'.$tabstring.'<font class="vmenudisabled">'.$this->menu_array[$i]['titre'].'</font></div>'."\n";
+						print '<div class="menu_titre">'.$tabstring.'<font class="vmenudisabled">'.$this->menu->liste[$i]['titre'].'</font></div>'."\n";
 					}
 					print '<div class="menu_top"></div>'."\n";
 				}
 
-				if ($this->menu_array[$i]['level'] > 0) {
+				if ($this->menu->liste[$i]['level'] > 0) {
 					print '<div class="menu_contenu">';
 
-					if ($this->menu_array[$i]['enabled'])
-						print $tabstring.'<a class="vsmenu" href="'.dol_buildpath($this->menu_array[$i]['url'],1).'">'.$this->menu_array[$i]['titre'].'</a><br>';
+					if ($this->menu->liste[$i]['enabled'])
+						print $tabstring.'<a class="vsmenu" href="'.dol_buildpath($this->menu->liste[$i]['url'],1).'">'.$this->menu->liste[$i]['titre'].'</a><br>';
 					else
-						print $tabstring.'<font class="vsmenudisabled">'.$this->menu_array[$i]['titre'].'</font><br>';
+						print $tabstring.'<font class="vsmenudisabled">'.$this->menu->liste[$i]['titre'].'</font><br>';
 
 					print '</div>'."\n";
 				}
 
 				// If next is a new block or end
-				if (empty($this->menu_array[$i+1]['level']))
+				if (empty($this->menu->liste[$i+1]['level']))
 				{
 					print '<div class="menu_end"></div>'."\n";
 					print "</div>\n";
diff --git a/htdocs/core/modules/export/export_excel2007.modules.php b/htdocs/core/modules/export/export_excel2007.modules.php
index d0b17be331d..45f6e04d054 100755
--- a/htdocs/core/modules/export/export_excel2007.modules.php
+++ b/htdocs/core/modules/export/export_excel2007.modules.php
@@ -261,9 +261,10 @@ class ExportExcel2007 extends ExportExcel
      *  @param      array		$array_selected_sorted      Array with list of field to export
      *  @param      resource	$objp                       A record from a fetch with all fields from select
      *  @param      Translate	$outputlangs                Object lang to translate values
+     *  @param		array		$array_types				Array with types of fields
 	 * 	@return		int										<0 if KO, >0 if OK
 	 */
-	function write_record($array_selected_sorted,$objp,$outputlangs)
+	function write_record($array_selected_sorted,$objp,$outputlangs,$array_types)
 	{
 		// Create a format for the column headings
 		if (! empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
@@ -282,7 +283,8 @@ class ExportExcel2007 extends ExportExcel
             $newvalue=$objp->$alias;
 
 			$newvalue=$this->excel_clean($newvalue);
-
+			$typefield=isset($array_types[$code])?$array_types[$code]:'';
+			
 			// Traduction newvalue
 			if (preg_match('/^\((.*)\)$/i',$newvalue,$reg))
 			{
@@ -293,6 +295,8 @@ class ExportExcel2007 extends ExportExcel
 				$newvalue=$outputlangs->convToOutputCharset($newvalue);
 			}
 
+			//var_dump($code.' '.$alias.' '.$newvalue.' '.$typefield);
+			
 			if (preg_match('/^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$/i',$newvalue))
 			{
         		if (! empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
@@ -341,7 +345,21 @@ class ExportExcel2007 extends ExportExcel
     		    }
     		    else
     		    {
-        		    $this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($this->col, $this->row+1, $newvalue);
+        		    //$coord=$this->workbook->getActiveSheet()->getCellByColumnAndRow($this->col, $this->row+1)->getCoordinate();
+					//if ($typefield == 'Text') $this->workbook->getActiveSheet()->getStyle($coord)->getNumberFormat()->setFormatCode('@');
+    		    	//$this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($this->col, $this->row+1, $newvalue);
+    		    	if ($typefield == 'Text') 
+    		    	{
+						var_dump($code.' '.$alias.' '.$newvalue.' '.$typefield);
+						$this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($this->col, $this->row+1, $newvalue);
+    		    		$this->workbook->getActiveSheet()->getCellByColumnAndRow($this->col, $this->row+1)->setValueExplicit($newvalue, PHPExcel_Cell_DataType::TYPE_STRING);
+    		    	}
+    		    	else
+    		    	{
+    		    		//$coord=$this->workbook->getActiveSheet()->getCellByColumnAndRow($this->col, $this->row+1)->getCoordinate();
+    		    		//if ($typefield == 'Text') $this->workbook->getActiveSheet()->getStyle($coord)->getNumberFormat()->setFormatCode('@');
+    		    		$this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($this->col, $this->row+1, $newvalue);	
+    		    	} 
     		    }
 			}
 			$this->col++;
diff --git a/htdocs/core/modules/modCommande.class.php b/htdocs/core/modules/modCommande.class.php
index 07b2e03c4b9..008a234891e 100644
--- a/htdocs/core/modules/modCommande.class.php
+++ b/htdocs/core/modules/modCommande.class.php
@@ -80,14 +80,14 @@ class modCommande extends DolibarrModules
 		$this->const[$r][0] = "COMMANDE_ADDON_PDF";
 		$this->const[$r][1] = "chaine";
 		$this->const[$r][2] = "einstein";
-		$this->const[$r][3] = 'Nom du gestionnaire de generation des commandes en PDF';
+		$this->const[$r][3] = 'Name of PDF model of order';
 		$this->const[$r][4] = 0;
 
 		$r++;
 		$this->const[$r][0] = "COMMANDE_ADDON";
 		$this->const[$r][1] = "chaine";
 		$this->const[$r][2] = "mod_commande_marbre";
-		$this->const[$r][3] = 'Nom du gestionnaire de numerotation des commandes';
+		$this->const[$r][3] = 'Name of numbering numerotation rules of order';
 		$this->const[$r][4] = 0;
 
 		$r++;
diff --git a/htdocs/core/modules/modECM.class.php b/htdocs/core/modules/modECM.class.php
index c10bfa3eca3..4822479e95f 100644
--- a/htdocs/core/modules/modECM.class.php
+++ b/htdocs/core/modules/modECM.class.php
@@ -65,7 +65,7 @@ class modECM extends DolibarrModules
 		$this->dirs = array("/ecm/temp");
 
 		// Config pages. Put here list of php page names stored in admmin directory used to setup module
-		$this->config_page_url = array();
+		$this->config_page_url = array('ecm.php');
 
 		// Dependencies
 		$this->depends = array();		// List of modules id that must be enabled if this module is enabled
@@ -73,7 +73,14 @@ class modECM extends DolibarrModules
 
 		// Constants
 		$this->const = array();			// List of parameters
-
+		$r=0;
+		
+		$this->const[$r][0] = "ECM_AUTO_TREE_ENABLED";
+		$this->const[$r][1] = "chaine";
+		$this->const[$r][2] = "1";
+		$this->const[$r][3] = 'Auto tree is enabled by default';
+		$this->const[$r][4] = 0;
+		
 		// Boxes
 		$this->boxes = array();			// List of boxes
 		$r=0;
diff --git a/htdocs/core/modules/modFacture.class.php b/htdocs/core/modules/modFacture.class.php
index b9c2aa27c53..94c4469e034 100644
--- a/htdocs/core/modules/modFacture.class.php
+++ b/htdocs/core/modules/modFacture.class.php
@@ -78,11 +78,15 @@ class modFacture extends DolibarrModules
 		$this->const[$r][0] = "FACTURE_ADDON_PDF";
 		$this->const[$r][1] = "chaine";
 		$this->const[$r][2] = "crabe";
+		$this->const[$r][3] = 'Name of PDF model of invoice';
+		$this->const[$r][4] = 0;
 		$r++;
 
 		$this->const[$r][0] = "FACTURE_ADDON";
 		$this->const[$r][1] = "chaine";
-		$this->const[$r][2] = "terre";
+		$this->const[$r][2] = "mod_facture_terre";
+		$this->const[$r][3] = 'Name of numbering numerotation rules of invoice';
+		$this->const[$r][4] = 0;
 		$r++;
 
 		$this->const[$r][0] = "FACTURE_ADDON_PDF_ODT_PATH";
diff --git a/htdocs/core/modules/modHoliday.class.php b/htdocs/core/modules/modHoliday.class.php
index bbce310b028..4abd87f3d40 100644
--- a/htdocs/core/modules/modHoliday.class.php
+++ b/htdocs/core/modules/modHoliday.class.php
@@ -133,14 +133,14 @@ class modHoliday extends DolibarrModules
 		$r=0;
 
 		$this->rights[$r][0] = 20001; 				// Permission id (must not be already used)
-		$this->rights[$r][1] = 'Créer / Modifier / Lire ses demandes de congés payés';	// Permission label
+		$this->rights[$r][1] = 'Lire/créer/modifier ses demandes de congés payés';	// Permission label
 		$this->rights[$r][3] = 1; 					// Permission by default for new user (0/1)
 		$this->rights[$r][4] = 'write';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
 		$this->rights[$r][5] = '';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
 		$r++;
 
 		$this->rights[$r][0] = 20002; 				// Permission id (must not be already used)
-		$this->rights[$r][1] = 'Lire / Modifier toutes les demandes de congés payés';	// Permission label
+		$this->rights[$r][1] = 'Lire/créer/modifier toutes les demandes de congés payés';	// Permission label
 		$this->rights[$r][3] = 0; 					// Permission by default for new user (0/1)
 		$this->rights[$r][4] = 'lire_tous';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
 		$this->rights[$r][5] = '';				// In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
diff --git a/htdocs/core/modules/modSociete.class.php b/htdocs/core/modules/modSociete.class.php
index dd6520f0214..0498b59ccde 100644
--- a/htdocs/core/modules/modSociete.class.php
+++ b/htdocs/core/modules/modSociete.class.php
@@ -283,7 +283,7 @@ class modSociete extends DolibarrModules
 		$this->export_label[$r]='ExportDataset_company_2';
 		$this->export_icon[$r]='contact';
 		$this->export_permission[$r]=array(array("societe","contact","export"));
-		$this->export_fields_array[$r]=array('c.rowid'=>"IdContact",'c.civilite'=>"CivilityCode",'c.name'=>'Lastname','c.firstname'=>'Firstname','c.datec'=>"DateCreation",'c.tms'=>"DateLastModification",'c.priv'=>"ContactPrivate",'c.address'=>"Address",'c.zip'=>"Zip",'c.town'=>"Town",'c.phone'=>"Phone",'c.fax'=>"Fax",'c.email'=>"EMail",'p.libelle'=>"Country",'p.code'=>"CountryCode",'s.rowid'=>"IdCompany",'s.nom'=>"CompanyName",'s.status'=>"Status",'s.code_client'=>"CustomerCode",'s.code_fournisseur'=>"SupplierCode");
+		$this->export_fields_array[$r]=array('c.rowid'=>"IdContact",'c.civilite'=>"CivilityCode",'c.lastname'=>'Lastname','c.firstname'=>'Firstname','c.datec'=>"DateCreation",'c.tms'=>"DateLastModification",'c.priv'=>"ContactPrivate",'c.address'=>"Address",'c.zip'=>"Zip",'c.town'=>"Town",'c.phone'=>"Phone",'c.fax'=>"Fax",'c.email'=>"EMail",'p.libelle'=>"Country",'p.code'=>"CountryCode",'s.rowid'=>"IdCompany",'s.nom'=>"CompanyName",'s.status'=>"Status",'s.code_client'=>"CustomerCode",'s.code_fournisseur'=>"SupplierCode");
 		$this->export_entities_array[$r]=array('s.rowid'=>"company",'s.nom'=>"company",'s.code_client'=>"company",'s.code_fournisseur'=>"company");	// We define here only fields that use another picto
         if (empty($conf->fournisseur->enabled))
         {
diff --git a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
index 600f09468ab..19fc4a618ff 100755
--- a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
+++ b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
@@ -583,6 +583,7 @@ class InterfaceActionsAuto
 			$ret=$actioncomm->add($user);       // User qui saisit l'action
 			if ($ret > 0)
 			{
+				$_SESSION['LAST_ACTION_CREATED'] = $ret;
 				return 1;
 			}
 			else
diff --git a/htdocs/ecm/index.php b/htdocs/ecm/index.php
index 31b1e3bc6c2..2f42787dda6 100644
--- a/htdocs/ecm/index.php
+++ b/htdocs/ecm/index.php
@@ -380,16 +380,17 @@ llxHeader($moreheadcss.$moreheadjs,$langs->trans("ECMArea"),'','','','',$morejs,
 // Add sections to manage
 $rowspan=0;
 $sectionauto=array();
-if (! empty($conf->product->enabled) || ! empty($conf->service->enabled))     { $rowspan++; $sectionauto[]=array('level'=>1, 'module'=>'product', 'test'=>(! empty($conf->product->enabled) || ! empty($conf->service->enabled)), 'label'=>$langs->trans("ProductsAndServices"),     'desc'=>$langs->trans("ECMDocsByProducts")); }
-if (! empty($conf->societe->enabled))     { $rowspan++; $sectionauto[]=array('level'=>1, 'module'=>'company', 'test'=>$conf->societe->enabled, 'label'=>$langs->trans("ThirdParties"), 'desc'=>$langs->trans("ECMDocsByThirdParties")); }
-if (! empty($conf->propal->enabled))      { $rowspan++; $sectionauto[]=array('level'=>1, 'module'=>'propal',  'test'=>$conf->propal->enabled,  'label'=>$langs->trans("Prop"),    'desc'=>$langs->trans("ECMDocsByProposals")); }
-if (! empty($conf->contrat->enabled))     { $rowspan++; $sectionauto[]=array('level'=>1, 'module'=>'contract','test'=>$conf->contrat->enabled, 'label'=>$langs->trans("Contracts"),    'desc'=>$langs->trans("ECMDocsByContracts")); }
-if (! empty($conf->commande->enabled))    { $rowspan++; $sectionauto[]=array('level'=>1, 'module'=>'order',   'test'=>$conf->commande->enabled,'label'=>$langs->trans("CustomersOrders"),       'desc'=>$langs->trans("ECMDocsByOrders")); }
-if (! empty($conf->facture->enabled))     { $rowspan++; $sectionauto[]=array('level'=>1, 'module'=>'invoice', 'test'=>$conf->facture->enabled, 'label'=>$langs->trans("CustomersInvoices"),     'desc'=>$langs->trans("ECMDocsByInvoices")); }
-if (! empty($conf->fournisseur->enabled)) { $rowspan++; $sectionauto[]=array('level'=>1, 'module'=>'order_supplier',   'test'=>$conf->fournisseur->enabled, 'label'=>$langs->trans("SuppliersOrders"),     'desc'=>$langs->trans("ECMDocsByOrders")); }
-if (! empty($conf->fournisseur->enabled)) { $rowspan++; $sectionauto[]=array('level'=>1, 'module'=>'invoice_supplier', 'test'=>$conf->fournisseur->enabled, 'label'=>$langs->trans("SuppliersInvoices"),   'desc'=>$langs->trans("ECMDocsByInvoices")); }
-if (! empty($conf->tax->enabled))         { $rowspan++; $sectionauto[]=array('level'=>1, 'module'=>'tax', 'test'=>$conf->tax->enabled, 'label'=>$langs->trans("SocialContributions"),     'desc'=>$langs->trans("ECMDocsBySocialContributions")); }
-
+if (!empty($conf->global->ECM_AUTO_TREE_ENABLED)) {
+	if (! empty($conf->product->enabled) || ! empty($conf->service->enabled))     { $rowspan++; $sectionauto[]=array('level'=>1, 'module'=>'product', 'test'=>(! empty($conf->product->enabled) || ! empty($conf->service->enabled)), 'label'=>$langs->trans("ProductsAndServices"),     'desc'=>$langs->trans("ECMDocsByProducts")); }
+	if (! empty($conf->societe->enabled))     { $rowspan++; $sectionauto[]=array('level'=>1, 'module'=>'company', 'test'=>$conf->societe->enabled, 'label'=>$langs->trans("ThirdParties"), 'desc'=>$langs->trans("ECMDocsByThirdParties")); }
+	if (! empty($conf->propal->enabled))      { $rowspan++; $sectionauto[]=array('level'=>1, 'module'=>'propal',  'test'=>$conf->propal->enabled,  'label'=>$langs->trans("Prop"),    'desc'=>$langs->trans("ECMDocsByProposals")); }
+	if (! empty($conf->contrat->enabled))     { $rowspan++; $sectionauto[]=array('level'=>1, 'module'=>'contract','test'=>$conf->contrat->enabled, 'label'=>$langs->trans("Contracts"),    'desc'=>$langs->trans("ECMDocsByContracts")); }
+	if (! empty($conf->commande->enabled))    { $rowspan++; $sectionauto[]=array('level'=>1, 'module'=>'order',   'test'=>$conf->commande->enabled,'label'=>$langs->trans("CustomersOrders"),       'desc'=>$langs->trans("ECMDocsByOrders")); }
+	if (! empty($conf->facture->enabled))     { $rowspan++; $sectionauto[]=array('level'=>1, 'module'=>'invoice', 'test'=>$conf->facture->enabled, 'label'=>$langs->trans("CustomersInvoices"),     'desc'=>$langs->trans("ECMDocsByInvoices")); }
+	if (! empty($conf->fournisseur->enabled)) { $rowspan++; $sectionauto[]=array('level'=>1, 'module'=>'order_supplier',   'test'=>$conf->fournisseur->enabled, 'label'=>$langs->trans("SuppliersOrders"),     'desc'=>$langs->trans("ECMDocsByOrders")); }
+	if (! empty($conf->fournisseur->enabled)) { $rowspan++; $sectionauto[]=array('level'=>1, 'module'=>'invoice_supplier', 'test'=>$conf->fournisseur->enabled, 'label'=>$langs->trans("SuppliersInvoices"),   'desc'=>$langs->trans("ECMDocsByInvoices")); }
+	if (! empty($conf->tax->enabled))         { $rowspan++; $sectionauto[]=array('level'=>1, 'module'=>'tax', 'test'=>$conf->tax->enabled, 'label'=>$langs->trans("SocialContributions"),     'desc'=>$langs->trans("ECMDocsBySocialContributions")); }
+}
 print_fiche_titre($langs->trans("ECMArea").' - '.$langs->trans("ECMFileManager"));
 
 print $langs->trans("ECMAreaDesc")."<br>";
@@ -466,7 +467,6 @@ if (empty($action) || $action == 'file_manager' || preg_match('/refresh/i',$acti
 	print '</td></tr>';
 
     $showonrightsize='';
-
     // Auto section
 	if (count($sectionauto))
 	{
@@ -788,6 +788,8 @@ if (! empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_ECM_DISABLE
 	include 'tpl/builddatabase.tpl.php';
 }
 
+
+
 llxFooter();
 
 $db->close();
diff --git a/htdocs/exports/class/export.class.php b/htdocs/exports/class/export.class.php
index fb3e0fcebb7..6a51380e8a1 100644
--- a/htdocs/exports/class/export.class.php
+++ b/htdocs/exports/class/export.class.php
@@ -200,8 +200,8 @@ class Export
 	 *      Arrays this->array_export_xxx are already loaded for required datatoexport
 	 *
 	 *      @param      int		$indice				Indice of export
-	 *      @param      array	$array_selected     Filter on array of fields to export
-	 *      @param      array	$array_filterValue  Filter on array of fields to export
+	 *      @param      array	$array_selected     Filter fields on array of fields to export
+	 *      @param      array	$array_filterValue  Filter records on array of value for fields
 	 *      @return		string						SQL String. Example "select s.rowid as r_rowid, s.status as s_status from ..."
 	 */
 	function build_sql($indice, $array_selected, $array_filterValue)
@@ -230,7 +230,7 @@ class Export
 			// pour ne pas a gerer le nombre de condition
 			foreach ($array_filterValue as $key => $value)
 			{
-				$sqlWhere.=" and ".$this->build_filterQuery($this->array_export_TypeFields[0][$key], $key, $array_filterValue[$key]);
+				$sqlWhere.=" and ".$this->build_filterQuery($this->array_export_TypeFields[$indice][$key], $key, $array_filterValue[$key]);
 			}
 			$sql.=$sqlWhere;
 		}
@@ -464,7 +464,7 @@ class Export
 	 *      @param      string		$datatoexport       Name of dataset to export
 	 *      @param      array		$array_selected     Filter on array of fields to export
 	 *      @param      array		$array_filterValue  Filter on array of fields with a filter
-	 *      @param		string		$sqlquery			If set, transmit a sql query instead of building it from arrays
+	 *      @param		string		$sqlquery			If set, transmit the sql request for select (otherwise, sql request is generated from arrays)
 	 *      @return		int								<0 if KO, >0 if OK
 	 */
 	function build_file($user, $model, $datatoexport, $array_selected, $array_filterValue, $sqlquery = '')
@@ -547,8 +547,7 @@ class Export
 						}
 					}
 					// end of special operation processing
-
-					$objmodel->write_record($array_selected,$objp,$outputlangs);
+					$objmodel->write_record($array_selected,$objp,$outputlangs,$this->array_export_TypeFields[$indice]);
 				}
 
 				// Genere en-tete
diff --git a/htdocs/fourn/commande/fiche.php b/htdocs/fourn/commande/fiche.php
index 24ecd0690b0..1afb3fddb00 100644
--- a/htdocs/fourn/commande/fiche.php
+++ b/htdocs/fourn/commande/fiche.php
@@ -295,7 +295,9 @@ else if ($action == 'addline' && $user->rights->fournisseur->commande->creer)
         //print "xx".$tva_tx; exit;
         if ($result > 0)
         {
-            if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
+            $ret=$object->fetch($object->id);    // Reload to get new records
+
+        	if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
             {
             	// Define output language
             	$outputlangs = $langs;
@@ -307,7 +309,6 @@ else if ($action == 'addline' && $user->rights->fournisseur->commande->creer)
             		$outputlangs->setDefaultLang($newlang);
             	}
 
-                $ret=$object->fetch($object->id);    // Reload to get new records
                 supplier_order_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
             }
             unset($_POST['qty']);
diff --git a/htdocs/holiday/class/holiday.class.php b/htdocs/holiday/class/holiday.class.php
index 1fe3dac3d64..def7304f926 100644
--- a/htdocs/holiday/class/holiday.class.php
+++ b/htdocs/holiday/class/holiday.class.php
@@ -367,7 +367,7 @@ class Holiday extends CommonObject
         $sql.= " uu.lastname as user_lastname,";
         $sql.= " uu.firstname as user_firstname,";
 
-        $sql.= " ua.name as validator_lastname,";
+        $sql.= " ua.lastname as validator_lastname,";
         $sql.= " ua.firstname as validator_firstname";
 
         $sql.= " FROM ".MAIN_DB_PREFIX."holiday as cp, ".MAIN_DB_PREFIX."user as uu, ".MAIN_DB_PREFIX."user as ua";
diff --git a/htdocs/holiday/index.php b/htdocs/holiday/index.php
index d084c0ce2ef..eb6d5dd5d7c 100644
--- a/htdocs/holiday/index.php
+++ b/htdocs/holiday/index.php
@@ -101,9 +101,11 @@ if(!empty($search_ref))
 // DATE START
 if($year_start > 0) {
     if($month_start > 0) {
-        $filter.= " AND date_format(cp.date_debut, '%Y-%m') = '$year_start-$month_start'";
+    	$filter .= " AND (cp.date_debut BETWEEN '".$db->idate(dol_get_first_day($year_start,$month_start,1))."' AND '".$db->idate(dol_get_last_day($year_start,$month_start,1))."')";
+    	//$filter.= " AND date_format(cp.date_debut, '%Y-%m') = '$year_start-$month_start'";
     } else {
-        $filter.= " AND date_format(cp.date_debut, '%Y') = '$year_start'";
+    	$filter .= " AND (cp.date_debut BETWEEN '".$db->idate(dol_get_first_day($year_start,1,1))."' AND '".$db->idate(dol_get_last_day($year_start,12,1))."')";
+    	//$filter.= " AND date_format(cp.date_debut, '%Y') = '$year_start'";
     }
 } else {
     if($month_start > 0) {
@@ -114,9 +116,11 @@ if($year_start > 0) {
 // DATE FIN
 if($year_end > 0) {
     if($month_end > 0) {
-        $filter.= " AND date_format(cp.date_fin, '%Y-%m') = '$year_end-$month_end'";
+    	$filter .= " AND (cp.date_fin BETWEEN '".$db->idate(dol_get_first_day($year_end,$month_end,1))."' AND '".$db->idate(dol_get_last_day($year_end,$month_end,1))."')";
+    	//$filter.= " AND date_format(cp.date_fin, '%Y-%m') = '$year_end-$month_end'";
     } else {
-        $filter.= " AND date_format(cp.date_fin, '%Y') = '$year_end'";
+    	$filter .= " AND (cp.date_fin BETWEEN '".$db->idate(dol_get_first_day($year_end,1,1))."' AND '".$db->idate(dol_get_last_day($year_end,12,1))."')";
+    	//$filter.= " AND date_format(cp.date_fin, '%Y') = '$year_end'";
     }
 } else {
     if($month_end > 0) {
@@ -127,9 +131,11 @@ if($year_end > 0) {
 // DATE CREATE
 if($year_create > 0) {
     if($month_create > 0) {
-        $filter.= " AND date_format(cp.date_create, '%Y-%m') = '$year_create-$month_create'";
+    	$filter .= " AND (cp.date_create BETWEEN '".$db->idate(dol_get_first_day($year_create,$month_create,1))."' AND '".$db->idate(dol_get_last_day($year_create,$month_create,1))."')";
+    	//$filter.= " AND date_format(cp.date_create, '%Y-%m') = '$year_create-$month_create'";
     } else {
-        $filter.= " AND date_format(cp.date_create, '%Y') = '$year_create'";
+    	$filter .= " AND (cp.date_create BETWEEN '".$db->idate(dol_get_first_day($year_create,1,1))."' AND '".$db->idate(dol_get_last_day($year_create,12,1))."')";
+    	//$filter.= " AND date_format(cp.date_create, '%Y') = '$year_create'";
     }
 } else {
     if($month_create > 0) {
diff --git a/htdocs/includes/ckeditor/adapters/jquery.js b/htdocs/includes/ckeditor/adapters/jquery.js
index 04f8c94dcbc..f3deeb1a510 100644
--- a/htdocs/includes/ckeditor/adapters/jquery.js
+++ b/htdocs/includes/ckeditor/adapters/jquery.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/ckeditor.asp b/htdocs/includes/ckeditor/ckeditor.asp
index 094e7273156..60e8a0340c2 100644
--- a/htdocs/includes/ckeditor/ckeditor.asp
+++ b/htdocs/includes/ckeditor/ckeditor.asp
@@ -1,4 +1,4 @@
-<%
+<%
  '
  ' Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
  ' For licensing, see LICENSE.html or http://ckeditor.com/license
diff --git a/htdocs/includes/ckeditor/ckeditor.js b/htdocs/includes/ckeditor/ckeditor.js
index f3758ea29dd..44b4b2fcb93 100644
--- a/htdocs/includes/ckeditor/ckeditor.js
+++ b/htdocs/includes/ckeditor/ckeditor.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/ckeditor_basic.js b/htdocs/includes/ckeditor/ckeditor_basic.js
index 7a5b1fef27f..2ffa3a129c1 100644
--- a/htdocs/includes/ckeditor/ckeditor_basic.js
+++ b/htdocs/includes/ckeditor/ckeditor_basic.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/ckeditor_basic_source.js b/htdocs/includes/ckeditor/ckeditor_basic_source.js
index 13c0d6cb74e..2a49dd7fe29 100644
--- a/htdocs/includes/ckeditor/ckeditor_basic_source.js
+++ b/htdocs/includes/ckeditor/ckeditor_basic_source.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/ckeditor_source.js b/htdocs/includes/ckeditor/ckeditor_source.js
index 52d432cb529..f77c003d3b3 100644
--- a/htdocs/includes/ckeditor/ckeditor_source.js
+++ b/htdocs/includes/ckeditor/ckeditor_source.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/config.js b/htdocs/includes/ckeditor/config.js
index 44dd1e41bd9..47fd53e1753 100644
--- a/htdocs/includes/ckeditor/config.js
+++ b/htdocs/includes/ckeditor/config.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/lang/_languages.js b/htdocs/includes/ckeditor/lang/_languages.js
index b7385837bce..e119ad9aba3 100644
--- a/htdocs/includes/ckeditor/lang/_languages.js
+++ b/htdocs/includes/ckeditor/lang/_languages.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/lang/af.js b/htdocs/includes/ckeditor/lang/af.js
index 8cc3c7c4570..860204faf1e 100644
--- a/htdocs/includes/ckeditor/lang/af.js
+++ b/htdocs/includes/ckeditor/lang/af.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/lang/ar.js b/htdocs/includes/ckeditor/lang/ar.js
index 0e0a8926ef5..f12db24acf5 100644
--- a/htdocs/includes/ckeditor/lang/ar.js
+++ b/htdocs/includes/ckeditor/lang/ar.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/lang/bg.js b/htdocs/includes/ckeditor/lang/bg.js
index e8b8b92ec7c..5d956e6b074 100644
--- a/htdocs/includes/ckeditor/lang/bg.js
+++ b/htdocs/includes/ckeditor/lang/bg.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/lang/bn.js b/htdocs/includes/ckeditor/lang/bn.js
index beb38f677fb..feed2af2868 100644
--- a/htdocs/includes/ckeditor/lang/bn.js
+++ b/htdocs/includes/ckeditor/lang/bn.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/lang/bs.js b/htdocs/includes/ckeditor/lang/bs.js
index ba59d3b32bc..18ccbd22ee0 100644
--- a/htdocs/includes/ckeditor/lang/bs.js
+++ b/htdocs/includes/ckeditor/lang/bs.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/lang/ca.js b/htdocs/includes/ckeditor/lang/ca.js
index bcecf8a8d90..9ae3ba9d11a 100644
--- a/htdocs/includes/ckeditor/lang/ca.js
+++ b/htdocs/includes/ckeditor/lang/ca.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/lang/cs.js b/htdocs/includes/ckeditor/lang/cs.js
index 74709c7cc4f..78181646857 100644
--- a/htdocs/includes/ckeditor/lang/cs.js
+++ b/htdocs/includes/ckeditor/lang/cs.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/lang/cy.js b/htdocs/includes/ckeditor/lang/cy.js
index 94b49c1b7eb..3ca55dd9e7d 100644
--- a/htdocs/includes/ckeditor/lang/cy.js
+++ b/htdocs/includes/ckeditor/lang/cy.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/lang/da.js b/htdocs/includes/ckeditor/lang/da.js
index 819da5073d9..ae5c782cc6d 100644
--- a/htdocs/includes/ckeditor/lang/da.js
+++ b/htdocs/includes/ckeditor/lang/da.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/lang/de.js b/htdocs/includes/ckeditor/lang/de.js
index 5ec37fded32..5428feb8fe3 100644
--- a/htdocs/includes/ckeditor/lang/de.js
+++ b/htdocs/includes/ckeditor/lang/de.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/lang/el.js b/htdocs/includes/ckeditor/lang/el.js
index d25d42ae916..362423d04f4 100644
--- a/htdocs/includes/ckeditor/lang/el.js
+++ b/htdocs/includes/ckeditor/lang/el.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/lang/en-au.js b/htdocs/includes/ckeditor/lang/en-au.js
index 4461727cb7f..bdbeefea2d5 100644
--- a/htdocs/includes/ckeditor/lang/en-au.js
+++ b/htdocs/includes/ckeditor/lang/en-au.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/lang/en-ca.js b/htdocs/includes/ckeditor/lang/en-ca.js
index 470209bd0e4..2618709ee00 100644
--- a/htdocs/includes/ckeditor/lang/en-ca.js
+++ b/htdocs/includes/ckeditor/lang/en-ca.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/lang/en-gb.js b/htdocs/includes/ckeditor/lang/en-gb.js
index 6d3b0737b5e..02cd9b1eaeb 100644
--- a/htdocs/includes/ckeditor/lang/en-gb.js
+++ b/htdocs/includes/ckeditor/lang/en-gb.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/lang/en.js b/htdocs/includes/ckeditor/lang/en.js
index 5c5fcf3979f..a4938f6ff35 100644
--- a/htdocs/includes/ckeditor/lang/en.js
+++ b/htdocs/includes/ckeditor/lang/en.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/lang/eo.js b/htdocs/includes/ckeditor/lang/eo.js
index a4160b74ae6..60132f2f348 100644
--- a/htdocs/includes/ckeditor/lang/eo.js
+++ b/htdocs/includes/ckeditor/lang/eo.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/lang/es.js b/htdocs/includes/ckeditor/lang/es.js
index e48c5805390..e56f392c932 100644
--- a/htdocs/includes/ckeditor/lang/es.js
+++ b/htdocs/includes/ckeditor/lang/es.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/lang/et.js b/htdocs/includes/ckeditor/lang/et.js
index 4369767aa0a..152ec89485c 100644
--- a/htdocs/includes/ckeditor/lang/et.js
+++ b/htdocs/includes/ckeditor/lang/et.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/lang/eu.js b/htdocs/includes/ckeditor/lang/eu.js
index 5826bcf4a87..ea1a06aee10 100644
--- a/htdocs/includes/ckeditor/lang/eu.js
+++ b/htdocs/includes/ckeditor/lang/eu.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/lang/fa.js b/htdocs/includes/ckeditor/lang/fa.js
index e20714d3805..7ac5efa2cc0 100644
--- a/htdocs/includes/ckeditor/lang/fa.js
+++ b/htdocs/includes/ckeditor/lang/fa.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/lang/fi.js b/htdocs/includes/ckeditor/lang/fi.js
index 12cc26dafbe..bd87b92e3f3 100644
--- a/htdocs/includes/ckeditor/lang/fi.js
+++ b/htdocs/includes/ckeditor/lang/fi.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/lang/fo.js b/htdocs/includes/ckeditor/lang/fo.js
index 0f4c0d5abe2..5b620c61432 100644
--- a/htdocs/includes/ckeditor/lang/fo.js
+++ b/htdocs/includes/ckeditor/lang/fo.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/lang/fr-ca.js b/htdocs/includes/ckeditor/lang/fr-ca.js
index 09e9922f352..3f06fecb194 100644
--- a/htdocs/includes/ckeditor/lang/fr-ca.js
+++ b/htdocs/includes/ckeditor/lang/fr-ca.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/lang/fr.js b/htdocs/includes/ckeditor/lang/fr.js
index f1b3ce416df..24e0803d6f5 100644
--- a/htdocs/includes/ckeditor/lang/fr.js
+++ b/htdocs/includes/ckeditor/lang/fr.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/lang/gl.js b/htdocs/includes/ckeditor/lang/gl.js
index fce85479d32..b3695fbc562 100644
--- a/htdocs/includes/ckeditor/lang/gl.js
+++ b/htdocs/includes/ckeditor/lang/gl.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/lang/gu.js b/htdocs/includes/ckeditor/lang/gu.js
index 0cb6076b7fe..89cdd660cf9 100644
--- a/htdocs/includes/ckeditor/lang/gu.js
+++ b/htdocs/includes/ckeditor/lang/gu.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/lang/he.js b/htdocs/includes/ckeditor/lang/he.js
index 93ffb370d08..a859c879d22 100644
--- a/htdocs/includes/ckeditor/lang/he.js
+++ b/htdocs/includes/ckeditor/lang/he.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/lang/hi.js b/htdocs/includes/ckeditor/lang/hi.js
index 158d9c4411d..6e36e1b966e 100644
--- a/htdocs/includes/ckeditor/lang/hi.js
+++ b/htdocs/includes/ckeditor/lang/hi.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/lang/hr.js b/htdocs/includes/ckeditor/lang/hr.js
index 56167cfa031..0a6222a4d11 100644
--- a/htdocs/includes/ckeditor/lang/hr.js
+++ b/htdocs/includes/ckeditor/lang/hr.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/lang/hu.js b/htdocs/includes/ckeditor/lang/hu.js
index 4a338998bee..e5c99b4b926 100644
--- a/htdocs/includes/ckeditor/lang/hu.js
+++ b/htdocs/includes/ckeditor/lang/hu.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/lang/id.js b/htdocs/includes/ckeditor/lang/id.js
index 7ac08a3c4d7..bef1853001d 100644
--- a/htdocs/includes/ckeditor/lang/id.js
+++ b/htdocs/includes/ckeditor/lang/id.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/lang/is.js b/htdocs/includes/ckeditor/lang/is.js
index 6b1829d4bad..5e0498d444f 100644
--- a/htdocs/includes/ckeditor/lang/is.js
+++ b/htdocs/includes/ckeditor/lang/is.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/lang/it.js b/htdocs/includes/ckeditor/lang/it.js
index 67eb31f3cb8..385e19a8885 100644
--- a/htdocs/includes/ckeditor/lang/it.js
+++ b/htdocs/includes/ckeditor/lang/it.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/lang/ja.js b/htdocs/includes/ckeditor/lang/ja.js
index 48cdb540952..39358851bc1 100644
--- a/htdocs/includes/ckeditor/lang/ja.js
+++ b/htdocs/includes/ckeditor/lang/ja.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/lang/ka.js b/htdocs/includes/ckeditor/lang/ka.js
index 6d671bd7074..326d5e2e4a3 100755
--- a/htdocs/includes/ckeditor/lang/ka.js
+++ b/htdocs/includes/ckeditor/lang/ka.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/lang/km.js b/htdocs/includes/ckeditor/lang/km.js
index b24faeaca71..e5b8e352a83 100644
--- a/htdocs/includes/ckeditor/lang/km.js
+++ b/htdocs/includes/ckeditor/lang/km.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/lang/ko.js b/htdocs/includes/ckeditor/lang/ko.js
index ab4be577f32..98729ead50a 100644
--- a/htdocs/includes/ckeditor/lang/ko.js
+++ b/htdocs/includes/ckeditor/lang/ko.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/lang/lt.js b/htdocs/includes/ckeditor/lang/lt.js
index 1f870c13f12..29ffd9cc025 100644
--- a/htdocs/includes/ckeditor/lang/lt.js
+++ b/htdocs/includes/ckeditor/lang/lt.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/lang/lv.js b/htdocs/includes/ckeditor/lang/lv.js
index f81fd19c535..8cab8985205 100644
--- a/htdocs/includes/ckeditor/lang/lv.js
+++ b/htdocs/includes/ckeditor/lang/lv.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/lang/mk.js b/htdocs/includes/ckeditor/lang/mk.js
index e390d4810e0..18dfd066346 100644
--- a/htdocs/includes/ckeditor/lang/mk.js
+++ b/htdocs/includes/ckeditor/lang/mk.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/lang/mn.js b/htdocs/includes/ckeditor/lang/mn.js
index 197cef36ecc..b055391a565 100644
--- a/htdocs/includes/ckeditor/lang/mn.js
+++ b/htdocs/includes/ckeditor/lang/mn.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/lang/ms.js b/htdocs/includes/ckeditor/lang/ms.js
index 90ab943adf8..6e2a9644e58 100644
--- a/htdocs/includes/ckeditor/lang/ms.js
+++ b/htdocs/includes/ckeditor/lang/ms.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/lang/nb.js b/htdocs/includes/ckeditor/lang/nb.js
index 0c335ffe1a1..1a52bebc3b3 100644
--- a/htdocs/includes/ckeditor/lang/nb.js
+++ b/htdocs/includes/ckeditor/lang/nb.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/lang/nl.js b/htdocs/includes/ckeditor/lang/nl.js
index 582310a372f..d8c1bb68ac9 100644
--- a/htdocs/includes/ckeditor/lang/nl.js
+++ b/htdocs/includes/ckeditor/lang/nl.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/lang/no.js b/htdocs/includes/ckeditor/lang/no.js
index 368b1e702b1..3d16eda2f8e 100644
--- a/htdocs/includes/ckeditor/lang/no.js
+++ b/htdocs/includes/ckeditor/lang/no.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/lang/pl.js b/htdocs/includes/ckeditor/lang/pl.js
index 5cf7cd9b710..680c7ae710b 100644
--- a/htdocs/includes/ckeditor/lang/pl.js
+++ b/htdocs/includes/ckeditor/lang/pl.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/lang/pt-br.js b/htdocs/includes/ckeditor/lang/pt-br.js
index 1a09d40f8bf..0d82f7528ce 100644
--- a/htdocs/includes/ckeditor/lang/pt-br.js
+++ b/htdocs/includes/ckeditor/lang/pt-br.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/lang/pt.js b/htdocs/includes/ckeditor/lang/pt.js
index 1956677c0ea..ddb0d79e659 100644
--- a/htdocs/includes/ckeditor/lang/pt.js
+++ b/htdocs/includes/ckeditor/lang/pt.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/lang/ro.js b/htdocs/includes/ckeditor/lang/ro.js
index 9d29578d5a1..557a73c6936 100644
--- a/htdocs/includes/ckeditor/lang/ro.js
+++ b/htdocs/includes/ckeditor/lang/ro.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/lang/ru.js b/htdocs/includes/ckeditor/lang/ru.js
index c1299b3813f..de982d197de 100644
--- a/htdocs/includes/ckeditor/lang/ru.js
+++ b/htdocs/includes/ckeditor/lang/ru.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/lang/sk.js b/htdocs/includes/ckeditor/lang/sk.js
index 3e8a02e086e..6c3a313212d 100644
--- a/htdocs/includes/ckeditor/lang/sk.js
+++ b/htdocs/includes/ckeditor/lang/sk.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/lang/sl.js b/htdocs/includes/ckeditor/lang/sl.js
index 5d7f491941f..4d6b9d70a7e 100644
--- a/htdocs/includes/ckeditor/lang/sl.js
+++ b/htdocs/includes/ckeditor/lang/sl.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/lang/sr-latn.js b/htdocs/includes/ckeditor/lang/sr-latn.js
index a20361cb399..7d7731d8000 100644
--- a/htdocs/includes/ckeditor/lang/sr-latn.js
+++ b/htdocs/includes/ckeditor/lang/sr-latn.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/lang/sr.js b/htdocs/includes/ckeditor/lang/sr.js
index 963a233aaa6..eea71ed2e07 100644
--- a/htdocs/includes/ckeditor/lang/sr.js
+++ b/htdocs/includes/ckeditor/lang/sr.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/lang/sv.js b/htdocs/includes/ckeditor/lang/sv.js
index a9caecd1577..8ed815352f5 100644
--- a/htdocs/includes/ckeditor/lang/sv.js
+++ b/htdocs/includes/ckeditor/lang/sv.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/lang/th.js b/htdocs/includes/ckeditor/lang/th.js
index a6718db6276..86f15162454 100644
--- a/htdocs/includes/ckeditor/lang/th.js
+++ b/htdocs/includes/ckeditor/lang/th.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/lang/tr.js b/htdocs/includes/ckeditor/lang/tr.js
index 6cc8491bc41..1774ccf9821 100644
--- a/htdocs/includes/ckeditor/lang/tr.js
+++ b/htdocs/includes/ckeditor/lang/tr.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/lang/ug.js b/htdocs/includes/ckeditor/lang/ug.js
index 03e87a43f70..12dd92aff1b 100644
--- a/htdocs/includes/ckeditor/lang/ug.js
+++ b/htdocs/includes/ckeditor/lang/ug.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/lang/uk.js b/htdocs/includes/ckeditor/lang/uk.js
index 0541f858d6e..e401441d37b 100644
--- a/htdocs/includes/ckeditor/lang/uk.js
+++ b/htdocs/includes/ckeditor/lang/uk.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/lang/vi.js b/htdocs/includes/ckeditor/lang/vi.js
index 6c597af668d..fb0cdc1f6d9 100644
--- a/htdocs/includes/ckeditor/lang/vi.js
+++ b/htdocs/includes/ckeditor/lang/vi.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/lang/zh-cn.js b/htdocs/includes/ckeditor/lang/zh-cn.js
index e0f7badd926..b340cbfaef0 100644
--- a/htdocs/includes/ckeditor/lang/zh-cn.js
+++ b/htdocs/includes/ckeditor/lang/zh-cn.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/lang/zh.js b/htdocs/includes/ckeditor/lang/zh.js
index 4779130da4a..3e07627ee38 100644
--- a/htdocs/includes/ckeditor/lang/zh.js
+++ b/htdocs/includes/ckeditor/lang/zh.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/a11yhelp/dialogs/a11yhelp.js b/htdocs/includes/ckeditor/plugins/a11yhelp/dialogs/a11yhelp.js
index e4bd208bf59..5e6a37a08fe 100644
--- a/htdocs/includes/ckeditor/plugins/a11yhelp/dialogs/a11yhelp.js
+++ b/htdocs/includes/ckeditor/plugins/a11yhelp/dialogs/a11yhelp.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/a11yhelp/lang/cs.js b/htdocs/includes/ckeditor/plugins/a11yhelp/lang/cs.js
index a8de6d6929a..90fc3b1cefa 100644
--- a/htdocs/includes/ckeditor/plugins/a11yhelp/lang/cs.js
+++ b/htdocs/includes/ckeditor/plugins/a11yhelp/lang/cs.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/a11yhelp/lang/cy.js b/htdocs/includes/ckeditor/plugins/a11yhelp/lang/cy.js
index ffc4bc52949..310935e113d 100644
--- a/htdocs/includes/ckeditor/plugins/a11yhelp/lang/cy.js
+++ b/htdocs/includes/ckeditor/plugins/a11yhelp/lang/cy.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/a11yhelp/lang/da.js b/htdocs/includes/ckeditor/plugins/a11yhelp/lang/da.js
index 0fca0cfdeb5..6835a19fbdc 100644
--- a/htdocs/includes/ckeditor/plugins/a11yhelp/lang/da.js
+++ b/htdocs/includes/ckeditor/plugins/a11yhelp/lang/da.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/a11yhelp/lang/de.js b/htdocs/includes/ckeditor/plugins/a11yhelp/lang/de.js
index 9a648bd0a10..69b9b52b09f 100644
--- a/htdocs/includes/ckeditor/plugins/a11yhelp/lang/de.js
+++ b/htdocs/includes/ckeditor/plugins/a11yhelp/lang/de.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/a11yhelp/lang/el.js b/htdocs/includes/ckeditor/plugins/a11yhelp/lang/el.js
index acbde0072d6..66f5bf7a727 100644
--- a/htdocs/includes/ckeditor/plugins/a11yhelp/lang/el.js
+++ b/htdocs/includes/ckeditor/plugins/a11yhelp/lang/el.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/a11yhelp/lang/en.js b/htdocs/includes/ckeditor/plugins/a11yhelp/lang/en.js
index 073f43aae33..62119d723c7 100644
--- a/htdocs/includes/ckeditor/plugins/a11yhelp/lang/en.js
+++ b/htdocs/includes/ckeditor/plugins/a11yhelp/lang/en.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/a11yhelp/lang/eo.js b/htdocs/includes/ckeditor/plugins/a11yhelp/lang/eo.js
index af457964def..d24290f729a 100644
--- a/htdocs/includes/ckeditor/plugins/a11yhelp/lang/eo.js
+++ b/htdocs/includes/ckeditor/plugins/a11yhelp/lang/eo.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/a11yhelp/lang/fa.js b/htdocs/includes/ckeditor/plugins/a11yhelp/lang/fa.js
index 61bb10ca714..91522b4110c 100644
--- a/htdocs/includes/ckeditor/plugins/a11yhelp/lang/fa.js
+++ b/htdocs/includes/ckeditor/plugins/a11yhelp/lang/fa.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/a11yhelp/lang/fi.js b/htdocs/includes/ckeditor/plugins/a11yhelp/lang/fi.js
index af5f894a54a..f365194e273 100644
--- a/htdocs/includes/ckeditor/plugins/a11yhelp/lang/fi.js
+++ b/htdocs/includes/ckeditor/plugins/a11yhelp/lang/fi.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/a11yhelp/lang/fr.js b/htdocs/includes/ckeditor/plugins/a11yhelp/lang/fr.js
index e2f20a03182..edfae4a5ceb 100644
--- a/htdocs/includes/ckeditor/plugins/a11yhelp/lang/fr.js
+++ b/htdocs/includes/ckeditor/plugins/a11yhelp/lang/fr.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/a11yhelp/lang/gu.js b/htdocs/includes/ckeditor/plugins/a11yhelp/lang/gu.js
index ae09189d3a0..7b207209499 100644
--- a/htdocs/includes/ckeditor/plugins/a11yhelp/lang/gu.js
+++ b/htdocs/includes/ckeditor/plugins/a11yhelp/lang/gu.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/a11yhelp/lang/he.js b/htdocs/includes/ckeditor/plugins/a11yhelp/lang/he.js
index 5d938055e4e..74d2dd14224 100644
--- a/htdocs/includes/ckeditor/plugins/a11yhelp/lang/he.js
+++ b/htdocs/includes/ckeditor/plugins/a11yhelp/lang/he.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/a11yhelp/lang/it.js b/htdocs/includes/ckeditor/plugins/a11yhelp/lang/it.js
index 07e6f47b19c..2bcc030eaf2 100644
--- a/htdocs/includes/ckeditor/plugins/a11yhelp/lang/it.js
+++ b/htdocs/includes/ckeditor/plugins/a11yhelp/lang/it.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/a11yhelp/lang/mk.js b/htdocs/includes/ckeditor/plugins/a11yhelp/lang/mk.js
index 16296701622..5cdb425d97f 100644
--- a/htdocs/includes/ckeditor/plugins/a11yhelp/lang/mk.js
+++ b/htdocs/includes/ckeditor/plugins/a11yhelp/lang/mk.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/a11yhelp/lang/nb.js b/htdocs/includes/ckeditor/plugins/a11yhelp/lang/nb.js
index 030962af838..b03b345df4e 100644
--- a/htdocs/includes/ckeditor/plugins/a11yhelp/lang/nb.js
+++ b/htdocs/includes/ckeditor/plugins/a11yhelp/lang/nb.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/a11yhelp/lang/nl.js b/htdocs/includes/ckeditor/plugins/a11yhelp/lang/nl.js
index 9dd84015726..b55dfdba0c4 100644
--- a/htdocs/includes/ckeditor/plugins/a11yhelp/lang/nl.js
+++ b/htdocs/includes/ckeditor/plugins/a11yhelp/lang/nl.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/a11yhelp/lang/no.js b/htdocs/includes/ckeditor/plugins/a11yhelp/lang/no.js
index 6208999c96a..11e559a3a9b 100644
--- a/htdocs/includes/ckeditor/plugins/a11yhelp/lang/no.js
+++ b/htdocs/includes/ckeditor/plugins/a11yhelp/lang/no.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/a11yhelp/lang/pt-br.js b/htdocs/includes/ckeditor/plugins/a11yhelp/lang/pt-br.js
index 8e6e28f09e9..2f6d8c923be 100644
--- a/htdocs/includes/ckeditor/plugins/a11yhelp/lang/pt-br.js
+++ b/htdocs/includes/ckeditor/plugins/a11yhelp/lang/pt-br.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/a11yhelp/lang/ro.js b/htdocs/includes/ckeditor/plugins/a11yhelp/lang/ro.js
index c68e1286ce3..d1f06eac72b 100644
--- a/htdocs/includes/ckeditor/plugins/a11yhelp/lang/ro.js
+++ b/htdocs/includes/ckeditor/plugins/a11yhelp/lang/ro.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/a11yhelp/lang/tr.js b/htdocs/includes/ckeditor/plugins/a11yhelp/lang/tr.js
index a7338889bbf..9909daedc5a 100644
--- a/htdocs/includes/ckeditor/plugins/a11yhelp/lang/tr.js
+++ b/htdocs/includes/ckeditor/plugins/a11yhelp/lang/tr.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/a11yhelp/lang/ug.js b/htdocs/includes/ckeditor/plugins/a11yhelp/lang/ug.js
index e37e8d28065..6e4f2ef2c59 100644
--- a/htdocs/includes/ckeditor/plugins/a11yhelp/lang/ug.js
+++ b/htdocs/includes/ckeditor/plugins/a11yhelp/lang/ug.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/a11yhelp/lang/vi.js b/htdocs/includes/ckeditor/plugins/a11yhelp/lang/vi.js
index 94b3381052f..4c1d6adac1b 100644
--- a/htdocs/includes/ckeditor/plugins/a11yhelp/lang/vi.js
+++ b/htdocs/includes/ckeditor/plugins/a11yhelp/lang/vi.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/a11yhelp/lang/zh-cn.js b/htdocs/includes/ckeditor/plugins/a11yhelp/lang/zh-cn.js
index 29cec26a7ea..136a404c80a 100644
--- a/htdocs/includes/ckeditor/plugins/a11yhelp/lang/zh-cn.js
+++ b/htdocs/includes/ckeditor/plugins/a11yhelp/lang/zh-cn.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/about/dialogs/about.js b/htdocs/includes/ckeditor/plugins/about/dialogs/about.js
index 77c133441c1..30426daa5e3 100644
--- a/htdocs/includes/ckeditor/plugins/about/dialogs/about.js
+++ b/htdocs/includes/ckeditor/plugins/about/dialogs/about.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/adobeair/plugin.js b/htdocs/includes/ckeditor/plugins/adobeair/plugin.js
index b312e93a4c4..c8590e0da3b 100644
--- a/htdocs/includes/ckeditor/plugins/adobeair/plugin.js
+++ b/htdocs/includes/ckeditor/plugins/adobeair/plugin.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/ajax/plugin.js b/htdocs/includes/ckeditor/plugins/ajax/plugin.js
index 1c205f011d9..ccfc9428c1e 100644
--- a/htdocs/includes/ckeditor/plugins/ajax/plugin.js
+++ b/htdocs/includes/ckeditor/plugins/ajax/plugin.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/autogrow/plugin.js b/htdocs/includes/ckeditor/plugins/autogrow/plugin.js
index e40289b323d..2fde5b6b479 100644
--- a/htdocs/includes/ckeditor/plugins/autogrow/plugin.js
+++ b/htdocs/includes/ckeditor/plugins/autogrow/plugin.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/bbcode/plugin.js b/htdocs/includes/ckeditor/plugins/bbcode/plugin.js
index 598a4bb4563..b7da0db0835 100755
--- a/htdocs/includes/ckeditor/plugins/bbcode/plugin.js
+++ b/htdocs/includes/ckeditor/plugins/bbcode/plugin.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/clipboard/dialogs/paste.js b/htdocs/includes/ckeditor/plugins/clipboard/dialogs/paste.js
index ed1a423bf16..c470491d6a4 100644
--- a/htdocs/includes/ckeditor/plugins/clipboard/dialogs/paste.js
+++ b/htdocs/includes/ckeditor/plugins/clipboard/dialogs/paste.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/colordialog/dialogs/colordialog.js b/htdocs/includes/ckeditor/plugins/colordialog/dialogs/colordialog.js
index e9082698186..1df62f53561 100644
--- a/htdocs/includes/ckeditor/plugins/colordialog/dialogs/colordialog.js
+++ b/htdocs/includes/ckeditor/plugins/colordialog/dialogs/colordialog.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/devtools/lang/bg.js b/htdocs/includes/ckeditor/plugins/devtools/lang/bg.js
index c8713d0b8fe..caa9a3bca2e 100644
--- a/htdocs/includes/ckeditor/plugins/devtools/lang/bg.js
+++ b/htdocs/includes/ckeditor/plugins/devtools/lang/bg.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/devtools/lang/cs.js b/htdocs/includes/ckeditor/plugins/devtools/lang/cs.js
index 10c96999497..65a5f9b1ee8 100644
--- a/htdocs/includes/ckeditor/plugins/devtools/lang/cs.js
+++ b/htdocs/includes/ckeditor/plugins/devtools/lang/cs.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/devtools/lang/cy.js b/htdocs/includes/ckeditor/plugins/devtools/lang/cy.js
index 3514ec648ba..63b81d29fd8 100644
--- a/htdocs/includes/ckeditor/plugins/devtools/lang/cy.js
+++ b/htdocs/includes/ckeditor/plugins/devtools/lang/cy.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/devtools/lang/da.js b/htdocs/includes/ckeditor/plugins/devtools/lang/da.js
index d882612e7ee..101dd2778d2 100644
--- a/htdocs/includes/ckeditor/plugins/devtools/lang/da.js
+++ b/htdocs/includes/ckeditor/plugins/devtools/lang/da.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/devtools/lang/de.js b/htdocs/includes/ckeditor/plugins/devtools/lang/de.js
index 953bf97a7d0..67ffd383b05 100644
--- a/htdocs/includes/ckeditor/plugins/devtools/lang/de.js
+++ b/htdocs/includes/ckeditor/plugins/devtools/lang/de.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/devtools/lang/el.js b/htdocs/includes/ckeditor/plugins/devtools/lang/el.js
index 32168b7130a..5842d7d7c0b 100644
--- a/htdocs/includes/ckeditor/plugins/devtools/lang/el.js
+++ b/htdocs/includes/ckeditor/plugins/devtools/lang/el.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/devtools/lang/en.js b/htdocs/includes/ckeditor/plugins/devtools/lang/en.js
index 467126d1d97..8ed61ab03dc 100755
--- a/htdocs/includes/ckeditor/plugins/devtools/lang/en.js
+++ b/htdocs/includes/ckeditor/plugins/devtools/lang/en.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/devtools/lang/eo.js b/htdocs/includes/ckeditor/plugins/devtools/lang/eo.js
index 70ae814eba9..2ca9295835e 100644
--- a/htdocs/includes/ckeditor/plugins/devtools/lang/eo.js
+++ b/htdocs/includes/ckeditor/plugins/devtools/lang/eo.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/devtools/lang/et.js b/htdocs/includes/ckeditor/plugins/devtools/lang/et.js
index 3d731642f26..44a6fc89433 100644
--- a/htdocs/includes/ckeditor/plugins/devtools/lang/et.js
+++ b/htdocs/includes/ckeditor/plugins/devtools/lang/et.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/devtools/lang/fa.js b/htdocs/includes/ckeditor/plugins/devtools/lang/fa.js
index e6133b219bf..ff471fd7e73 100644
--- a/htdocs/includes/ckeditor/plugins/devtools/lang/fa.js
+++ b/htdocs/includes/ckeditor/plugins/devtools/lang/fa.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/devtools/lang/fi.js b/htdocs/includes/ckeditor/plugins/devtools/lang/fi.js
index 37884d3adb6..7cc99eb479e 100644
--- a/htdocs/includes/ckeditor/plugins/devtools/lang/fi.js
+++ b/htdocs/includes/ckeditor/plugins/devtools/lang/fi.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/devtools/lang/fr.js b/htdocs/includes/ckeditor/plugins/devtools/lang/fr.js
index c44813fde3e..22570d9e2b6 100644
--- a/htdocs/includes/ckeditor/plugins/devtools/lang/fr.js
+++ b/htdocs/includes/ckeditor/plugins/devtools/lang/fr.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/devtools/lang/gu.js b/htdocs/includes/ckeditor/plugins/devtools/lang/gu.js
index 553e7a0fdae..370615104d2 100644
--- a/htdocs/includes/ckeditor/plugins/devtools/lang/gu.js
+++ b/htdocs/includes/ckeditor/plugins/devtools/lang/gu.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/devtools/lang/he.js b/htdocs/includes/ckeditor/plugins/devtools/lang/he.js
index 52a36b9b5ec..f6b6826765e 100644
--- a/htdocs/includes/ckeditor/plugins/devtools/lang/he.js
+++ b/htdocs/includes/ckeditor/plugins/devtools/lang/he.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/devtools/lang/hr.js b/htdocs/includes/ckeditor/plugins/devtools/lang/hr.js
index 31126253c0c..246f16807f7 100644
--- a/htdocs/includes/ckeditor/plugins/devtools/lang/hr.js
+++ b/htdocs/includes/ckeditor/plugins/devtools/lang/hr.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/devtools/lang/it.js b/htdocs/includes/ckeditor/plugins/devtools/lang/it.js
index 8410af08ef7..d82598e5d6d 100644
--- a/htdocs/includes/ckeditor/plugins/devtools/lang/it.js
+++ b/htdocs/includes/ckeditor/plugins/devtools/lang/it.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/devtools/lang/nb.js b/htdocs/includes/ckeditor/plugins/devtools/lang/nb.js
index fd561a70e66..bbba0a1e56c 100644
--- a/htdocs/includes/ckeditor/plugins/devtools/lang/nb.js
+++ b/htdocs/includes/ckeditor/plugins/devtools/lang/nb.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/devtools/lang/nl.js b/htdocs/includes/ckeditor/plugins/devtools/lang/nl.js
index affe32a5bcc..3a5b708fb40 100644
--- a/htdocs/includes/ckeditor/plugins/devtools/lang/nl.js
+++ b/htdocs/includes/ckeditor/plugins/devtools/lang/nl.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/devtools/lang/no.js b/htdocs/includes/ckeditor/plugins/devtools/lang/no.js
index e93f861e406..99d8f458d46 100644
--- a/htdocs/includes/ckeditor/plugins/devtools/lang/no.js
+++ b/htdocs/includes/ckeditor/plugins/devtools/lang/no.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/devtools/lang/pl.js b/htdocs/includes/ckeditor/plugins/devtools/lang/pl.js
index 886a9412182..27958695faf 100644
--- a/htdocs/includes/ckeditor/plugins/devtools/lang/pl.js
+++ b/htdocs/includes/ckeditor/plugins/devtools/lang/pl.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/devtools/lang/pt-br.js b/htdocs/includes/ckeditor/plugins/devtools/lang/pt-br.js
index 32e1e2e117a..b2706e28110 100644
--- a/htdocs/includes/ckeditor/plugins/devtools/lang/pt-br.js
+++ b/htdocs/includes/ckeditor/plugins/devtools/lang/pt-br.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/devtools/lang/tr.js b/htdocs/includes/ckeditor/plugins/devtools/lang/tr.js
index 7982d17dd33..df260a208b5 100644
--- a/htdocs/includes/ckeditor/plugins/devtools/lang/tr.js
+++ b/htdocs/includes/ckeditor/plugins/devtools/lang/tr.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/devtools/lang/ug.js b/htdocs/includes/ckeditor/plugins/devtools/lang/ug.js
index 6cfb9913521..a841ae90eb1 100644
--- a/htdocs/includes/ckeditor/plugins/devtools/lang/ug.js
+++ b/htdocs/includes/ckeditor/plugins/devtools/lang/ug.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/devtools/lang/uk.js b/htdocs/includes/ckeditor/plugins/devtools/lang/uk.js
index 4d80d6d3824..a4e93936e0f 100644
--- a/htdocs/includes/ckeditor/plugins/devtools/lang/uk.js
+++ b/htdocs/includes/ckeditor/plugins/devtools/lang/uk.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/devtools/lang/vi.js b/htdocs/includes/ckeditor/plugins/devtools/lang/vi.js
index 4be84373f46..ae921df4f88 100644
--- a/htdocs/includes/ckeditor/plugins/devtools/lang/vi.js
+++ b/htdocs/includes/ckeditor/plugins/devtools/lang/vi.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/devtools/lang/zh-cn.js b/htdocs/includes/ckeditor/plugins/devtools/lang/zh-cn.js
index 3f599beffe2..22fd004454d 100644
--- a/htdocs/includes/ckeditor/plugins/devtools/lang/zh-cn.js
+++ b/htdocs/includes/ckeditor/plugins/devtools/lang/zh-cn.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/devtools/plugin.js b/htdocs/includes/ckeditor/plugins/devtools/plugin.js
index efc4e227938..41fa5bebfcc 100755
--- a/htdocs/includes/ckeditor/plugins/devtools/plugin.js
+++ b/htdocs/includes/ckeditor/plugins/devtools/plugin.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/dialog/dialogDefinition.js b/htdocs/includes/ckeditor/plugins/dialog/dialogDefinition.js
index a2c9d6dd0f4..ff644ae1685 100644
--- a/htdocs/includes/ckeditor/plugins/dialog/dialogDefinition.js
+++ b/htdocs/includes/ckeditor/plugins/dialog/dialogDefinition.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/div/dialogs/div.js b/htdocs/includes/ckeditor/plugins/div/dialogs/div.js
index e9cae67b796..c7db38912e6 100644
--- a/htdocs/includes/ckeditor/plugins/div/dialogs/div.js
+++ b/htdocs/includes/ckeditor/plugins/div/dialogs/div.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/docprops/dialogs/docprops.js b/htdocs/includes/ckeditor/plugins/docprops/dialogs/docprops.js
index 80029ec9f46..3f5eff37465 100755
--- a/htdocs/includes/ckeditor/plugins/docprops/dialogs/docprops.js
+++ b/htdocs/includes/ckeditor/plugins/docprops/dialogs/docprops.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/docprops/plugin.js b/htdocs/includes/ckeditor/plugins/docprops/plugin.js
index 807d2e9ea2a..58b2bb3c95f 100755
--- a/htdocs/includes/ckeditor/plugins/docprops/plugin.js
+++ b/htdocs/includes/ckeditor/plugins/docprops/plugin.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/find/dialogs/find.js b/htdocs/includes/ckeditor/plugins/find/dialogs/find.js
index f95a13ad629..f3eb0ceb3db 100644
--- a/htdocs/includes/ckeditor/plugins/find/dialogs/find.js
+++ b/htdocs/includes/ckeditor/plugins/find/dialogs/find.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/flash/dialogs/flash.js b/htdocs/includes/ckeditor/plugins/flash/dialogs/flash.js
index 604c346b62a..e280b9def45 100644
--- a/htdocs/includes/ckeditor/plugins/flash/dialogs/flash.js
+++ b/htdocs/includes/ckeditor/plugins/flash/dialogs/flash.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/forms/dialogs/button.js b/htdocs/includes/ckeditor/plugins/forms/dialogs/button.js
index 6030fd44302..b9762f3e4e4 100644
--- a/htdocs/includes/ckeditor/plugins/forms/dialogs/button.js
+++ b/htdocs/includes/ckeditor/plugins/forms/dialogs/button.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/forms/dialogs/checkbox.js b/htdocs/includes/ckeditor/plugins/forms/dialogs/checkbox.js
index 45c8760d332..e3fd551e73b 100644
--- a/htdocs/includes/ckeditor/plugins/forms/dialogs/checkbox.js
+++ b/htdocs/includes/ckeditor/plugins/forms/dialogs/checkbox.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/forms/dialogs/form.js b/htdocs/includes/ckeditor/plugins/forms/dialogs/form.js
index 8b4e90fdc5f..ca21e83033f 100644
--- a/htdocs/includes/ckeditor/plugins/forms/dialogs/form.js
+++ b/htdocs/includes/ckeditor/plugins/forms/dialogs/form.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/forms/dialogs/hiddenfield.js b/htdocs/includes/ckeditor/plugins/forms/dialogs/hiddenfield.js
index 0bce0cfdf96..4fa703cf822 100644
--- a/htdocs/includes/ckeditor/plugins/forms/dialogs/hiddenfield.js
+++ b/htdocs/includes/ckeditor/plugins/forms/dialogs/hiddenfield.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/forms/dialogs/radio.js b/htdocs/includes/ckeditor/plugins/forms/dialogs/radio.js
index 4a05d9b0746..6d9aa86e8d9 100644
--- a/htdocs/includes/ckeditor/plugins/forms/dialogs/radio.js
+++ b/htdocs/includes/ckeditor/plugins/forms/dialogs/radio.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/forms/dialogs/select.js b/htdocs/includes/ckeditor/plugins/forms/dialogs/select.js
index 37ec6d488b3..b9ed844b795 100644
--- a/htdocs/includes/ckeditor/plugins/forms/dialogs/select.js
+++ b/htdocs/includes/ckeditor/plugins/forms/dialogs/select.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/forms/dialogs/textarea.js b/htdocs/includes/ckeditor/plugins/forms/dialogs/textarea.js
index 0ea4e726d5a..0d10d4ea0dd 100644
--- a/htdocs/includes/ckeditor/plugins/forms/dialogs/textarea.js
+++ b/htdocs/includes/ckeditor/plugins/forms/dialogs/textarea.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/forms/dialogs/textfield.js b/htdocs/includes/ckeditor/plugins/forms/dialogs/textfield.js
index 23ee8669d4b..6938951ff3f 100644
--- a/htdocs/includes/ckeditor/plugins/forms/dialogs/textfield.js
+++ b/htdocs/includes/ckeditor/plugins/forms/dialogs/textfield.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/iframe/dialogs/iframe.js b/htdocs/includes/ckeditor/plugins/iframe/dialogs/iframe.js
index 06ac17a73ca..88556e8bc33 100644
--- a/htdocs/includes/ckeditor/plugins/iframe/dialogs/iframe.js
+++ b/htdocs/includes/ckeditor/plugins/iframe/dialogs/iframe.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/iframedialog/plugin.js b/htdocs/includes/ckeditor/plugins/iframedialog/plugin.js
index 52edc083580..593ddd90658 100644
--- a/htdocs/includes/ckeditor/plugins/iframedialog/plugin.js
+++ b/htdocs/includes/ckeditor/plugins/iframedialog/plugin.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/image/dialogs/image.js b/htdocs/includes/ckeditor/plugins/image/dialogs/image.js
index 0410b9505ce..fc308ce8a84 100644
--- a/htdocs/includes/ckeditor/plugins/image/dialogs/image.js
+++ b/htdocs/includes/ckeditor/plugins/image/dialogs/image.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/link/dialogs/anchor.js b/htdocs/includes/ckeditor/plugins/link/dialogs/anchor.js
index 716dc7f3dbc..66dd518b1eb 100644
--- a/htdocs/includes/ckeditor/plugins/link/dialogs/anchor.js
+++ b/htdocs/includes/ckeditor/plugins/link/dialogs/anchor.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/link/dialogs/link.js b/htdocs/includes/ckeditor/plugins/link/dialogs/link.js
index c0d32c8a3a1..a4acbd2345e 100644
--- a/htdocs/includes/ckeditor/plugins/link/dialogs/link.js
+++ b/htdocs/includes/ckeditor/plugins/link/dialogs/link.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/liststyle/dialogs/liststyle.js b/htdocs/includes/ckeditor/plugins/liststyle/dialogs/liststyle.js
index 5bf1c7fc711..d0b3d731021 100644
--- a/htdocs/includes/ckeditor/plugins/liststyle/dialogs/liststyle.js
+++ b/htdocs/includes/ckeditor/plugins/liststyle/dialogs/liststyle.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/pastefromword/filter/default.js b/htdocs/includes/ckeditor/plugins/pastefromword/filter/default.js
index e4240345ef9..970ee0092e4 100644
--- a/htdocs/includes/ckeditor/plugins/pastefromword/filter/default.js
+++ b/htdocs/includes/ckeditor/plugins/pastefromword/filter/default.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/pastetext/dialogs/pastetext.js b/htdocs/includes/ckeditor/plugins/pastetext/dialogs/pastetext.js
index 6d87d473064..f9f70289296 100644
--- a/htdocs/includes/ckeditor/plugins/pastetext/dialogs/pastetext.js
+++ b/htdocs/includes/ckeditor/plugins/pastetext/dialogs/pastetext.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/placeholder/dialogs/placeholder.js b/htdocs/includes/ckeditor/plugins/placeholder/dialogs/placeholder.js
index 650aaa444a1..75712bc600c 100644
--- a/htdocs/includes/ckeditor/plugins/placeholder/dialogs/placeholder.js
+++ b/htdocs/includes/ckeditor/plugins/placeholder/dialogs/placeholder.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/placeholder/lang/bg.js b/htdocs/includes/ckeditor/plugins/placeholder/lang/bg.js
index 2101055c10a..c80fe5c9758 100644
--- a/htdocs/includes/ckeditor/plugins/placeholder/lang/bg.js
+++ b/htdocs/includes/ckeditor/plugins/placeholder/lang/bg.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/placeholder/lang/cs.js b/htdocs/includes/ckeditor/plugins/placeholder/lang/cs.js
index ec9d50aab84..53dd515bf38 100644
--- a/htdocs/includes/ckeditor/plugins/placeholder/lang/cs.js
+++ b/htdocs/includes/ckeditor/plugins/placeholder/lang/cs.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/placeholder/lang/cy.js b/htdocs/includes/ckeditor/plugins/placeholder/lang/cy.js
index 67ea9814177..632b13ce702 100644
--- a/htdocs/includes/ckeditor/plugins/placeholder/lang/cy.js
+++ b/htdocs/includes/ckeditor/plugins/placeholder/lang/cy.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/placeholder/lang/da.js b/htdocs/includes/ckeditor/plugins/placeholder/lang/da.js
index 41b97297d5f..9bea608f980 100644
--- a/htdocs/includes/ckeditor/plugins/placeholder/lang/da.js
+++ b/htdocs/includes/ckeditor/plugins/placeholder/lang/da.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/placeholder/lang/de.js b/htdocs/includes/ckeditor/plugins/placeholder/lang/de.js
index c95c3035f6c..57ddeb49bee 100644
--- a/htdocs/includes/ckeditor/plugins/placeholder/lang/de.js
+++ b/htdocs/includes/ckeditor/plugins/placeholder/lang/de.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/placeholder/lang/el.js b/htdocs/includes/ckeditor/plugins/placeholder/lang/el.js
index 74a40bac950..357bc564399 100644
--- a/htdocs/includes/ckeditor/plugins/placeholder/lang/el.js
+++ b/htdocs/includes/ckeditor/plugins/placeholder/lang/el.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/placeholder/lang/en.js b/htdocs/includes/ckeditor/plugins/placeholder/lang/en.js
index 83e64f996c9..b2971943dbe 100644
--- a/htdocs/includes/ckeditor/plugins/placeholder/lang/en.js
+++ b/htdocs/includes/ckeditor/plugins/placeholder/lang/en.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/placeholder/lang/eo.js b/htdocs/includes/ckeditor/plugins/placeholder/lang/eo.js
index 228fbe8ebeb..435199d7e2d 100644
--- a/htdocs/includes/ckeditor/plugins/placeholder/lang/eo.js
+++ b/htdocs/includes/ckeditor/plugins/placeholder/lang/eo.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/placeholder/lang/et.js b/htdocs/includes/ckeditor/plugins/placeholder/lang/et.js
index b527e1db5f8..f406449e926 100644
--- a/htdocs/includes/ckeditor/plugins/placeholder/lang/et.js
+++ b/htdocs/includes/ckeditor/plugins/placeholder/lang/et.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/placeholder/lang/fa.js b/htdocs/includes/ckeditor/plugins/placeholder/lang/fa.js
index e4ca06262b8..b31f95f92cd 100644
--- a/htdocs/includes/ckeditor/plugins/placeholder/lang/fa.js
+++ b/htdocs/includes/ckeditor/plugins/placeholder/lang/fa.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/placeholder/lang/fi.js b/htdocs/includes/ckeditor/plugins/placeholder/lang/fi.js
index 90eafeae48b..ec59b14372c 100644
--- a/htdocs/includes/ckeditor/plugins/placeholder/lang/fi.js
+++ b/htdocs/includes/ckeditor/plugins/placeholder/lang/fi.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/placeholder/lang/fr.js b/htdocs/includes/ckeditor/plugins/placeholder/lang/fr.js
index a1774608176..1fd6d58c4ff 100644
--- a/htdocs/includes/ckeditor/plugins/placeholder/lang/fr.js
+++ b/htdocs/includes/ckeditor/plugins/placeholder/lang/fr.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/placeholder/lang/he.js b/htdocs/includes/ckeditor/plugins/placeholder/lang/he.js
index fadfcbd6fc4..c9054962100 100644
--- a/htdocs/includes/ckeditor/plugins/placeholder/lang/he.js
+++ b/htdocs/includes/ckeditor/plugins/placeholder/lang/he.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/placeholder/lang/hr.js b/htdocs/includes/ckeditor/plugins/placeholder/lang/hr.js
index 8c195ce741c..e110d3cb7df 100644
--- a/htdocs/includes/ckeditor/plugins/placeholder/lang/hr.js
+++ b/htdocs/includes/ckeditor/plugins/placeholder/lang/hr.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/placeholder/lang/it.js b/htdocs/includes/ckeditor/plugins/placeholder/lang/it.js
index 86346ebc9bb..2acd31ced02 100644
--- a/htdocs/includes/ckeditor/plugins/placeholder/lang/it.js
+++ b/htdocs/includes/ckeditor/plugins/placeholder/lang/it.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/placeholder/lang/nb.js b/htdocs/includes/ckeditor/plugins/placeholder/lang/nb.js
index 27f84107947..32d6fc9d21e 100644
--- a/htdocs/includes/ckeditor/plugins/placeholder/lang/nb.js
+++ b/htdocs/includes/ckeditor/plugins/placeholder/lang/nb.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/placeholder/lang/nl.js b/htdocs/includes/ckeditor/plugins/placeholder/lang/nl.js
index 89b9a3e474c..1cc5475eec3 100644
--- a/htdocs/includes/ckeditor/plugins/placeholder/lang/nl.js
+++ b/htdocs/includes/ckeditor/plugins/placeholder/lang/nl.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/placeholder/lang/no.js b/htdocs/includes/ckeditor/plugins/placeholder/lang/no.js
index 5aa1c5c4eac..725b38cc4ef 100644
--- a/htdocs/includes/ckeditor/plugins/placeholder/lang/no.js
+++ b/htdocs/includes/ckeditor/plugins/placeholder/lang/no.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/placeholder/lang/pl.js b/htdocs/includes/ckeditor/plugins/placeholder/lang/pl.js
index f859f095196..c41cc10dc30 100644
--- a/htdocs/includes/ckeditor/plugins/placeholder/lang/pl.js
+++ b/htdocs/includes/ckeditor/plugins/placeholder/lang/pl.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/placeholder/lang/pt-br.js b/htdocs/includes/ckeditor/plugins/placeholder/lang/pt-br.js
index c395d95c919..3afb3ab7b95 100644
--- a/htdocs/includes/ckeditor/plugins/placeholder/lang/pt-br.js
+++ b/htdocs/includes/ckeditor/plugins/placeholder/lang/pt-br.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/placeholder/lang/tr.js b/htdocs/includes/ckeditor/plugins/placeholder/lang/tr.js
index 328092c77ee..d8d881573b8 100644
--- a/htdocs/includes/ckeditor/plugins/placeholder/lang/tr.js
+++ b/htdocs/includes/ckeditor/plugins/placeholder/lang/tr.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/placeholder/lang/ug.js b/htdocs/includes/ckeditor/plugins/placeholder/lang/ug.js
index 25a30494e9d..15a7bff7656 100644
--- a/htdocs/includes/ckeditor/plugins/placeholder/lang/ug.js
+++ b/htdocs/includes/ckeditor/plugins/placeholder/lang/ug.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/placeholder/lang/uk.js b/htdocs/includes/ckeditor/plugins/placeholder/lang/uk.js
index aefe4ab5118..590c27825a5 100644
--- a/htdocs/includes/ckeditor/plugins/placeholder/lang/uk.js
+++ b/htdocs/includes/ckeditor/plugins/placeholder/lang/uk.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/placeholder/lang/vi.js b/htdocs/includes/ckeditor/plugins/placeholder/lang/vi.js
index efcd578ffbd..09ec5d4d238 100644
--- a/htdocs/includes/ckeditor/plugins/placeholder/lang/vi.js
+++ b/htdocs/includes/ckeditor/plugins/placeholder/lang/vi.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/placeholder/lang/zh-cn.js b/htdocs/includes/ckeditor/plugins/placeholder/lang/zh-cn.js
index a6dcfca5760..69f524025a3 100644
--- a/htdocs/includes/ckeditor/plugins/placeholder/lang/zh-cn.js
+++ b/htdocs/includes/ckeditor/plugins/placeholder/lang/zh-cn.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/placeholder/plugin.js b/htdocs/includes/ckeditor/plugins/placeholder/plugin.js
index 30879931a86..58c884332ef 100644
--- a/htdocs/includes/ckeditor/plugins/placeholder/plugin.js
+++ b/htdocs/includes/ckeditor/plugins/placeholder/plugin.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/scayt/dialogs/options.js b/htdocs/includes/ckeditor/plugins/scayt/dialogs/options.js
index d428963b76a..c9c1f0b9cac 100644
--- a/htdocs/includes/ckeditor/plugins/scayt/dialogs/options.js
+++ b/htdocs/includes/ckeditor/plugins/scayt/dialogs/options.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/smiley/dialogs/smiley.js b/htdocs/includes/ckeditor/plugins/smiley/dialogs/smiley.js
index a1a19689686..1ed9a07e8b2 100644
--- a/htdocs/includes/ckeditor/plugins/smiley/dialogs/smiley.js
+++ b/htdocs/includes/ckeditor/plugins/smiley/dialogs/smiley.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/specialchar/dialogs/specialchar.js b/htdocs/includes/ckeditor/plugins/specialchar/dialogs/specialchar.js
index ac19d18554a..f61730eed02 100644
--- a/htdocs/includes/ckeditor/plugins/specialchar/dialogs/specialchar.js
+++ b/htdocs/includes/ckeditor/plugins/specialchar/dialogs/specialchar.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/specialchar/lang/cs.js b/htdocs/includes/ckeditor/plugins/specialchar/lang/cs.js
index 9617ea486f5..a1d0acb86c3 100644
--- a/htdocs/includes/ckeditor/plugins/specialchar/lang/cs.js
+++ b/htdocs/includes/ckeditor/plugins/specialchar/lang/cs.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/specialchar/lang/cy.js b/htdocs/includes/ckeditor/plugins/specialchar/lang/cy.js
index 8dbafae83a4..ad68e49287f 100644
--- a/htdocs/includes/ckeditor/plugins/specialchar/lang/cy.js
+++ b/htdocs/includes/ckeditor/plugins/specialchar/lang/cy.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/specialchar/lang/de.js b/htdocs/includes/ckeditor/plugins/specialchar/lang/de.js
index ee03cb89f3f..99d308a1d8a 100644
--- a/htdocs/includes/ckeditor/plugins/specialchar/lang/de.js
+++ b/htdocs/includes/ckeditor/plugins/specialchar/lang/de.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/specialchar/lang/el.js b/htdocs/includes/ckeditor/plugins/specialchar/lang/el.js
index 4e9df1e793b..55ac1977fd4 100644
--- a/htdocs/includes/ckeditor/plugins/specialchar/lang/el.js
+++ b/htdocs/includes/ckeditor/plugins/specialchar/lang/el.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/specialchar/lang/en.js b/htdocs/includes/ckeditor/plugins/specialchar/lang/en.js
index 575001fb626..78ad897a758 100644
--- a/htdocs/includes/ckeditor/plugins/specialchar/lang/en.js
+++ b/htdocs/includes/ckeditor/plugins/specialchar/lang/en.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/specialchar/lang/eo.js b/htdocs/includes/ckeditor/plugins/specialchar/lang/eo.js
index e9cdb39e244..c448cd0f49c 100644
--- a/htdocs/includes/ckeditor/plugins/specialchar/lang/eo.js
+++ b/htdocs/includes/ckeditor/plugins/specialchar/lang/eo.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/specialchar/lang/et.js b/htdocs/includes/ckeditor/plugins/specialchar/lang/et.js
index b0f71c4e507..10b62318994 100644
--- a/htdocs/includes/ckeditor/plugins/specialchar/lang/et.js
+++ b/htdocs/includes/ckeditor/plugins/specialchar/lang/et.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/specialchar/lang/fa.js b/htdocs/includes/ckeditor/plugins/specialchar/lang/fa.js
index 25c8792faaa..a918e473f70 100644
--- a/htdocs/includes/ckeditor/plugins/specialchar/lang/fa.js
+++ b/htdocs/includes/ckeditor/plugins/specialchar/lang/fa.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/specialchar/lang/fi.js b/htdocs/includes/ckeditor/plugins/specialchar/lang/fi.js
index f710025649a..d8d6f8eba03 100644
--- a/htdocs/includes/ckeditor/plugins/specialchar/lang/fi.js
+++ b/htdocs/includes/ckeditor/plugins/specialchar/lang/fi.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/specialchar/lang/fr.js b/htdocs/includes/ckeditor/plugins/specialchar/lang/fr.js
index b1281132f96..4d69cd5dbef 100644
--- a/htdocs/includes/ckeditor/plugins/specialchar/lang/fr.js
+++ b/htdocs/includes/ckeditor/plugins/specialchar/lang/fr.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/specialchar/lang/he.js b/htdocs/includes/ckeditor/plugins/specialchar/lang/he.js
index a2899fecdb9..ffb9fc0743b 100644
--- a/htdocs/includes/ckeditor/plugins/specialchar/lang/he.js
+++ b/htdocs/includes/ckeditor/plugins/specialchar/lang/he.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/specialchar/lang/hr.js b/htdocs/includes/ckeditor/plugins/specialchar/lang/hr.js
index bd5629f2c95..75ac5b50b6f 100644
--- a/htdocs/includes/ckeditor/plugins/specialchar/lang/hr.js
+++ b/htdocs/includes/ckeditor/plugins/specialchar/lang/hr.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/specialchar/lang/it.js b/htdocs/includes/ckeditor/plugins/specialchar/lang/it.js
index 735a91f9592..1918e4cd5f3 100644
--- a/htdocs/includes/ckeditor/plugins/specialchar/lang/it.js
+++ b/htdocs/includes/ckeditor/plugins/specialchar/lang/it.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/specialchar/lang/nb.js b/htdocs/includes/ckeditor/plugins/specialchar/lang/nb.js
index 86910bff2fe..28a9290ec3a 100644
--- a/htdocs/includes/ckeditor/plugins/specialchar/lang/nb.js
+++ b/htdocs/includes/ckeditor/plugins/specialchar/lang/nb.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/specialchar/lang/nl.js b/htdocs/includes/ckeditor/plugins/specialchar/lang/nl.js
index 56876fb3a69..1f9b0470463 100644
--- a/htdocs/includes/ckeditor/plugins/specialchar/lang/nl.js
+++ b/htdocs/includes/ckeditor/plugins/specialchar/lang/nl.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/specialchar/lang/no.js b/htdocs/includes/ckeditor/plugins/specialchar/lang/no.js
index 2ced8875b22..4a54b161414 100644
--- a/htdocs/includes/ckeditor/plugins/specialchar/lang/no.js
+++ b/htdocs/includes/ckeditor/plugins/specialchar/lang/no.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/specialchar/lang/pt-br.js b/htdocs/includes/ckeditor/plugins/specialchar/lang/pt-br.js
index 119f3971d11..b7560a9e4dd 100644
--- a/htdocs/includes/ckeditor/plugins/specialchar/lang/pt-br.js
+++ b/htdocs/includes/ckeditor/plugins/specialchar/lang/pt-br.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/specialchar/lang/tr.js b/htdocs/includes/ckeditor/plugins/specialchar/lang/tr.js
index 83842413760..1c0822373a1 100644
--- a/htdocs/includes/ckeditor/plugins/specialchar/lang/tr.js
+++ b/htdocs/includes/ckeditor/plugins/specialchar/lang/tr.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/specialchar/lang/ug.js b/htdocs/includes/ckeditor/plugins/specialchar/lang/ug.js
index f42a167c372..c4fe1027e41 100644
--- a/htdocs/includes/ckeditor/plugins/specialchar/lang/ug.js
+++ b/htdocs/includes/ckeditor/plugins/specialchar/lang/ug.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/specialchar/lang/zh-cn.js b/htdocs/includes/ckeditor/plugins/specialchar/lang/zh-cn.js
index 3848cbfc99e..ad7ceab105e 100644
--- a/htdocs/includes/ckeditor/plugins/specialchar/lang/zh-cn.js
+++ b/htdocs/includes/ckeditor/plugins/specialchar/lang/zh-cn.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/styles/styles/default.js b/htdocs/includes/ckeditor/plugins/styles/styles/default.js
index 6aa58f30815..8bcfa355cfa 100644
--- a/htdocs/includes/ckeditor/plugins/styles/styles/default.js
+++ b/htdocs/includes/ckeditor/plugins/styles/styles/default.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/stylesheetparser/plugin.js b/htdocs/includes/ckeditor/plugins/stylesheetparser/plugin.js
index e773bf6ea7e..92723cfb5f6 100755
--- a/htdocs/includes/ckeditor/plugins/stylesheetparser/plugin.js
+++ b/htdocs/includes/ckeditor/plugins/stylesheetparser/plugin.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/table/dialogs/table.js b/htdocs/includes/ckeditor/plugins/table/dialogs/table.js
index 6c48c20388c..e2169b5d424 100644
--- a/htdocs/includes/ckeditor/plugins/table/dialogs/table.js
+++ b/htdocs/includes/ckeditor/plugins/table/dialogs/table.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/tableresize/plugin.js b/htdocs/includes/ckeditor/plugins/tableresize/plugin.js
index a787b46937c..1a3cceff9ad 100644
--- a/htdocs/includes/ckeditor/plugins/tableresize/plugin.js
+++ b/htdocs/includes/ckeditor/plugins/tableresize/plugin.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/tabletools/dialogs/tableCell.js b/htdocs/includes/ckeditor/plugins/tabletools/dialogs/tableCell.js
index 7ea200450aa..1a4d63fdd09 100644
--- a/htdocs/includes/ckeditor/plugins/tabletools/dialogs/tableCell.js
+++ b/htdocs/includes/ckeditor/plugins/tabletools/dialogs/tableCell.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/templates/dialogs/templates.js b/htdocs/includes/ckeditor/plugins/templates/dialogs/templates.js
index 6e761e045f2..c5b1cd0372c 100644
--- a/htdocs/includes/ckeditor/plugins/templates/dialogs/templates.js
+++ b/htdocs/includes/ckeditor/plugins/templates/dialogs/templates.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/templates/templates/default.js b/htdocs/includes/ckeditor/plugins/templates/templates/default.js
index f1bb5315ada..580861c85a5 100644
--- a/htdocs/includes/ckeditor/plugins/templates/templates/default.js
+++ b/htdocs/includes/ckeditor/plugins/templates/templates/default.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/uicolor/dialogs/uicolor.js b/htdocs/includes/ckeditor/plugins/uicolor/dialogs/uicolor.js
index aad14fb8519..bbe081858f8 100644
--- a/htdocs/includes/ckeditor/plugins/uicolor/dialogs/uicolor.js
+++ b/htdocs/includes/ckeditor/plugins/uicolor/dialogs/uicolor.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/uicolor/lang/bg.js b/htdocs/includes/ckeditor/plugins/uicolor/lang/bg.js
index 104d66403b4..9776a475610 100644
--- a/htdocs/includes/ckeditor/plugins/uicolor/lang/bg.js
+++ b/htdocs/includes/ckeditor/plugins/uicolor/lang/bg.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/uicolor/lang/cs.js b/htdocs/includes/ckeditor/plugins/uicolor/lang/cs.js
index 6e680753a99..75abc563561 100644
--- a/htdocs/includes/ckeditor/plugins/uicolor/lang/cs.js
+++ b/htdocs/includes/ckeditor/plugins/uicolor/lang/cs.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/uicolor/lang/cy.js b/htdocs/includes/ckeditor/plugins/uicolor/lang/cy.js
index c7ede5af088..bc51c3eb284 100644
--- a/htdocs/includes/ckeditor/plugins/uicolor/lang/cy.js
+++ b/htdocs/includes/ckeditor/plugins/uicolor/lang/cy.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/uicolor/lang/da.js b/htdocs/includes/ckeditor/plugins/uicolor/lang/da.js
index eb3832cfeb4..a24f64bc6f5 100644
--- a/htdocs/includes/ckeditor/plugins/uicolor/lang/da.js
+++ b/htdocs/includes/ckeditor/plugins/uicolor/lang/da.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/uicolor/lang/de.js b/htdocs/includes/ckeditor/plugins/uicolor/lang/de.js
index 0cd76975def..1bd161ff3e3 100644
--- a/htdocs/includes/ckeditor/plugins/uicolor/lang/de.js
+++ b/htdocs/includes/ckeditor/plugins/uicolor/lang/de.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/uicolor/lang/el.js b/htdocs/includes/ckeditor/plugins/uicolor/lang/el.js
index b3ed514faa3..3ba69f86014 100644
--- a/htdocs/includes/ckeditor/plugins/uicolor/lang/el.js
+++ b/htdocs/includes/ckeditor/plugins/uicolor/lang/el.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/uicolor/lang/en.js b/htdocs/includes/ckeditor/plugins/uicolor/lang/en.js
index 604123a30b3..83135b65c36 100644
--- a/htdocs/includes/ckeditor/plugins/uicolor/lang/en.js
+++ b/htdocs/includes/ckeditor/plugins/uicolor/lang/en.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/uicolor/lang/eo.js b/htdocs/includes/ckeditor/plugins/uicolor/lang/eo.js
index 4651525bbd6..378c8fd5a21 100644
--- a/htdocs/includes/ckeditor/plugins/uicolor/lang/eo.js
+++ b/htdocs/includes/ckeditor/plugins/uicolor/lang/eo.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/uicolor/lang/et.js b/htdocs/includes/ckeditor/plugins/uicolor/lang/et.js
index dcbf18f91bd..22413821aef 100644
--- a/htdocs/includes/ckeditor/plugins/uicolor/lang/et.js
+++ b/htdocs/includes/ckeditor/plugins/uicolor/lang/et.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/uicolor/lang/fa.js b/htdocs/includes/ckeditor/plugins/uicolor/lang/fa.js
index 764ef4a1164..a6f3eb0998d 100644
--- a/htdocs/includes/ckeditor/plugins/uicolor/lang/fa.js
+++ b/htdocs/includes/ckeditor/plugins/uicolor/lang/fa.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/uicolor/lang/fi.js b/htdocs/includes/ckeditor/plugins/uicolor/lang/fi.js
index db2caeed361..db7927a813f 100644
--- a/htdocs/includes/ckeditor/plugins/uicolor/lang/fi.js
+++ b/htdocs/includes/ckeditor/plugins/uicolor/lang/fi.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/uicolor/lang/fr.js b/htdocs/includes/ckeditor/plugins/uicolor/lang/fr.js
index bccd2a26a0b..7ca58a45e51 100644
--- a/htdocs/includes/ckeditor/plugins/uicolor/lang/fr.js
+++ b/htdocs/includes/ckeditor/plugins/uicolor/lang/fr.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/uicolor/lang/he.js b/htdocs/includes/ckeditor/plugins/uicolor/lang/he.js
index acfc3449da4..ec00902f59c 100644
--- a/htdocs/includes/ckeditor/plugins/uicolor/lang/he.js
+++ b/htdocs/includes/ckeditor/plugins/uicolor/lang/he.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/uicolor/lang/hr.js b/htdocs/includes/ckeditor/plugins/uicolor/lang/hr.js
index 84c87a30620..b61b92e256e 100644
--- a/htdocs/includes/ckeditor/plugins/uicolor/lang/hr.js
+++ b/htdocs/includes/ckeditor/plugins/uicolor/lang/hr.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/uicolor/lang/it.js b/htdocs/includes/ckeditor/plugins/uicolor/lang/it.js
index 567a301a539..207b19c41a5 100644
--- a/htdocs/includes/ckeditor/plugins/uicolor/lang/it.js
+++ b/htdocs/includes/ckeditor/plugins/uicolor/lang/it.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/uicolor/lang/mk.js b/htdocs/includes/ckeditor/plugins/uicolor/lang/mk.js
index d8eec0728f2..18b78ef1370 100644
--- a/htdocs/includes/ckeditor/plugins/uicolor/lang/mk.js
+++ b/htdocs/includes/ckeditor/plugins/uicolor/lang/mk.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/uicolor/lang/nb.js b/htdocs/includes/ckeditor/plugins/uicolor/lang/nb.js
index 2fd70024cc5..b376c739348 100644
--- a/htdocs/includes/ckeditor/plugins/uicolor/lang/nb.js
+++ b/htdocs/includes/ckeditor/plugins/uicolor/lang/nb.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/uicolor/lang/nl.js b/htdocs/includes/ckeditor/plugins/uicolor/lang/nl.js
index bd9b7e986b4..b603e4f7cbd 100644
--- a/htdocs/includes/ckeditor/plugins/uicolor/lang/nl.js
+++ b/htdocs/includes/ckeditor/plugins/uicolor/lang/nl.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/uicolor/lang/no.js b/htdocs/includes/ckeditor/plugins/uicolor/lang/no.js
index 09b2140659f..ad83283aedf 100644
--- a/htdocs/includes/ckeditor/plugins/uicolor/lang/no.js
+++ b/htdocs/includes/ckeditor/plugins/uicolor/lang/no.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/uicolor/lang/pl.js b/htdocs/includes/ckeditor/plugins/uicolor/lang/pl.js
index 4620b9c7966..f562e35edbf 100644
--- a/htdocs/includes/ckeditor/plugins/uicolor/lang/pl.js
+++ b/htdocs/includes/ckeditor/plugins/uicolor/lang/pl.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/uicolor/lang/pt-br.js b/htdocs/includes/ckeditor/plugins/uicolor/lang/pt-br.js
index e1a5689f57d..88c5a9a8e48 100644
--- a/htdocs/includes/ckeditor/plugins/uicolor/lang/pt-br.js
+++ b/htdocs/includes/ckeditor/plugins/uicolor/lang/pt-br.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/uicolor/lang/tr.js b/htdocs/includes/ckeditor/plugins/uicolor/lang/tr.js
index 2ee697c066f..a7606134241 100644
--- a/htdocs/includes/ckeditor/plugins/uicolor/lang/tr.js
+++ b/htdocs/includes/ckeditor/plugins/uicolor/lang/tr.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/uicolor/lang/ug.js b/htdocs/includes/ckeditor/plugins/uicolor/lang/ug.js
index e1652ff5788..66638cffb42 100644
--- a/htdocs/includes/ckeditor/plugins/uicolor/lang/ug.js
+++ b/htdocs/includes/ckeditor/plugins/uicolor/lang/ug.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/uicolor/lang/uk.js b/htdocs/includes/ckeditor/plugins/uicolor/lang/uk.js
index a6ba80fbf99..b6ccc27c4ac 100644
--- a/htdocs/includes/ckeditor/plugins/uicolor/lang/uk.js
+++ b/htdocs/includes/ckeditor/plugins/uicolor/lang/uk.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/uicolor/lang/vi.js b/htdocs/includes/ckeditor/plugins/uicolor/lang/vi.js
index eff2da576ca..69686a50d45 100644
--- a/htdocs/includes/ckeditor/plugins/uicolor/lang/vi.js
+++ b/htdocs/includes/ckeditor/plugins/uicolor/lang/vi.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/uicolor/lang/zh-cn.js b/htdocs/includes/ckeditor/plugins/uicolor/lang/zh-cn.js
index 1ab773a7a10..54a74d864a8 100644
--- a/htdocs/includes/ckeditor/plugins/uicolor/lang/zh-cn.js
+++ b/htdocs/includes/ckeditor/plugins/uicolor/lang/zh-cn.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/uicolor/plugin.js b/htdocs/includes/ckeditor/plugins/uicolor/plugin.js
index 9dc67dceb35..727b572e189 100644
--- a/htdocs/includes/ckeditor/plugins/uicolor/plugin.js
+++ b/htdocs/includes/ckeditor/plugins/uicolor/plugin.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/uicolor/yui/yui.js b/htdocs/includes/ckeditor/plugins/uicolor/yui/yui.js
index 86f5484f48f..9bd1a7a3898 100644
--- a/htdocs/includes/ckeditor/plugins/uicolor/yui/yui.js
+++ b/htdocs/includes/ckeditor/plugins/uicolor/yui/yui.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/wsc/dialogs/wsc.js b/htdocs/includes/ckeditor/plugins/wsc/dialogs/wsc.js
index 8ca567b91e8..4e06a0ea323 100644
--- a/htdocs/includes/ckeditor/plugins/wsc/dialogs/wsc.js
+++ b/htdocs/includes/ckeditor/plugins/wsc/dialogs/wsc.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/plugins/xml/plugin.js b/htdocs/includes/ckeditor/plugins/xml/plugin.js
index d1dc6a2090f..bad2b0a0d11 100644
--- a/htdocs/includes/ckeditor/plugins/xml/plugin.js
+++ b/htdocs/includes/ckeditor/plugins/xml/plugin.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/skins/kama/skin.js b/htdocs/includes/ckeditor/skins/kama/skin.js
index b67509414dd..abf8a55800d 100644
--- a/htdocs/includes/ckeditor/skins/kama/skin.js
+++ b/htdocs/includes/ckeditor/skins/kama/skin.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/skins/office2003/skin.js b/htdocs/includes/ckeditor/skins/office2003/skin.js
index 89a944d089e..bfb2af78e56 100644
--- a/htdocs/includes/ckeditor/skins/office2003/skin.js
+++ b/htdocs/includes/ckeditor/skins/office2003/skin.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/skins/v2/skin.js b/htdocs/includes/ckeditor/skins/v2/skin.js
index 9421e2f4649..0da22ad8c7b 100644
--- a/htdocs/includes/ckeditor/skins/v2/skin.js
+++ b/htdocs/includes/ckeditor/skins/v2/skin.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/includes/ckeditor/themes/default/theme.js b/htdocs/includes/ckeditor/themes/default/theme.js
index e508b4caafc..f5dc6c87d41 100644
--- a/htdocs/includes/ckeditor/themes/default/theme.js
+++ b/htdocs/includes/ckeditor/themes/default/theme.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/install/mysql/data/llx_00_c_pays.sql b/htdocs/install/mysql/data/llx_00_c_pays.sql
index b099258e98c..7799ad1cf70 100644
--- a/htdocs/install/mysql/data/llx_00_c_pays.sql
+++ b/htdocs/install/mysql/data/llx_00_c_pays.sql
@@ -37,14 +37,14 @@ insert into llx_c_pays (rowid,code,libelle) values (2,  'BE', 'Belgium'        )
 insert into llx_c_pays (rowid,code,libelle) values (3,  'IT', 'Italy'          );
 insert into llx_c_pays (rowid,code,libelle) values (4,  'ES', 'Spain'          );
 insert into llx_c_pays (rowid,code,libelle) values (5,  'DE', 'Germany'        );
-insert into llx_c_pays (rowid,code,libelle) values (6,  'CH', 'Suisse'         );
+insert into llx_c_pays (rowid,code,libelle) values (6,  'CH', 'Switzerland'    );
 insert into llx_c_pays (rowid,code,libelle) values (7,  'GB', 'United Kingdom' );
 insert into llx_c_pays (rowid,code,libelle) values (8,  'IE', 'Irland'         );
 insert into llx_c_pays (rowid,code,libelle) values (9,  'CN', 'China'          );
-insert into llx_c_pays (rowid,code,libelle) values (10, 'TN', 'Tunisie'        );
+insert into llx_c_pays (rowid,code,libelle) values (10, 'TN', 'Tunisia'        );
 insert into llx_c_pays (rowid,code,libelle) values (11, 'US', 'United States'  );
 insert into llx_c_pays (rowid,code,libelle) values (12, 'MA', 'Maroc'          );
-insert into llx_c_pays (rowid,code,libelle) values (13, 'DZ', 'Algérie'        );
+insert into llx_c_pays (rowid,code,libelle) values (13, 'DZ', 'Algeria'        );
 insert into llx_c_pays (rowid,code,libelle) values (14, 'CA', 'Canada'         );
 insert into llx_c_pays (rowid,code,libelle) values (15, 'TG', 'Togo'           );
 insert into llx_c_pays (rowid,code,libelle) values (16, 'GA', 'Gabon'          );
diff --git a/htdocs/install/mysql/data/llx_c_revenuestamp.sql b/htdocs/install/mysql/data/llx_c_revenuestamp.sql
new file mode 100644
index 00000000000..8d998111218
--- /dev/null
+++ b/htdocs/install/mysql/data/llx_c_revenuestamp.sql
@@ -0,0 +1,39 @@
+-- Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+-- Copyright (C) 2003      Jean-Louis Bergamo   <jlb@j1b.org>
+-- Copyright (C) 2004-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
+-- Copyright (C) 2004      Benoit Mortier       <benoit.mortier@opensides.be>
+-- Copyright (C) 2004      Guillaume Delecourt  <guillaume.delecourt@opensides.be>
+-- Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@capnetworks.com>
+-- Copyright (C) 2007 	   Patrick Raguin       <patrick.raguin@gmail.com>
+-- Copyright (C) 2010-2011 Juanjo Menent        <jmenent@2byte.es>
+-- Copyright (C) 2012      Sebastian Neuwert    <sebastian.neuwert@modula71.de>
+-- Copyright (C) 2012	   Ricardo Schluter		<info@ripasch.nl>
+--
+-- 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/>.
+--
+
+--
+-- Ne pas placer de commentaire en fin de ligne, ce fichier est parsé lors
+-- de l'install et tous les sigles '--' sont supprimés.
+--
+
+--
+-- Valeur des timbres fiscaux
+-- Source des taux: ...
+--
+
+delete from llx_c_revenuestamp;
+
+-- TUNISIA --
+insert into llx_c_revenuestamp(rowid,fk_pays,taux,note,active) values (101, 10, '0.4', 'Timbre fiscal', 1);
diff --git a/htdocs/install/mysql/migration/3.3.0-3.4.0.sql b/htdocs/install/mysql/migration/3.3.0-3.4.0.sql
index f2a48bed29c..e9993fd76b1 100755
--- a/htdocs/install/mysql/migration/3.3.0-3.4.0.sql
+++ b/htdocs/install/mysql/migration/3.3.0-3.4.0.sql
@@ -79,8 +79,26 @@ alter table llx_bank_account CHANGE COLUMN fk_departement state_id varchar(50);
 alter table llx_societe_rib CHANGE COLUMN adresse_proprio owner_address text;
 alter table llx_societe_address CHANGE COLUMN ville town text;
 alter table llx_societe_address CHANGE COLUMN cp zip varchar(10);
+alter table llx_societe CHANGE COLUMN tel phone varchar(20);
 
 ALTER TABLE llx_c_shipment_mode ADD COLUMN tracking VARCHAR(256) NOT NULL DEFAULT '' AFTER description;
 ALTER TABLE llx_c_shipment_mode CHANGE COLUMN rowid INTEGER NOT NULL;
 -- VMYSQL4.3 ALTER TABLE llx_c_shipment_mode CHANGE COLUMN rowid INTEGER AUTO_INCREMENT PRIMARY_KEY;
 -- VPGSQL8.2 ALTER TABLE llx_c_shipment_mode CHANGE COLUMN rowid INTEGER SERIAL PRIMARY KEY;
+
+ALTER TABLE llx_stock_mouvement MODIFY COLUMN value real;
+
+ALTER TABLE llx_facture ADD COLUMN revenuestamp double(24,8) DEFAULT 0 AFTER localtax2;
+
+CREATE TABLE llx_c_revenuestamp
+(
+  rowid             integer NOT NULL AUTO_INCREMENT PRIMARY KEY,
+  fk_pays           integer NOT NULL,
+  taux              double  NOT NULL,
+  note              varchar(128),
+  active            tinyint DEFAULT 1 NOT NULL,
+  accountancy_code_sell	varchar(15) DEFAULT NULL,
+  accountancy_code_buy	varchar(15) DEFAULT NULL
+) ENGINE=innodb;
+
+insert into llx_c_revenuestamp(rowid,fk_pays,taux,note,active) values (101, 10, '0.4', 'Timbre fiscal', 1);
diff --git a/htdocs/install/mysql/tables/llx_c_revenuestamp.sql b/htdocs/install/mysql/tables/llx_c_revenuestamp.sql
new file mode 100644
index 00000000000..7a47c05dca3
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_c_revenuestamp.sql
@@ -0,0 +1,29 @@
+-- ========================================================================
+-- 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/>.
+--
+-- ========================================================================
+
+create table llx_c_revenuestamp
+(
+  rowid             integer NOT NULL AUTO_INCREMENT PRIMARY KEY,
+  fk_pays           integer NOT NULL,
+  taux              double  NOT NULL,
+  note              varchar(128),
+  active            tinyint DEFAULT 1 NOT NULL,
+  accountancy_code_sell	varchar(15) DEFAULT NULL,
+  accountancy_code_buy	varchar(15) DEFAULT NULL
+)ENGINE=innodb;
+
diff --git a/htdocs/install/mysql/tables/llx_facture.sql b/htdocs/install/mysql/tables/llx_facture.sql
index f5f7ce413c4..a9046b49065 100644
--- a/htdocs/install/mysql/tables/llx_facture.sql
+++ b/htdocs/install/mysql/tables/llx_facture.sql
@@ -47,11 +47,12 @@ create table llx_facture
   close_code			varchar(16),							-- Code motif cloture sans paiement complet
   close_note			varchar(128),							-- Commentaire cloture sans paiement complet
 
-  tva					double(24,8)     DEFAULT 0,				-- montant tva apres remise totale
-  localtax1				double(24,8)     DEFAULT 0,				-- amount localtax1
-  localtax2				double(24,8)     DEFAULT 0,				-- amount localtax2	
-  total					double(24,8)     DEFAULT 0,				-- montant total ht apres remise totale
-  total_ttc				double(24,8)     DEFAULT 0,				-- montant total ttc apres remise totale
+  tva					double(24,8)     DEFAULT 0,				-- amount total tva apres remise totale
+  localtax1				double(24,8)     DEFAULT 0,				-- amount total localtax1
+  localtax2				double(24,8)     DEFAULT 0,				-- amount total localtax2	
+  revenuestamp          double(24,8)     DEFAULT 0,				-- amount total revenuestamp
+  total					double(24,8)     DEFAULT 0,				-- amount total ht apres remise totale
+  total_ttc				double(24,8)     DEFAULT 0,				-- amount total ttc apres remise totale
 
   fk_statut				smallint DEFAULT 0 NOT NULL,
 
diff --git a/htdocs/install/mysql/tables/llx_stock_mouvement.sql b/htdocs/install/mysql/tables/llx_stock_mouvement.sql
index 8a31ea027ac..ed87b77def6 100644
--- a/htdocs/install/mysql/tables/llx_stock_mouvement.sql
+++ b/htdocs/install/mysql/tables/llx_stock_mouvement.sql
@@ -24,7 +24,7 @@ create table llx_stock_mouvement
   datem           datetime,
   fk_product      integer NOT NULL,
   fk_entrepot     integer NOT NULL,
-  value           integer,
+  value           real,
   price           float(13,4) DEFAULT 0,
   type_mouvement  smallint,
   fk_user_author  integer,
diff --git a/htdocs/install/upgrade.php b/htdocs/install/upgrade.php
index 28aea7628e9..2df2c8db4b9 100644
--- a/htdocs/install/upgrade.php
+++ b/htdocs/install/upgrade.php
@@ -115,6 +115,10 @@ if (! GETPOST("action") || preg_match('/upgrade/i',GETPOST('action')))
 
     $db=getDoliDBInstance($conf->db->type,$conf->db->host,$conf->db->user,$conf->db->pass,$conf->db->name,$conf->db->port);
 
+    // Create the global $hookmanager object
+    include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
+    $hookmanager=new HookManager($db);
+
     if ($db->connected == 1)
     {
         print '<tr><td nowrap="nowrap">';
diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php
index 47218300ad5..c40a8dfb4b8 100644
--- a/htdocs/install/upgrade2.php
+++ b/htdocs/install/upgrade2.php
@@ -107,6 +107,10 @@ if (! GETPOST("action") || preg_match('/upgrade/i',GETPOST('action')))
 
     $db=getDoliDBInstance($conf->db->type,$conf->db->host,$conf->db->user,$conf->db->pass,$conf->db->name,$conf->db->port);
 
+    // Create the global $hookmanager object
+    include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
+    $hookmanager=new HookManager($db);
+
     if ($db->connected != 1)
     {
         print '<tr><td colspan="4">'.$langs->trans("ErrorFailedToConnectToDatabase",$conf->db->name).'</td><td align="right">'.$langs->trans('Error').'</td></tr>';
diff --git a/htdocs/langs/ca_ES/contracts.lang b/htdocs/langs/ca_ES/contracts.lang
index 67788f00c3d..775c93e9a05 100644
--- a/htdocs/langs/ca_ES/contracts.lang
+++ b/htdocs/langs/ca_ES/contracts.lang
@@ -33,7 +33,7 @@ SearchAContract=Cercar un contracte
 DeleteAContract=Eliminar un contracte
 CloseAContract=Tancar un contracte
 ConfirmDeleteAContract=Esteu segur de voler eliminar aquest contracte?
-ConfirmValidateContract=Esteu segur de voler validar aquest contracte?
+ConfirmValidateContract=Esteu segur de voler validar aquest contracte sota la referència <b>%s</b>?
 ConfirmCloseContract=Esteu segur de voler tancar aquest contracte?
 ConfirmCloseService=Esteu segur de voler tancar aquest servei?
 ValidateAContract=Validar un contracte
diff --git a/htdocs/langs/ca_ES/propal.lang b/htdocs/langs/ca_ES/propal.lang
index 0d862ce19a9..6da060d91f8 100644
--- a/htdocs/langs/ca_ES/propal.lang
+++ b/htdocs/langs/ca_ES/propal.lang
@@ -19,7 +19,7 @@ DeleteProp=Eliminar pressupost
 ValidateProp=Validar pressupost
 AddProp=Crear pressupost
 ConfirmDeleteProp=Esteu segur de voler eliminar aquest pressupost?
-ConfirmValidateProp=Esteu segur de voler validar aquest pressupost?
+ConfirmValidateProp=Esteu segur de voler validar aquest pressupost sota la referència <b>%s</b>?
 LastPropals=Els %s darrers pressupostos
 LastClosedProposals=Els %s darrers pressupostos tancats
 LastModifiedProposals=Els %s darrers pressupostos modificats
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index ce66a55f944..e2048918de6 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -700,6 +700,7 @@ DictionnaryCivility=Civility title
 DictionnaryActions=Type of agenda events
 DictionnarySocialContributions=Social contributions types
 DictionnaryVAT=VAT Rates or Sales Tax Rates
+DictionnaryRevenueStamp=Amount of revenue stamps
 DictionnaryPaymentConditions=Payment terms
 DictionnaryPaymentModes=Payment modes
 DictionnaryTypeContact=Contact/Address types
@@ -874,7 +875,7 @@ DisplayDesc=You can choose each parameter related to the Dolibarr look and feel
 AvailableModules=Available modules
 ToActivateModule=To activate modules, go on setup Area (Home->Setup->Modules).
 SessionTimeOut=Time out for session
-SessionExplanation=This number guarantee that session will never expire before this delay. But PHP session management does not guaranty that session always expire after this delay: This occurs if a system to clean cache session is running.<br>Note: with no particular system, internal PHP process will clean session every about <b>%s/%s</b> access but only during access made by other sessions. 
+SessionExplanation=This number guarantee that session will never expire before this delay, if the session cleaner is done by Internal PHP session cleaner (and nothing else). Internal PHP session cleaner does not guaranty that session will expire just after this delay. It will expire, after this delay, and when the session cleaner is ran, so every <b>%s/%s</b> access, but only during access made by other sessions.<br>Note: on some servers with an external session cleaning mechanism (cron under debian, ubuntu ...), the sessions can be destroyed after a period defined by the default <strong>session.gc_maxlifetime</strong>, no matter what the value entered here. 
 TriggersAvailable=Available triggers
 TriggersDesc=Triggers are files that will modify the behaviour of Dolibarr workflow once copied into the directory <b>htdocs/core/triggers</b>. They realised new actions, activated on Dolibarr events (new company creation, invoice validation, ...).
 TriggerDisabledByName=Triggers in this file are disabled by the <b>-NORUN</b> suffix in their name.
@@ -1395,3 +1396,6 @@ TestGeoIPResult=Test of a conversion IP -> country
 ProjectsNumberingModules=Projects numbering module
 ProjectsSetup=Project module setup
 ProjectsModelModule=Project reports document model
+##### ECM (GED) #####
+ECMSetup = GED Setup
+ECMAutoTree = Automatic tree folder and document  
\ No newline at end of file
diff --git a/htdocs/langs/en_US/contracts.lang b/htdocs/langs/en_US/contracts.lang
index e6d90145d7b..1655081bdb7 100644
--- a/htdocs/langs/en_US/contracts.lang
+++ b/htdocs/langs/en_US/contracts.lang
@@ -33,7 +33,7 @@ SearchAContract=Search a contract
 DeleteAContract=Delete a contract
 CloseAContract=Close a contract
 ConfirmDeleteAContract=Are you sure you want to delete this contract and all its services ?
-ConfirmValidateContract=Are you sure you want to validate this contract ?
+ConfirmValidateContract=Are you sure you want to validate this contract under name <b>%s</b> ?
 ConfirmCloseContract=This will close all services (active or not). Are you sure you want to close this contract ?
 ConfirmCloseService=Are you sure you want to close this service with date <b>%s</b> ?
 ValidateAContract=Validate a contract
diff --git a/htdocs/langs/en_US/members.lang b/htdocs/langs/en_US/members.lang
index 8956502c3a9..77657563851 100644
--- a/htdocs/langs/en_US/members.lang
+++ b/htdocs/langs/en_US/members.lang
@@ -157,6 +157,7 @@ NoThirdPartyAssociatedToMember=No third party associated to this member
 ThirdPartyDolibarr=Dolibarr third party
 MembersAndSubscriptions= Members and Suscriptions
 MoreActions=Complementary action on recording
+MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription
 MoreActionBankDirect=Create a direct transaction record on account
 MoreActionBankViaInvoice=Create an invoice and payment on account
 MoreActionInvoiceOnly=Create an invoice with no payment
@@ -199,3 +200,5 @@ DOLIBARRFOUNDATION_PAYMENT_FORM=To make your subscription payment using a bank t
 ByProperties=By characteristics
 MembersStatisticsByProperties=Members statistics by characteristics
 MembersByNature=Members by nature
+VATToUseForSubscriptions=VAT rate to use for subscriptions
+NoVatOnSubscription=No TVA for subscriptions
diff --git a/htdocs/langs/en_US/propal.lang b/htdocs/langs/en_US/propal.lang
index 3f76ca5ecda..197a9f52146 100644
--- a/htdocs/langs/en_US/propal.lang
+++ b/htdocs/langs/en_US/propal.lang
@@ -19,7 +19,7 @@ DeleteProp=Delete commercial proposal
 ValidateProp=Validate commercial proposal
 AddProp=Add proposal
 ConfirmDeleteProp=Are you sure you want to delete this commercial proposal ?
-ConfirmValidateProp=Are you sure you want to validate this commercial proposal ?
+ConfirmValidateProp=Are you sure you want to validate this commercial proposal under name <b>%s</b> ?
 LastPropals=Last %s proposals
 LastClosedProposals=Last %s closed proposals
 LastModifiedProposals=Last %s modified proposals
diff --git a/htdocs/langs/es_ES/contracts.lang b/htdocs/langs/es_ES/contracts.lang
index 076dcfbabc3..b6c603cbcb4 100644
--- a/htdocs/langs/es_ES/contracts.lang
+++ b/htdocs/langs/es_ES/contracts.lang
@@ -33,7 +33,7 @@ SearchAContract=Buscar un contrato
 DeleteAContract=Eliminar un contrato
 CloseAContract=Cerrar un contrato
 ConfirmDeleteAContract=¿Está seguro de querer eliminar este contrato?
-ConfirmValidateContract=¿Está seguro de querer validar este contrato?
+ConfirmValidateContract=¿Está seguro de querer validar este contrato bajo la referencia <b>%s</b> ?
 ConfirmCloseContract=¿Está seguro de querer cerrar este contrato?
 ConfirmCloseService=¿Está seguro de querer cerrar este servicio?
 ValidateAContract=Validar un contrato
diff --git a/htdocs/langs/es_ES/propal.lang b/htdocs/langs/es_ES/propal.lang
index c342baac8f4..03f7a7a9e64 100644
--- a/htdocs/langs/es_ES/propal.lang
+++ b/htdocs/langs/es_ES/propal.lang
@@ -20,7 +20,7 @@ DeleteProp=Eliminar presupuesto
 ValidateProp=Validar presupuesto
 AddProp=Crear presupuesto
 ConfirmDeleteProp=¿Está seguro de querer eliminar este presupuesto?
-ConfirmValidateProp=¿Está seguro de querer validar este presupuesto?
+ConfirmValidateProp=¿Está seguro de querer validar este presupuesto bajo la referencia <b>%s</b> ?
 LastPropals=Los %s últimos presupuestos
 LastClosedProposals=Los %s últimos presupuestos cerrados
 LastModifiedProposals=Los %s últimos presupuestos modificados
diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index f0e8198086d..10ada198078 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -702,7 +702,8 @@ DictionnaryCurrency= Monnaies
 DictionnaryCivility= Titres de civilité
 DictionnaryActions= Liste des types d'événements de l'agenda
 DictionnarySocialContributions= Types de charges sociales
-DictionnaryVAT= Taux de TVA (ou de taxes de ventes US)
+DictionnaryVAT= Taux de TVA ou de Taxes de Ventes
+DictionnaryRevenueStamp=Montants des timbres fiscaux
 DictionnaryPaymentConditions= Conditions de règlement
 DictionnaryPaymentModes= Modes de paiements
 DictionnaryTypeContact= Types de contacts/adresses
@@ -874,7 +875,7 @@ DisplayDesc= Vous pouvez choisir ici tous les paramètres liés à l'apparence d
 AvailableModules= Modules disponibles
 ToActivateModule= Pour activer des modules, aller dans l'espace Configuration (Accueil->Configuration->Modules).
 SessionTimeOut= Time out des sessions
-SessionExplanation= Ce nombre garanti que la session n'expire pas avant ce délai. Mais la gestion de session PHP ne garantie pas que la session expire après ce délai: Ce sera le cas si un système de nettoyage des caches sessions est en place.<br>Note: Sans mécanisme spécial, le mécanisme interne à PHP nettoie la session tous les <b>%s/%s</b> accès environ mais uniquement lors d'accès fait par d'autres sessions. 
+SessionExplanation= Ce nombre garanti que la session n'expire pas avant ce délai, lorsque le nettoyage des sessions est assurés par le mécanisme de nettoyage interne au PHP (et aucun autre). Le nettoyage interne PHP de sessions ne garantie pas que la session expire juste au moment de ce délai. Elle expirera ,après ce délai, mais au moment du nettoyage des sessions, qui a lieu toutes les <b>%s/%s</b> accès environ, mais uniquement lors d'accès fait par d'autres sessions.<br>Note: sur certains serveurs munis d'un mécanisme de nettoyage de session externe (cron sous debian, ubuntu...), le sessions peuvent être détuite après un délai, défini par la valeur par défaut de <strong>session.gc_maxlifetime</strong>, quelquesoit la valeur saisie ici.  
 TriggersAvailable= Triggers disponibles
 TriggersDesc= Les triggers sont des fichiers qui, une fois déposés dans le répertoire <b>htdocs/core/triggers</b>, modifient le comportement du workflow de Dolibarr. Ils réalisent des actions supplémentaires, déclenchées par les événements Dolibarr (création société, validation facture, clôture contrat...).
 TriggerDisabledByName= Triggers de ce fichier désactivés par le suffix <b>-NORUN</b> dans le nom du fichier.
@@ -1397,3 +1398,6 @@ Chartofaccounts=Plan comptable
 Definechartofaccounts=Définir un plan comptable
 Selectchartofaccounts=Sélection d'un plan comptable
 DoNotSuggestChart=Ne pas suggérer de plan comptable
+##### ECM (GED) #####
+ECMSetup = Configuration du module GED
+ECMAutoTree = L'arborescence automatique est disponible 
\ No newline at end of file
diff --git a/htdocs/langs/fr_FR/contracts.lang b/htdocs/langs/fr_FR/contracts.lang
index 718c62d7c0d..a927d779a2e 100644
--- a/htdocs/langs/fr_FR/contracts.lang
+++ b/htdocs/langs/fr_FR/contracts.lang
@@ -33,7 +33,7 @@ SearchAContract=Rechercher un contrat
 DeleteAContract=Supprimer un contrat
 CloseAContract=Clôturer un contrat
 ConfirmDeleteAContract=Êtes-vous sûr de vouloir supprimer ce contrat et tous ses services ?
-ConfirmValidateContract=Êtes-vous sûr de vouloir valider ce contrat ?
+ConfirmValidateContract=Êtes-vous sûr de vouloir valider ce contrat sous la référence <b>%s</b> ?
 ConfirmCloseContract=Ceci fermera tous les services actifs et inactifs. Êtes-vous sûr de vouloir clôturer ce contrat ?
 ConfirmCloseService=Êtes-vous sûr de vouloir fermer ce service à la date du <b>%s</b> ?
 ValidateAContract=Valider un contrat
diff --git a/htdocs/langs/fr_FR/members.lang b/htdocs/langs/fr_FR/members.lang
index 2ccafef4cab..9a047a30ae6 100644
--- a/htdocs/langs/fr_FR/members.lang
+++ b/htdocs/langs/fr_FR/members.lang
@@ -162,6 +162,7 @@ NoThirdPartyAssociatedToMember=Pas de tiers associé à cet adhérent
 ThirdPartyDolibarr=Tiers Dolibarr
 MembersAndSubscriptions= Adhérents et Adhésions
 MoreActions=Action complémentaire à l'enregistrement
+MoreActionsOnSubscription=Action complémentaire proposée par défaut à l'enregistrement de l'adhésion
 MoreActionBankDirect=Création transaction sur compte bancaire ou caisse directement
 MoreActionBankViaInvoice=Création facture avec paiement sur compte bancaire ou caisse
 MoreActionInvoiceOnly=Création facture sans paiement
@@ -204,3 +205,6 @@ DOLIBARRFOUNDATION_PAYMENT_FORM=Pour réaliser le paiement de votre cotisation p
 ByProperties=Par caractéristiques
 MembersStatisticsByProperties=Statistiques des adhérents par caractéristiques
 MembersByNature=Adhérents par nature
+VATToUseForSubscriptions=Taux de TVA pour les adhésions
+NoVatOnSubscription=Pas de TVA sur les adhésions
+
diff --git a/htdocs/langs/fr_FR/propal.lang b/htdocs/langs/fr_FR/propal.lang
index 124910b907e..5a4c05f0d6d 100644
--- a/htdocs/langs/fr_FR/propal.lang
+++ b/htdocs/langs/fr_FR/propal.lang
@@ -19,7 +19,7 @@ DeleteProp=Supprimer proposition
 ValidateProp=Valider proposition
 AddProp=Créer proposition
 ConfirmDeleteProp=Êtes-vous sûr de vouloir effacer cette proposition commerciale ?
-ConfirmValidateProp=Êtes-vous sûr de vouloir valider cette proposition commerciale ?
+ConfirmValidateProp=Êtes-vous sûr de vouloir valider cette proposition commerciale sous la référence <b>%s</b> ?
 LastPropals=Les %s dernières propales
 LastClosedProposals=Les %s dernières propositions commerciales fermées
 LastModifiedProposals=Les %s dernières propositions commerciales modifiées
diff --git a/htdocs/langs/nl_BE/main.lang b/htdocs/langs/nl_BE/main.lang
index bdcaca462a8..3d16e786aed 100644
--- a/htdocs/langs/nl_BE/main.lang
+++ b/htdocs/langs/nl_BE/main.lang
@@ -1,4 +1,4 @@
-# Dolibarr language file - nl_BE - main
+# Dolibarr language file - nl_BE - main
 CHARSET=UTF-8
 SeparatorDecimal=,
 SeparatorThousand= 
diff --git a/htdocs/langs/nl_BE/trips.lang b/htdocs/langs/nl_BE/trips.lang
index 904b9be4a27..17d52a15fc8 100644
--- a/htdocs/langs/nl_BE/trips.lang
+++ b/htdocs/langs/nl_BE/trips.lang
@@ -1,4 +1,4 @@
-# Dolibarr language file - nl_BE - trips
+# Dolibarr language file - nl_BE - trips
 CHARSET=UTF-8
 Trip=Verplaatsing
 Trips=Verplaatsingen
diff --git a/htdocs/langs/pt_PT/agenda.lang b/htdocs/langs/pt_PT/agenda.lang
index 4efbb1fa975..1ab38139343 100644
--- a/htdocs/langs/pt_PT/agenda.lang
+++ b/htdocs/langs/pt_PT/agenda.lang
@@ -1,4 +1,4 @@
-# Dolibarr language file - pt_PT - agenda
+# Dolibarr language file - pt_PT - agenda
 CHARSET=UTF-8
 Actions=Acções
 ActionsArea=Área de Acções
diff --git a/htdocs/langs/pt_PT/banks.lang b/htdocs/langs/pt_PT/banks.lang
index 2b9f4dc78f1..afb17250760 100644
--- a/htdocs/langs/pt_PT/banks.lang
+++ b/htdocs/langs/pt_PT/banks.lang
@@ -1,4 +1,4 @@
-# Dolibarr language file - pt_PT - banks
+# Dolibarr language file - pt_PT - banks
 CHARSET=UTF-8
 Bank=Banco
 Banks=Bancos
diff --git a/htdocs/langs/pt_PT/bills.lang b/htdocs/langs/pt_PT/bills.lang
index 0e91c45dda4..c66d917847e 100644
--- a/htdocs/langs/pt_PT/bills.lang
+++ b/htdocs/langs/pt_PT/bills.lang
@@ -1,4 +1,4 @@
-# Dolibarr language file - pt_PT - bills
+# Dolibarr language file - pt_PT - bills
 CHARSET=UTF-8
 Bill=Factura
 Bills=Facturas
diff --git a/htdocs/langs/pt_PT/bookmarks.lang b/htdocs/langs/pt_PT/bookmarks.lang
index 5bc362bc0b8..33d6b43df6e 100644
--- a/htdocs/langs/pt_PT/bookmarks.lang
+++ b/htdocs/langs/pt_PT/bookmarks.lang
@@ -1,4 +1,4 @@
-# Dolibarr language file - pt_PT - marque pages 
+# Dolibarr language file - pt_PT - marque pages 
 CHARSET=UTF-8
 AddThisPageToBookmarks=Adicionar esta página aos Favoritos
 
diff --git a/htdocs/langs/pt_PT/boxes.lang b/htdocs/langs/pt_PT/boxes.lang
index 428edb78514..14f3cec7541 100644
--- a/htdocs/langs/pt_PT/boxes.lang
+++ b/htdocs/langs/pt_PT/boxes.lang
@@ -1,4 +1,4 @@
-# Dolibarr language file - pt_PT - boxes 
+# Dolibarr language file - pt_PT - boxes 
 CHARSET=UTF-8
 BoxLastRssInfos=Links de informação RSS
 BoxLastProducts=Últimos produtos/serviços
diff --git a/htdocs/langs/pt_PT/categories.lang b/htdocs/langs/pt_PT/categories.lang
index a66197521c1..ea0a43b99fb 100644
--- a/htdocs/langs/pt_PT/categories.lang
+++ b/htdocs/langs/pt_PT/categories.lang
@@ -1,4 +1,4 @@
-# Dolibarr language file - pt_PT - categories
+# Dolibarr language file - pt_PT - categories
 CHARSET=UTF-8
 Category=Categoria
 Categories=Categorias
diff --git a/htdocs/langs/pt_PT/commercial.lang b/htdocs/langs/pt_PT/commercial.lang
index b632d0f78a5..4d03c49d139 100644
--- a/htdocs/langs/pt_PT/commercial.lang
+++ b/htdocs/langs/pt_PT/commercial.lang
@@ -1,4 +1,4 @@
-# Dolibarr language file - pt_PT - commercial
+# Dolibarr language file - pt_PT - commercial
 CHARSET=UTF-8
 Commercial=Comercial
 CommercialArea=Área comercial
diff --git a/htdocs/langs/pt_PT/companies.lang b/htdocs/langs/pt_PT/companies.lang
index 81f1c4cfdc3..929c5b2b2ef 100644
--- a/htdocs/langs/pt_PT/companies.lang
+++ b/htdocs/langs/pt_PT/companies.lang
@@ -1,4 +1,4 @@
-# Dolibarr language file - pt_PT - companies
+# Dolibarr language file - pt_PT - companies
 CHARSET=UTF-8
 ErrorBadEMail=e-mail %s não está correcto
 ErrorCompanyNameAlreadyExists=O nome da empresa %s já existe. Indique outro.
diff --git a/htdocs/langs/pt_PT/compta.lang b/htdocs/langs/pt_PT/compta.lang
index 5d3bb7c024a..637bd98bfc2 100644
--- a/htdocs/langs/pt_PT/compta.lang
+++ b/htdocs/langs/pt_PT/compta.lang
@@ -1,4 +1,4 @@
-# Dolibarr language file - pt_PT - compta
+# Dolibarr language file - pt_PT - compta
 CHARSET=UTF-8
 Accountancy=Contabilidade
 AccountancyCard=Ficha Contabilidade
diff --git a/htdocs/langs/pt_PT/contracts.lang b/htdocs/langs/pt_PT/contracts.lang
index 6d21d038cd4..8682ff04cf5 100644
--- a/htdocs/langs/pt_PT/contracts.lang
+++ b/htdocs/langs/pt_PT/contracts.lang
@@ -1,4 +1,4 @@
-# Dolibarr language file - pt_PT - contracts
+# Dolibarr language file - pt_PT - contracts
 CHARSET=UTF-8
 ContractsArea=Área contractos
 ListOfContracts=Lista de contractos
diff --git a/htdocs/langs/pt_PT/deliveries.lang b/htdocs/langs/pt_PT/deliveries.lang
index b98781deb35..99712da45e7 100644
--- a/htdocs/langs/pt_PT/deliveries.lang
+++ b/htdocs/langs/pt_PT/deliveries.lang
@@ -1,4 +1,4 @@
-# Dolibarr language file - pt_PT - deliveries
+# Dolibarr language file - pt_PT - deliveries
 CHARSET=UTF-8
 Delivery=Envio
 Deliveries=Envios
diff --git a/htdocs/langs/pt_PT/donations.lang b/htdocs/langs/pt_PT/donations.lang
index 8fb8e010c79..a9cba42c7ed 100644
--- a/htdocs/langs/pt_PT/donations.lang
+++ b/htdocs/langs/pt_PT/donations.lang
@@ -1,4 +1,4 @@
-# Dolibarr language file - pt_PT - donations
+# Dolibarr language file - pt_PT - donations
 CHARSET=UTF-8
 Donation=Doação
 Donationss=Doações
diff --git a/htdocs/langs/pt_PT/ecm.lang b/htdocs/langs/pt_PT/ecm.lang
index c08f3293c90..70f7c8dbea8 100644
--- a/htdocs/langs/pt_PT/ecm.lang
+++ b/htdocs/langs/pt_PT/ecm.lang
@@ -1,4 +1,4 @@
-# Dolibarr language file - pt_PT - ecm
+# Dolibarr language file - pt_PT - ecm
 CHARSET=UTF-8
 MenuECM=Documentos
 DocsMine=Os Meus Documentos
diff --git a/htdocs/langs/pt_PT/errors.lang b/htdocs/langs/pt_PT/errors.lang
index 885eb064467..336746b0f70 100644
--- a/htdocs/langs/pt_PT/errors.lang
+++ b/htdocs/langs/pt_PT/errors.lang
@@ -1,4 +1,4 @@
-# Dolibarr language file - pt_PT - errors
+# Dolibarr language file - pt_PT - errors
 CHARSET=UTF-8
 ErrorLoginAlreadyExists=O login %s já existe.
 ErrorGroupAlreadyExists=O grupo %s já existe.
diff --git a/htdocs/langs/pt_PT/exports.lang b/htdocs/langs/pt_PT/exports.lang
index 49f4f20bea9..8f95b1107d5 100644
--- a/htdocs/langs/pt_PT/exports.lang
+++ b/htdocs/langs/pt_PT/exports.lang
@@ -1,4 +1,4 @@
-# Dolibarr language file - pt_PT - exports
+# Dolibarr language file - pt_PT - exports
 CHARSET=UTF-8
 ExportsArea=Área de Exportação
 ImportArea=Área de Importação
diff --git a/htdocs/langs/pt_PT/interventions.lang b/htdocs/langs/pt_PT/interventions.lang
index f14f0dd0840..33abfd5e2bf 100644
--- a/htdocs/langs/pt_PT/interventions.lang
+++ b/htdocs/langs/pt_PT/interventions.lang
@@ -1,4 +1,4 @@
-# Dolibarr language file - pt_PT - interventions
+# Dolibarr language file - pt_PT - interventions
 CHARSET=UTF-8
 Intervention=Intervenção
 Interventions=Intervenções
diff --git a/htdocs/langs/pt_PT/mails.lang b/htdocs/langs/pt_PT/mails.lang
index c4e1f1fb5ba..288da4e03d5 100644
--- a/htdocs/langs/pt_PT/mails.lang
+++ b/htdocs/langs/pt_PT/mails.lang
@@ -1,4 +1,4 @@
-# Dolibarr language file - pt_PT - mails
+# Dolibarr language file - pt_PT - mails
 CHARSET=UTF-8
 Mailing=Mailing
 EMailing=Mailing
diff --git a/htdocs/langs/pt_PT/main.lang b/htdocs/langs/pt_PT/main.lang
index 9e57a03f72b..86d60b9b037 100644
--- a/htdocs/langs/pt_PT/main.lang
+++ b/htdocs/langs/pt_PT/main.lang
@@ -1,4 +1,4 @@
-# Dolibarr language file - pt_PT - main 
+# Dolibarr language file - pt_PT - main 
 CHARSET=UTF-8
 SeparatorDecimal=,
 SeparatorThousand=
diff --git a/htdocs/langs/pt_PT/members.lang b/htdocs/langs/pt_PT/members.lang
index 48f2ee0a65b..0c42a9c3295 100644
--- a/htdocs/langs/pt_PT/members.lang
+++ b/htdocs/langs/pt_PT/members.lang
@@ -1,4 +1,4 @@
-# Dolibarr language file - pt_PT - members
+# Dolibarr language file - pt_PT - members
 CHARSET=UTF-8
 MembersArea=Área Membros
 PublicMembersArea=Área pública dos Membros
diff --git a/htdocs/langs/pt_PT/orders.lang b/htdocs/langs/pt_PT/orders.lang
index a43ca2b2706..6bc03b6c877 100644
--- a/htdocs/langs/pt_PT/orders.lang
+++ b/htdocs/langs/pt_PT/orders.lang
@@ -1,4 +1,4 @@
-# Dolibarr language file - pt_PT - orders
+# Dolibarr language file - pt_PT - orders
 CHARSET=UTF-8
 OrdersArea=Area de Pedidos de clientes
 SuppliersOrdersArea=Área de Pedidos a Fornecedores
diff --git a/htdocs/langs/pt_PT/other.lang b/htdocs/langs/pt_PT/other.lang
index 848f808c628..6123038bc5a 100644
--- a/htdocs/langs/pt_PT/other.lang
+++ b/htdocs/langs/pt_PT/other.lang
@@ -1,4 +1,4 @@
-# Dolibarr language file - pt_PT - other 
+# Dolibarr language file - pt_PT - other 
 CHARSET=UTF-8
 SecurityCode=Código segurança
 Calendar=Calendario
diff --git a/htdocs/langs/pt_PT/products.lang b/htdocs/langs/pt_PT/products.lang
index 77e0d866e2b..231d9a1f65d 100644
--- a/htdocs/langs/pt_PT/products.lang
+++ b/htdocs/langs/pt_PT/products.lang
@@ -1,4 +1,4 @@
-# Dolibarr language file - pt_PT - products
+# Dolibarr language file - pt_PT - products
 CHARSET=UTF-8
 ProductServiceCard=Ficha Produto/Serviço
 Products=Produtos
diff --git a/htdocs/langs/pt_PT/projects.lang b/htdocs/langs/pt_PT/projects.lang
index b2a7ff63711..3b7d0e5a629 100644
--- a/htdocs/langs/pt_PT/projects.lang
+++ b/htdocs/langs/pt_PT/projects.lang
@@ -1,4 +1,4 @@
-# Dolibarr language file - pt_PT - projects
+# Dolibarr language file - pt_PT - projects
 CHARSET=UTF-8
 Project=Projeto
 Projects=Projetos
diff --git a/htdocs/langs/pt_PT/propal.lang b/htdocs/langs/pt_PT/propal.lang
index 8aa01321aa3..3af8afdb5d3 100644
--- a/htdocs/langs/pt_PT/propal.lang
+++ b/htdocs/langs/pt_PT/propal.lang
@@ -1,4 +1,4 @@
-# Dolibarr language file - pt_PT - propal
+# Dolibarr language file - pt_PT - propal
 CHARSET=UTF-8
 Proposals=Orçamentos
 Proposal=Orçamento
diff --git a/htdocs/langs/pt_PT/sendings.lang b/htdocs/langs/pt_PT/sendings.lang
index 6d5d05c2516..9b7cb56eaa7 100644
--- a/htdocs/langs/pt_PT/sendings.lang
+++ b/htdocs/langs/pt_PT/sendings.lang
@@ -1,4 +1,4 @@
-# Dolibarr language file - pt_PT - sendings
+# Dolibarr language file - pt_PT - sendings
 CHARSET=UTF-8
 RefSending=Ref. de Envio
 Sending=Envio
diff --git a/htdocs/langs/pt_PT/suppliers.lang b/htdocs/langs/pt_PT/suppliers.lang
index 85dfde74227..cea0cdef033 100644
--- a/htdocs/langs/pt_PT/suppliers.lang
+++ b/htdocs/langs/pt_PT/suppliers.lang
@@ -1,4 +1,4 @@
-# Dolibarr language file - pt_PT - suppliers
+# Dolibarr language file - pt_PT - suppliers
 CHARSET=UTF-8
 Suppliers=Fornecedores
 Supplier=Fornecedor
diff --git a/htdocs/langs/pt_PT/users.lang b/htdocs/langs/pt_PT/users.lang
index 378ea614d6d..57c8fbff1de 100644
--- a/htdocs/langs/pt_PT/users.lang
+++ b/htdocs/langs/pt_PT/users.lang
@@ -1,4 +1,4 @@
-# Dolibarr language file - pt_PT - users
+# Dolibarr language file - pt_PT - users
 CHARSET=UTF-8
 UserCard=Ficha de Utilizador
 ContactCard=Ficha de Contacto
diff --git a/htdocs/langs/pt_PT/withdrawals.lang b/htdocs/langs/pt_PT/withdrawals.lang
index 0e9b2348640..69dd7b13d01 100644
--- a/htdocs/langs/pt_PT/withdrawals.lang
+++ b/htdocs/langs/pt_PT/withdrawals.lang
@@ -1,4 +1,4 @@
-# Dolibarr language file - pt_PT - withdrawals
+# Dolibarr language file - pt_PT - withdrawals
 CHARSET=UTF-8
 StandingOrdersArea=Área de Débitos Directos
 CustomersStandingOrdersArea=Área de Débitos Directos de Clientes
diff --git a/htdocs/langs/tr_TR/agenda.lang b/htdocs/langs/tr_TR/agenda.lang
index cb87e1de6d8..b8515b1d945 100755
--- a/htdocs/langs/tr_TR/agenda.lang
+++ b/htdocs/langs/tr_TR/agenda.lang
@@ -1,4 +1,4 @@
-/*
+/*
  * Language code: tr_TR
  * Manually generated
  * Generation date 2012-24-06 23:50:00
diff --git a/htdocs/langs/tr_TR/banks.lang b/htdocs/langs/tr_TR/banks.lang
index 20f2db22185..f9ac6535b09 100755
--- a/htdocs/langs/tr_TR/banks.lang
+++ b/htdocs/langs/tr_TR/banks.lang
@@ -1,4 +1,4 @@
-/*
+/*
  * Language code: tr_TR
  * Manually generated
  * Generation date 2012-24-06 23:50:00
diff --git a/htdocs/langs/tr_TR/bills.lang b/htdocs/langs/tr_TR/bills.lang
index f4b2a87558a..4099494a3df 100755
--- a/htdocs/langs/tr_TR/bills.lang
+++ b/htdocs/langs/tr_TR/bills.lang
@@ -1,4 +1,4 @@
-/*
+/*
  * Language code: tr_TR
  * Manually generated
  * Generation date 2012-07-03 23:50:00
diff --git a/htdocs/langs/tr_TR/bookmarks.lang b/htdocs/langs/tr_TR/bookmarks.lang
index 216ea8f55b7..d7abad6e7a3 100755
--- a/htdocs/langs/tr_TR/bookmarks.lang
+++ b/htdocs/langs/tr_TR/bookmarks.lang
@@ -1,4 +1,4 @@
-/*
+/*
  * Language code: tr_TR
  * Manually generated
  * Generation date 2012-07-03 23:50:00
diff --git a/htdocs/langs/tr_TR/boxes.lang b/htdocs/langs/tr_TR/boxes.lang
index d65727838ae..a4bdc0c3658 100755
--- a/htdocs/langs/tr_TR/boxes.lang
+++ b/htdocs/langs/tr_TR/boxes.lang
@@ -1,4 +1,4 @@
-/*
+/*
  * Language code: tr_TR
  * Manually generated
  * Generation date 2012-07-03 23:50:00
diff --git a/htdocs/langs/tr_TR/cashdesk.lang b/htdocs/langs/tr_TR/cashdesk.lang
index 2d671401938..38dfac17825 100644
--- a/htdocs/langs/tr_TR/cashdesk.lang
+++ b/htdocs/langs/tr_TR/cashdesk.lang
@@ -1,4 +1,4 @@
-/*
+/*
  * Language code: tr_TR
  * Manually translated
  * Generation date 2012-07-05 22:52:49
diff --git a/htdocs/langs/tr_TR/categories.lang b/htdocs/langs/tr_TR/categories.lang
index 5002137120b..890d20f0730 100644
--- a/htdocs/langs/tr_TR/categories.lang
+++ b/htdocs/langs/tr_TR/categories.lang
@@ -1,4 +1,4 @@
-/*
+/*
  * Language code: tr_TR
  * Manually generated
  * Generation date 2012-07-07 09:51:00
diff --git a/htdocs/langs/tr_TR/commercial.lang b/htdocs/langs/tr_TR/commercial.lang
index 252917ab391..2972f9abbb4 100644
--- a/htdocs/langs/tr_TR/commercial.lang
+++ b/htdocs/langs/tr_TR/commercial.lang
@@ -1,4 +1,4 @@
-/*
+/*
  * Language code: tr_TR
  * Manually generated
  * Generation date 2012-07-05 10:49:00
diff --git a/htdocs/langs/tr_TR/companies.lang b/htdocs/langs/tr_TR/companies.lang
index 0672fd4073e..df5a1ee9cf5 100644
--- a/htdocs/langs/tr_TR/companies.lang
+++ b/htdocs/langs/tr_TR/companies.lang
@@ -1,4 +1,4 @@
-/*
+/*
  * Language code: tr_TR
  * Manually translated
  * Generation date 2012-07-07 20:22:49
diff --git a/htdocs/langs/tr_TR/compta.lang b/htdocs/langs/tr_TR/compta.lang
index abb8362f1b4..b7d8653a5fb 100644
--- a/htdocs/langs/tr_TR/compta.lang
+++ b/htdocs/langs/tr_TR/compta.lang
@@ -1,4 +1,4 @@
-/*
+/*
  * Language code: tr_TR
  * Manually generated
  * Generation date 2012-07-07 10:30:00
diff --git a/htdocs/langs/tr_TR/contracts.lang b/htdocs/langs/tr_TR/contracts.lang
index c525edbe223..2bb1d72f748 100644
--- a/htdocs/langs/tr_TR/contracts.lang
+++ b/htdocs/langs/tr_TR/contracts.lang
@@ -1,4 +1,4 @@
-/*
+/*
  * Language code: tr_TR
  * Manually generated
  * Generation date 2012-07-07 10:30:00
diff --git a/htdocs/langs/tr_TR/deliveries.lang b/htdocs/langs/tr_TR/deliveries.lang
index 8db56172646..60c53fe262f 100644
--- a/htdocs/langs/tr_TR/deliveries.lang
+++ b/htdocs/langs/tr_TR/deliveries.lang
@@ -1,4 +1,4 @@
-/*
+/*
  * Language code: tr_TR
  * Manually generated
  * Generation date 2012-07-07 13:45:00
diff --git a/htdocs/langs/tr_TR/dict.lang b/htdocs/langs/tr_TR/dict.lang
index 9eed48bbe71..7723f7070b1 100644
--- a/htdocs/langs/tr_TR/dict.lang
+++ b/htdocs/langs/tr_TR/dict.lang
@@ -1,4 +1,4 @@
-/*
+/*
  * Language code: tr_TR
  * Manually generated
  * Generation date 2012-07-07 20:41:26
diff --git a/htdocs/langs/tr_TR/donations.lang b/htdocs/langs/tr_TR/donations.lang
index d9199d8165b..d20cdb1d0d5 100644
--- a/htdocs/langs/tr_TR/donations.lang
+++ b/htdocs/langs/tr_TR/donations.lang
@@ -1,4 +1,4 @@
-* Manually generated
+* Manually generated
  * Generation date 2012-07-17 19:54:26
 
 // START - Lines manually generated (2012-07-17 19:54:26).
diff --git a/htdocs/langs/tr_TR/ecm.lang b/htdocs/langs/tr_TR/ecm.lang
index 611e0448804..1c926ab1120 100644
--- a/htdocs/langs/tr_TR/ecm.lang
+++ b/htdocs/langs/tr_TR/ecm.lang
@@ -1,4 +1,4 @@
-* Manually generated
+* Manually generated
  * Generation date 2012-07-08 16:55:26
 
 
diff --git a/htdocs/langs/tr_TR/errors.lang b/htdocs/langs/tr_TR/errors.lang
index 51328ab6ffe..1bbf464abfc 100644
--- a/htdocs/langs/tr_TR/errors.lang
+++ b/htdocs/langs/tr_TR/errors.lang
@@ -1,4 +1,4 @@
-* Manually generated
+* Manually generated
  * Generation date 2012-07-18 00:22:26
 
 // START - Lines manually generated (2012-07-18 00:22:26).
diff --git a/htdocs/langs/tr_TR/exports.lang b/htdocs/langs/tr_TR/exports.lang
index a40c51d215f..64bf493f517 100644
--- a/htdocs/langs/tr_TR/exports.lang
+++ b/htdocs/langs/tr_TR/exports.lang
@@ -1,4 +1,4 @@
-* Manually generated
+* Manually generated
  * Generation date 2012-07-23 21:32:26
 
 // START - Lines manually generated (2012-07-23 21:32:26).
diff --git a/htdocs/langs/tr_TR/externalsite.lang b/htdocs/langs/tr_TR/externalsite.lang
index 5aafe1495ef..efce4f5f881 100644
--- a/htdocs/langs/tr_TR/externalsite.lang
+++ b/htdocs/langs/tr_TR/externalsite.lang
@@ -1,4 +1,4 @@
-/*
+/*
  * Language code: tr_TR
  * Manually translated
  * Generation date 2011-07-05 16:52:49
diff --git a/htdocs/langs/tr_TR/ftp.lang b/htdocs/langs/tr_TR/ftp.lang
index ebadccb7fa7..ddf9ccd82fb 100644
--- a/htdocs/langs/tr_TR/ftp.lang
+++ b/htdocs/langs/tr_TR/ftp.lang
@@ -1,4 +1,4 @@
-/*
+/*
  * Language code: tr_TR
  * Manually generated 
  * Generation date 2012-07-23 22:28:26
diff --git a/htdocs/langs/tr_TR/help.lang b/htdocs/langs/tr_TR/help.lang
index 73aac51d33c..b4c21b8f802 100644
--- a/htdocs/langs/tr_TR/help.lang
+++ b/htdocs/langs/tr_TR/help.lang
@@ -1,4 +1,4 @@
-/*
+/*
  * Language code: tr_TR
  * Automatic generated via autotranslator.php tool
  * Generation date 2010-03-15 19:05:26
diff --git a/htdocs/langs/tr_TR/install.lang b/htdocs/langs/tr_TR/install.lang
index 7967446d570..c4ea75fcb4b 100755
--- a/htdocs/langs/tr_TR/install.lang
+++ b/htdocs/langs/tr_TR/install.lang
@@ -1,4 +1,4 @@
-/*
+/*
  * Language code: tr_TR
  * Manually generated
  * Generation date 2012-07-04 20:01:00
diff --git a/htdocs/langs/tr_TR/interventions.lang b/htdocs/langs/tr_TR/interventions.lang
index 80d57def0b9..e9ef469e507 100644
--- a/htdocs/langs/tr_TR/interventions.lang
+++ b/htdocs/langs/tr_TR/interventions.lang
@@ -1,4 +1,4 @@
-* Manually generated
+* Manually generated
  * Generation date 2012-07-08 20:16:26
 
 // START - Lines manually generated (2012-07-08 20:16:26).
diff --git a/htdocs/langs/tr_TR/languages.lang b/htdocs/langs/tr_TR/languages.lang
index c301117019a..1da862d74d9 100644
--- a/htdocs/langs/tr_TR/languages.lang
+++ b/htdocs/langs/tr_TR/languages.lang
@@ -1,4 +1,4 @@
-/*
+/*
  * Language code: tr_TR
  * Manually generated
  * Generation date 2012-07-08 14:18:26
diff --git a/htdocs/langs/tr_TR/ldap.lang b/htdocs/langs/tr_TR/ldap.lang
index b1bc969c5aa..8f79749dabd 100644
--- a/htdocs/langs/tr_TR/ldap.lang
+++ b/htdocs/langs/tr_TR/ldap.lang
@@ -1,4 +1,4 @@
-/*
+/*
  * Language code: tr_TR
  * Manually generated
  * Generation date 2012-07-24 00:13:26
diff --git a/htdocs/langs/tr_TR/mails.lang b/htdocs/langs/tr_TR/mails.lang
index 53f532d9357..ce18e998dd5 100644
--- a/htdocs/langs/tr_TR/mails.lang
+++ b/htdocs/langs/tr_TR/mails.lang
@@ -1,4 +1,4 @@
-/*
+/*
  * Language code: tr_TR
  * Automatic generated via autotranslator.php tool
  * Generation date 2010-03-15 19:05:26
diff --git a/htdocs/langs/tr_TR/members.lang b/htdocs/langs/tr_TR/members.lang
index fc201e9e829..cef9b7f6b15 100644
--- a/htdocs/langs/tr_TR/members.lang
+++ b/htdocs/langs/tr_TR/members.lang
@@ -1,4 +1,4 @@
-/*
+/*
  * Language code: tr_TR
  * Manually generated
  * Generation date 2012-07-24 12:07:26
diff --git a/htdocs/langs/tr_TR/orders.lang b/htdocs/langs/tr_TR/orders.lang
index de91b89e703..2cd5e8556a5 100644
--- a/htdocs/langs/tr_TR/orders.lang
+++ b/htdocs/langs/tr_TR/orders.lang
@@ -1,4 +1,4 @@
-/*
+/*
  * Language code: tr_TR
  * Manually generated
  * Generation date 2012-07-07 21:26:26
diff --git a/htdocs/langs/tr_TR/oscommerce.lang b/htdocs/langs/tr_TR/oscommerce.lang
index 3d56e76891c..ae91673545b 100644
--- a/htdocs/langs/tr_TR/oscommerce.lang
+++ b/htdocs/langs/tr_TR/oscommerce.lang
@@ -1,4 +1,4 @@
-/*
+/*
  * Language code: tr_TR
  * Manually generated 
  * Generation date 2012-07-23 22:30:26
diff --git a/htdocs/langs/tr_TR/paybox.lang b/htdocs/langs/tr_TR/paybox.lang
index 3cad0605db2..1c861e6d7c4 100644
--- a/htdocs/langs/tr_TR/paybox.lang
+++ b/htdocs/langs/tr_TR/paybox.lang
@@ -1,4 +1,4 @@
-/*
+/*
  * Language code: tr_TR
  * Manually generated
  * Generation date 2012-07-23 23:43:26
diff --git a/htdocs/langs/tr_TR/paypal.lang b/htdocs/langs/tr_TR/paypal.lang
index 146435bf87c..564b68d5220 100644
--- a/htdocs/langs/tr_TR/paypal.lang
+++ b/htdocs/langs/tr_TR/paypal.lang
@@ -1,4 +1,4 @@
-/*
+/*
  * Language code: tr_TR
  * Manually generated
  * Generation date 2012-07-23 23:40:49
diff --git a/htdocs/langs/tr_TR/projects.lang b/htdocs/langs/tr_TR/projects.lang
index e17897b45ba..0dc73e79aa5 100644
--- a/htdocs/langs/tr_TR/projects.lang
+++ b/htdocs/langs/tr_TR/projects.lang
@@ -1,4 +1,4 @@
-* Manually generated
+* Manually generated
  * Generation date 2012-07-08 14:42:26
 
 
diff --git a/htdocs/langs/tr_TR/propal.lang b/htdocs/langs/tr_TR/propal.lang
index 27a9667afce..517827ce9ca 100644
--- a/htdocs/langs/tr_TR/propal.lang
+++ b/htdocs/langs/tr_TR/propal.lang
@@ -1,4 +1,4 @@
-/*
+/*
  * Language code: tr_TR
  * Manually generated
  * Generation date 2012-07-05 10:49:00
diff --git a/htdocs/langs/tr_TR/sendings.lang b/htdocs/langs/tr_TR/sendings.lang
index 6df5fabbbb2..1d7ce3a85a7 100644
--- a/htdocs/langs/tr_TR/sendings.lang
+++ b/htdocs/langs/tr_TR/sendings.lang
@@ -1,4 +1,4 @@
-/*
+/*
  * Language code: tr_TR
  * Manually generated
  * Generation date 2012-07-15 11:38:26
diff --git a/htdocs/langs/tr_TR/shop.lang b/htdocs/langs/tr_TR/shop.lang
index 57117de8bc9..1bc2ca813f8 100644
--- a/htdocs/langs/tr_TR/shop.lang
+++ b/htdocs/langs/tr_TR/shop.lang
@@ -1,4 +1,4 @@
-/*
+/*
  * Language code: tr_TR
  * Manually generated
  * Generation date 2012-06-10 22:05:26
diff --git a/htdocs/langs/tr_TR/sms.lang b/htdocs/langs/tr_TR/sms.lang
index 2e4d352b758..ba194e2692b 100644
--- a/htdocs/langs/tr_TR/sms.lang
+++ b/htdocs/langs/tr_TR/sms.lang
@@ -1,4 +1,4 @@
-/*
+/*
  * Language code: tr_TR
  * Manually generated
  * Generation date 2012-07-17 10:05:49
diff --git a/htdocs/langs/tr_TR/suppliers.lang b/htdocs/langs/tr_TR/suppliers.lang
index fb3f2aa2945..4129859a84c 100644
--- a/htdocs/langs/tr_TR/suppliers.lang
+++ b/htdocs/langs/tr_TR/suppliers.lang
@@ -1,4 +1,4 @@
-/*
+/*
  * Language code: tr_TR
  * Manually generated
  * Generation date 2012-07-08 00:26:26
diff --git a/htdocs/langs/tr_TR/trips.lang b/htdocs/langs/tr_TR/trips.lang
index 25cbd96245b..309f1a8b208 100644
--- a/htdocs/langs/tr_TR/trips.lang
+++ b/htdocs/langs/tr_TR/trips.lang
@@ -1,4 +1,4 @@
-* Manually generated
+* Manually generated
  * Generation date 2012-07-08 17:42:26
 
 
diff --git a/htdocs/langs/tr_TR/users.lang b/htdocs/langs/tr_TR/users.lang
index 7326318255a..dec399268cb 100755
--- a/htdocs/langs/tr_TR/users.lang
+++ b/htdocs/langs/tr_TR/users.lang
@@ -1,4 +1,4 @@
-/*
+/*
  * Language code: tr_TR
  * Manually generated
  * Generation date 2012-06-28 23:08:00
diff --git a/htdocs/langs/tr_TR/withdrawals.lang b/htdocs/langs/tr_TR/withdrawals.lang
index 8bed802645b..22a4a445851 100644
--- a/htdocs/langs/tr_TR/withdrawals.lang
+++ b/htdocs/langs/tr_TR/withdrawals.lang
@@ -1,4 +1,4 @@
-* Manually generated
+* Manually generated
  * Generation date 2012-07-16 23:51:26
 
 // START - Lines manually generated (2012-07-16 23:51:26).
diff --git a/htdocs/langs/tr_TR/workflow.lang b/htdocs/langs/tr_TR/workflow.lang
index 820fa813096..f9b807ca0f0 100644
--- a/htdocs/langs/tr_TR/workflow.lang
+++ b/htdocs/langs/tr_TR/workflow.lang
@@ -1,4 +1,4 @@
-* Manually generated
+* Manually generated
  * Generation date 2012-07-08 21:43:26
 
 // START - Lines manually generated (2012-07-08 21:43:26).
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index bc9cd14a938..a3262e69ec1 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -807,6 +807,7 @@ if (! defined('NOREQUIREMENU'))
 		}
 	}
 	$menumanager = new MenuManager($db, empty($user->societe_id)?0:1);
+	$menumanager->loadMenu();
 }
 
 
diff --git a/htdocs/projet/tasks/index.php b/htdocs/projet/tasks/index.php
index e3dac2b2e85..d61198c8183 100644
--- a/htdocs/projet/tasks/index.php
+++ b/htdocs/projet/tasks/index.php
@@ -33,7 +33,7 @@ $langs->load('projects');
 $langs->load('users');
 
 $id=GETPOST('id','int');
-$search_product=GETPOST('search_product');
+$search_project=GETPOST('search_project');
 
 
 // Security check
@@ -85,7 +85,7 @@ $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user,$mine,1,$so
 
 // Get list of tasks in tasksarray and taskarrayfiltered
 // We need all tasks (even not limited to a user because a task to user can have a parent that is not affected to him).
-$tasksarray=$taskstatic->getTasksArray(0, 0, $projectstatic->id, $socid, 0, $search_product);
+$tasksarray=$taskstatic->getTasksArray(0, 0, $projectstatic->id, $socid, 0, $search_project);
 // We load also tasks limited to a particular user
 $tasksrole=($mine ? $taskstatic->getUserRolesForProjectsOrTasks(0,$user,$projectstatic->id,0) : '');
 
@@ -106,7 +106,7 @@ print "</tr>\n";
 
 print '<tr class="liste_titre">';
 print '<td class="liste_titre">';
-print '<input type="text" class="flat" name="search_product" value="'.$search_product.'" size="8">';
+print '<input type="text" class="flat" name="search_project" value="'.$search_project.'" size="8">';
 print '</td>';
 print '<td class="liste_titre" colspan="5">';
 print '&nbsp;';
diff --git a/htdocs/societe/class/address.class.php b/htdocs/societe/class/address.class.php
index 4c3e7cc45ae..4f9b100cd83 100644
--- a/htdocs/societe/class/address.class.php
+++ b/htdocs/societe/class/address.class.php
@@ -42,7 +42,6 @@ class Address
 	var $town;
 	var $country_id;
 	var $country_code;
-	var $tel;			// deprecated
 	var $phone;
 	var $fax;
 	var $note;
@@ -195,7 +194,7 @@ class Address
 			$sql.= ", town = ".($this->town?"'".$this->db->escape($this->town)."'":"null");
 			$sql.= ", fk_pays = '" . ($this->country_id?$this->country_id:'0') ."'";
 			$sql.= ", note = ".($this->note?"'".$this->db->escape($this->note)."'":"null");
-			$sql.= ", tel = ".($this->phone?"'".$this->db->escape($this->phone)."'":"null");
+			$sql.= ", phone = ".($this->phone?"'".$this->db->escape($this->phone)."'":"null");
 			$sql.= ", fax = ".($this->fax?"'".$this->db->escape($this->fax)."'":"null");
 			if ($user) $sql .= ",fk_user_modif = '".$user->id."'";
 			$sql .= " WHERE fk_soc = '" . $socid ."' AND rowid = '" . $id ."'";
@@ -267,7 +266,7 @@ class Address
 			{
 				$sql = 'SELECT a.rowid as id, a.label, a.name, a.address, a.datec as dc';
 				$sql .= ', a.tms as date_update, a.fk_soc';
-				$sql .= ', a.zip, a.town, a.note, a.fk_pays as country_id, a.tel, a.fax';
+				$sql .= ', a.zip, a.town, a.note, a.fk_pays as country_id, a.phone, a.fax';
 				$sql .= ', p.code as country_code, p.libelle as country';
 				$sql .= ' FROM '.MAIN_DB_PREFIX.'societe_address as a';
 				$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_pays as p ON a.fk_pays = p.rowid';
@@ -295,14 +294,10 @@ class Address
 						$line->country_id		= $objp->country_id;
 						$line->country_code		= $objp->country_id?$objp->country_code:'';
 						$line->country			= $objp->country_id?($langs->trans('Country'.$objp->country_code)!='Country'.$objp->country_code?$langs->trans('Country'.$objp->country_code):$objp->country):'';
-						$line->phone			= $objp->tel;
+						$line->phone			= $objp->phone;
 						$line->fax				= $objp->fax;
 						$line->note				= $objp->note;
 
-						// deprecated
-						$line->pays				= $line->country;
-						$line->tel				= $line->phone;
-
 						$this->lines[$i]		= $line;
 						$i++;
 					}
@@ -342,7 +337,7 @@ class Address
 
 		$sql = 'SELECT a.rowid, a.fk_soc, a.label, a.name, a.address, a.datec as date_creation';
 		$sql .= ', a.tms as date_update';
-		$sql .= ', a.zip, a.town, a.note, a.fk_pays as country_id, a.tel, a.fax';
+		$sql .= ', a.zip, a.town, a.note, a.fk_pays as country_id, a.phone, a.fax';
 		$sql .= ', p.code as country_code, p.libelle as country';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'societe_address as a';
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_pays as p ON a.fk_pays = p.rowid';
@@ -370,13 +365,10 @@ class Address
 				$this->country_code 	= $obj->country_id?$obj->country_code:'';
 				$this->country			= $obj->country_id?($langs->trans('Country'.$obj->country_code)!='Country'.$obj->country_code?$langs->trans('Country'.$obj->country_code):$obj->country):'';
 
-				$this->phone			= $obj->tel;
+				$this->phone			= $obj->phone;
 				$this->fax				= $obj->fax;
 				$this->note				= $obj->note;
 
-				// deprecated
-				$this->tel				= $this->phone;
-
 				$result = 1;
 			}
 			else
diff --git a/htdocs/societe/commerciaux.php b/htdocs/societe/commerciaux.php
index 141e76a892b..5f0f7af2410 100644
--- a/htdocs/societe/commerciaux.php
+++ b/htdocs/societe/commerciaux.php
@@ -37,6 +37,7 @@ $socid = isset($_GET["socid"])?$_GET["socid"]:'';
 if ($user->societe_id) $socid=$user->societe_id;
 $result = restrictedArea($user, 'societe','','');
 
+$hookmanager->initHooks(array('salesrepresentativescard'));
 
 /*
  *	Actions
@@ -44,12 +45,22 @@ $result = restrictedArea($user, 'societe','','');
 
 if($_GET["socid"] && $_GET["commid"])
 {
+	$action = 'add';
+	
 	if ($user->rights->societe->creer)
 	{
+
 		$soc = new Societe($db);
 		$soc->id = $_GET["socid"];
 		$soc->fetch($_GET["socid"]);
-		$soc->add_commercial($user, $_GET["commid"]);
+
+	
+		$parameters=array('id'=>$_GET["commid"]);
+		$reshook=$hookmanager->executeHooks('doActions',$parameters,$soc,$action);    // Note that $action and $object may have been modified by some hooks
+		$error=$hookmanager->error; $errors=array_merge($errors, (array) $hookmanager->errors);		
+
+
+		if (empty($reshook)) $soc->add_commercial($user, $_GET["commid"]);
 
 		header("Location: commerciaux.php?socid=".$soc->id);
 		exit;
@@ -63,12 +74,20 @@ if($_GET["socid"] && $_GET["commid"])
 
 if($_GET["socid"] && $_GET["delcommid"])
 {
+	$action = 'delete';	
+	
 	if ($user->rights->societe->creer)
 	{
 		$soc = new Societe($db);
 		$soc->id = $_GET["socid"];
 		$soc->fetch($_GET["socid"]);
-		$soc->del_commercial($user, $_GET["delcommid"]);
+		
+		$parameters=array('id'=>$_GET["delcommid"]);
+		$reshook=$hookmanager->executeHooks('doActions',$parameters,$soc,$action);    // Note that $action and $object may have been modified by some hooks
+		$error=$hookmanager->error; $errors=array_merge($errors, (array) $hookmanager->errors);		
+		
+		
+		if (empty($reshook)) $soc->del_commercial($user, $_GET["delcommid"]);
 
 		header("Location: commerciaux.php?socid=".$soc->id);
 		exit;
@@ -96,6 +115,8 @@ if ($_GET["socid"])
 	$soc->id = $_GET["socid"];
 	$result=$soc->fetch($_GET["socid"]);
 
+	$action='view';
+	
 	$head=societe_prepare_head2($soc);
 
 	dol_fiche_head($head, 'salesrepresentative', $langs->trans("ThirdParty"),0,'company');
@@ -158,6 +179,13 @@ if ($_GET["socid"])
 		{
 			$obj = $db->fetch_object($resql);
 
+ 			$parameters=array('socid'=>$soc->id);
+        	$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$obj,$action);    // Note that $action and $object may have been modified by hook
+      		if (empty($reshook)) {
+      			
+				null; // actions in normal case
+      		}
+
 			print '<a href="'.DOL_URL_ROOT.'/user/fiche.php?id='.$obj->rowid.'">';
 			print img_object($langs->trans("ShowUser"),"user").' ';
 			print $obj->firstname." " .$obj->name."\n";
diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php
index 1908e145b2e..b45bf5a8e59 100644
--- a/htdocs/societe/soc.php
+++ b/htdocs/societe/soc.php
@@ -1253,7 +1253,7 @@ else
             print '</td></tr>';
 
             // Address
-            print '<tr><td valign="top">'.$langs->trans('Address').'</td><td colspan="3"><textarea name="adresse" cols="40" rows="3" wrap="soft">';
+            print '<tr><td valign="top">'.$langs->trans('Address').'</td><td colspan="3"><textarea name="address" cols="40" rows="3" wrap="soft">';
             print $object->address;
             print '</textarea></td></tr>';
 
diff --git a/htdocs/societe/societe.php b/htdocs/societe/societe.php
index 9147d550242..5792661dd5e 100644
--- a/htdocs/societe/societe.php
+++ b/htdocs/societe/societe.php
@@ -85,6 +85,7 @@ if ($mode == 'search')
 	$sql.= " OR s.code_client LIKE '%".$db->escape($socname)."%'";
 	$sql.= " OR s.email LIKE '%".$db->escape($socname)."%'";
 	$sql.= " OR s.url LIKE '%".$db->escape($socname)."%'";
+	$sql.= " OR s.siren LIKE '%".$db->escape($socname)."%'";
 
 	if (!empty($conf->barcode->enabled))
 	{
diff --git a/htdocs/theme/amarok/ckeditor/config.js b/htdocs/theme/amarok/ckeditor/config.js
index 699f7d61ec7..0f3a3eb60d3 100755
--- a/htdocs/theme/amarok/ckeditor/config.js
+++ b/htdocs/theme/amarok/ckeditor/config.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
diff --git a/htdocs/theme/amarok/style.css.php b/htdocs/theme/amarok/style.css.php
index db971ab0799..44c08732d13 100755
--- a/htdocs/theme/amarok/style.css.php
+++ b/htdocs/theme/amarok/style.css.php
@@ -1,8 +1,9 @@
 <?php
-/* Copyright (C) 2012	Nicolas Péré		<nicolas@amarok2.net>
- * Copyright (C) 2012	Xavier Peyronnet	<xavier.peyronnet@free.fr>
- * Copyright (C) 2012	Regis Houssin		<regis.houssin@capnetworks.com>
- * Copyright (C) 2012	Juanjo Menent		<jmenent@2byte.es>
+/* Copyright (C) 2012	Nicolas Péré			<nicolas@amarok2.net>
+ * Copyright (C) 2012	Xavier Peyronnet		<xavier.peyronnet@free.fr>
+ * Copyright (C) 2012	Regis Houssin			<regis.houssin@capnetworks.com>
+ * Copyright (C) 2012	Juanjo Menent			<jmenent@2byte.es>
+ * 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
@@ -58,14 +59,16 @@ $left=($langs->trans("DIRECTION")=='rtl'?'right':'left');
 $fontsize=empty($conf->browser->phone)?'12':'12';
 $fontsizesmaller=empty($conf->browser->phone)?'11':'11';
 
-$path='';    // This value may be used in future for external module to overwrite theme
+$path='';    		// This value may be used in future for external module to overwrite theme
+$theme='amarok';	// Value of theme
+if (! empty($conf->global->MAIN_OVERWRITE_THEME_RES)) { $path='/'.$conf->global->MAIN_OVERWRITE_THEME_RES; $theme=$conf->global->MAIN_OVERWRITE_THEME_RES; }
 
 // Define image path files
 $fontlist='helvetica,arial,tahoma,verdana';    //$fontlist='Verdana,Helvetica,Arial,sans-serif';
 //'/theme/auguria/img/menus/trtitle.png';
-$img_liste_titre=dol_buildpath($path.'/theme/amarok/img/menus/trtitle.png',1);
-$img_head=dol_buildpath($path.'/theme/amarok/img/headbg2.jpg',1);
-$img_button=dol_buildpath($path.'/theme/amarok/img/button_bg.png',1);
+$img_liste_titre=dol_buildpath($path.'/theme/'.$theme.'/img/menus/trtitle.png',1);
+$img_head=dol_buildpath($path.'/theme/'.$theme.'/img/headbg2.jpg',1);
+$img_button=dol_buildpath($path.'/theme/'.$theme.'/img/button_bg.png',1);
 
 ?>
 
@@ -84,12 +87,12 @@ body {
 	background-color:#f5f5f5;
 	<?php if ($_SESSION['dol_login'] != '') {?>
 	<?php if (GETPOST("optioncss") != 'print') {?>
-	background-image:url(<?php echo DOL_URL_ROOT.'/theme/amarok/img/vmenu.png' ?>);
+	background-image:url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/vmenu.png',1); ?>);
 	background-repeat:repeat-y;
 	margin:0px;
 	<?php } ?>
 	<?php } else {?>
-	background-image:url(<?php echo DOL_URL_ROOT.'/theme/amarok/img/background_login.png' ?>);
+	background-image:url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/background_login.png',1); ?>);
 	margin:100px;
 	<?php } ?>
 	color:#232323;
@@ -145,6 +148,9 @@ input.flat {
 
 input:disabled {background:#b6b6b6;}
 
+input[type=checkbox] { background-color: transparent; border: none; box-shadow: none; }
+input[type=image] { background-color: transparent; border: none; box-shadow: none; }
+
 textarea.flat {
 	font-size:<?php print $fontsize ?>px;
 	font-family:<?php print $fontlist ?>;
@@ -344,7 +350,7 @@ div.tmenu {
 	right:0;
     white-space:nowrap;
 	height:36px;
-	line-height:36px;
+	<?php if ($conf->browser->name != 'ie') echo "line-height:36px; /* disabled for ie9 */ \n"; ?>
 	background:#333333;
     background-image:linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(0,0,0,.3) 100%);
 	background-image:-o-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(0,0,0,.3) 100%);
@@ -1131,21 +1137,21 @@ tr.fiche {
 
 .ok {
 	color:#159e26;
-	background:url(<?php echo DOL_URL_ROOT.'/theme/amarok/img/ok.png' ?>) left center no-repeat;
+	background:url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/ok.png',1); ?>) left center no-repeat;
 	padding-left:20px;
 	font-weight:bold;
 }
 
 .warning {
 	color:#bca936;
-	background:url(<?php echo DOL_URL_ROOT.'/theme/amarok/img/warning.png' ?>) left center no-repeat;
+	background:url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/warning.png',1); ?>) left center no-repeat;
 	padding-left:20px;
 	font-weight:bold;
 }
 
 .error {
 	color:#a61111;
-	background:url(<?php echo DOL_URL_ROOT.'/theme/amarok/img/error.png' ?>) left center no-repeat;
+	background:url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/error.png',1); ?>) left center no-repeat;
 	padding-left:20px;
 	font-weight:bold;
 }
@@ -1153,7 +1159,7 @@ tr.fiche {
 td.highlights {background:#f9c5c6;}
 
 div.ok {
-	background:#61e372 url(<?php echo DOL_URL_ROOT.'/theme/amarok/img/ok.png' ?>) 3px center no-repeat;
+	background:#61e372 url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/ok.png',1); ?>) 3px center no-repeat;
 	color:#ffffff;
 	padding:2px 4px 2px 24px;
 	margin:0.5em 0em;
@@ -1162,7 +1168,7 @@ div.ok {
 }
 
 div.warning, div.info {
-	background:#fcf5b8 url(<?php echo DOL_URL_ROOT.'/theme/amarok/img/warning.png' ?>) 3px center no-repeat;
+	background:#fcf5b8 url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/warning.png',1); ?>) 3px center no-repeat;
 	color:#232323;
 	padding:2px 4px 2px 24px;
 	margin:0.5em 0em;
@@ -1171,7 +1177,7 @@ div.warning, div.info {
 }
 
 div.error {
-	background:#f58080 url(<?php echo DOL_URL_ROOT.'/theme/amarok/img/error.png' ?>) 3px center no-repeat;
+	background:#f58080 url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/error.png',1); ?>) 3px center no-repeat;
 	color:#ffffff;
 	padding:2px 4px 2px 24px;
 	margin:0.5em 0em;
@@ -1560,7 +1566,7 @@ li.cal_event       { border: none; list-style-type: none; }
 /* ============================================================================== */
 
 .ui-widget {font-family:Verdana,Arial,sans-serif; font-size:0.9em;}
-.ui-autocomplete-loading {background:#ffffff url(<?php echo DOL_URL_ROOT.'/theme/amarok/img/working.gif' ?>) right center no-repeat;}
+.ui-autocomplete-loading {background:#ffffff url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/working.gif',1); ?>) right center no-repeat;}
 
 
 /* ============================================================================== */
diff --git a/htdocs/theme/auguria/style.css.php b/htdocs/theme/auguria/style.css.php
index 745fa89d7d9..206bf49e442 100644
--- a/htdocs/theme/auguria/style.css.php
+++ b/htdocs/theme/auguria/style.css.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2004-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
+/* Copyright (C) 2004-2013 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C)      2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2007-2011 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2012	   Juanjo Menent		<jmenent@2byte.es>
@@ -56,14 +56,16 @@ $left=($langs->trans("DIRECTION")=='rtl'?'right':'left');
 $fontsize=empty($conf->browser->phone)?'12':'12';
 $fontsizesmaller=empty($conf->browser->phone)?'11':'11';
 
-$path='';    // This value may be used in future for external module to overwrite theme
+$path='';    		// This value may be used in future for external module to overwrite theme
+$theme='auguria';	// Value of theme
+if (! empty($conf->global->MAIN_OVERWRITE_THEME_RES)) { $path='/'.$conf->global->MAIN_OVERWRITE_THEME_RES; $theme=$conf->global->MAIN_OVERWRITE_THEME_RES; }
 
 // Define image path files
 $fontlist='arial,tahoma,verdana,helvetica';    //$fontlist='Verdana,Helvetica,Arial,sans-serif';
 //'/theme/auguria/img/menus/trtitle.png';
-$img_liste_titre=dol_buildpath($path.'/theme/auguria/img/menus/trtitle.png',1);
-$img_head=dol_buildpath($path.'/theme/auguria/img/headbg2.jpg',1);
-$img_button=dol_buildpath($path.'/theme/auguria/img/button_bg.png',1);
+$img_liste_titre=dol_buildpath($path.'/theme/'.$theme.'/img/menus/trtitle.png',1);
+$img_head=dol_buildpath($path.'/theme/'.$theme.'/img/headbg2.jpg',1);
+$img_button=dol_buildpath($path.'/theme/'.$theme.'/img/button_bg.png',1);
 
 $colorbacklineimpairhover='210,214,217';
 $colorbacklinepairhover='210,214,217';
@@ -126,6 +128,8 @@ input:disabled {
 textarea:disabled {
 	background:#ddd;
 }
+input[type=checkbox] { background-color: transparent; border: none; box-shadow: none; }
+input[type=image] { background-color: transparent; border: none; box-shadow: none; }
 .button {
     font-family: <?php print $fontlist ?>;
 	border: 1px solid #ACBCBB;
@@ -271,7 +275,7 @@ div.tmenu {
     font-weight: normal;
     height: <?php print $heightmenu; ?>px;
     background: #7FAEC6;
-    background-image: url(<?php echo dol_buildpath($path.'/theme/auguria/img/menus/table_bg.gif',1); ?>);
+    background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/table_bg.gif',1); ?>);
 /*    background-position: center bottom; */
     color: #000000;
     text-decoration: none;
@@ -295,52 +299,52 @@ div.mainmenu {
 
 /*
 div.mainmenu.home{
-	background-image: url(<?php echo dol_buildpath($path.'/theme/auguria/img/menus/home.png',1); ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/home.png',1); ?>);
 }
 
 div.mainmenu.companies {
-	background-image: url(<?php echo dol_buildpath($path.'/theme/auguria/img/menus/company.png',1); ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/company.png',1); ?>);
 }
 
 div.mainmenu.products {
-	background-image: url(<?php echo dol_buildpath($path.'/theme/auguria/img/menus/products.png',1); ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/products.png',1); ?>);
 	margin-left: 10px;
 }
 
 div.mainmenu.commercial {
-	background-image: url(<?php echo dol_buildpath($path.'/theme/auguria/img/menus/commercial.png',1); ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/commercial.png',1); ?>);
 }
 
 div.mainmenu.accountancy {
-	background-image: url(<?php echo dol_buildpath($path.'/theme/auguria/img/menus/money.png',1); ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/money.png',1); ?>);
 }
 
 div.mainmenu.project {
-	background-image: url(<?php echo dol_buildpath($path.'/theme/auguria/img/menus/project.png',1); ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/project.png',1); ?>);
 }
 
 div.mainmenu.tools {
-	background-image: url(<?php echo dol_buildpath($path.'/theme/auguria/img/menus/tools.png',1); ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/tools.png',1); ?>);
 }
 
 div.mainmenu.members {
-	background-image: url(<?php echo dol_buildpath($path.'/theme/auguria/img/menus/members.png',1); ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/members.png',1); ?>);
 }
 
 div.mainmenu.shop {
-	background-image: url(<?php echo dol_buildpath($path.'/theme/auguria/img/menus/shop.png',1); ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/shop.png',1); ?>);
 }
 
 div.mainmenu.agenda {
-	background-image: url(<?php echo dol_buildpath($path.'/theme/auguria/img/menus/agenda.png',1); ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/agenda.png',1); ?>);
 }
 
 div.mainmenu.ecm {
-	background-image: url(<?php echo dol_buildpath($path.'/theme/auguria/img/menus/ecm.png',1); ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/ecm.png',1); ?>);
 }
 
 div.mainmenu.cashdesk {
-	background-image: url(<?php echo dol_buildpath($path.'/theme/auguria/img/menus/pointofsale.png',1); ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/pointofsale.png',1); ?>);
 }
 */
 <?php
@@ -384,7 +388,7 @@ foreach($mainmenuusedarray as $val)
 	// Img file not found
 	if (! $found && $generic <= 4)
 	{
-		$url=dol_buildpath($path.'/theme/auguria/img/menus/generic'.$generic.".png",1);
+		$url=dol_buildpath($path.'/theme/'.$theme.'/img/menus/generic'.$generic.".png",1);
 		$found=1;
 		$generic++;
 	}
@@ -409,7 +413,7 @@ foreach($mainmenuusedarray as $val)
 	font-size: 10px;	/* To reduce to have more entries */
 	font-family:Tahoma,sans-serif;
 	text-transform:uppercase;
-	background: url(<?php echo dol_buildpath($path.'/theme/auguria/img/menus/topmenu_bg.png',1) ?>) repeat-x bottom left;
+	background: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/topmenu_bg.png',1) ?>) repeat-x bottom left;
 }
 
 .tmenu ul{
@@ -444,7 +448,7 @@ foreach($mainmenuusedarray as $val)
 
 .tmenu ul li a:hover{
 	color:#fff;
-	background:transparent url(<?php echo dol_buildpath($path.'/theme/auguria/img/menus/topmenu_bg_over.gif',1); ?>) repeat-x bottom left;
+	background:transparent url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/topmenu_bg_over.gif',1); ?>) repeat-x bottom left;
 }
 
 .tmenu ul li a:hover span{
@@ -455,7 +459,7 @@ foreach($mainmenuusedarray as $val)
 
 .tmenu ul li a.tmenusel{
 	color:#fff;
-	background: url(<?php echo dol_buildpath($path.'/theme/auguria/img/menus/topmenu_left.gif',1); ?>) no-repeat top left;
+	background: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/topmenu_left.gif',1); ?>) no-repeat top left;
 	line-height:305%;
 }
 
@@ -463,7 +467,7 @@ foreach($mainmenuusedarray as $val)
 	display:block;
 	padding:4px 8px 0 0;
 	width:auto;
-	background: url(<?php echo dol_buildpath($path.'/theme/auguria/img/menus/topmenu_right.png',1); ?>) no-repeat top right;
+	background: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/topmenu_right.png',1); ?>) no-repeat top right;
 	height:33px;
 }
 
@@ -629,7 +633,7 @@ div.blockvmenuimpair form a.vmenu, div.blockvmenupair form a.vmenu
 
 div.menu_titre
 {
-	background: url(<?php echo dol_buildpath($path.'/theme/auguria/img/bg-titre-rubrique.png',1); ?>);
+	background: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/bg-titre-rubrique.png',1); ?>);
 	padding: 0px;
 	padding-top:5px;
 	padding-left:0px;
@@ -689,7 +693,7 @@ div.blockvmenuhelp
 }
 
 div.menu_contenu {
-	background: url(<?php echo dol_buildpath($path.'/theme/auguria/img/bg-rubrique.png',1); ?>);
+	background: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/bg-rubrique.png',1); ?>);
 	padding: 8px 0px 0px 0px;
 	margin: 0px;
 	padding: 1px;
@@ -702,7 +706,7 @@ div.menu_contenu {
 }
 
 div.menu_end {
-	background: url(<?php echo dol_buildpath($path.'/theme/auguria/img/bg-bas-rubrique.png',1); ?>);
+	background: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/bg-bas-rubrique.png',1); ?>);
 /*	border-top: 1px solid #436981; */
 	margin: 0px;
 	padding: 0px;
@@ -984,7 +988,7 @@ div.tabBar {
     border-bottom: 1px solid #555555;
     border-left: 1px solid #D0D0D0;
     border-top: 1px solid #D8D8D8;
-    background: #dee7ec url(<?php echo dol_buildpath($path.'/theme/auguria/img/tab_background.png',1) ?>) repeat-x;
+    background: #dee7ec url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/tab_background.png',1) ?>) repeat-x;
 }
 
 div.tabsAction {
@@ -1160,7 +1164,7 @@ span.butAction, span.butActionDelete {
 }
 /*
 #undertopmenu {
-background-image: url("<?php echo dol_buildpath($path.'/theme/auguria/img/gradient.gif',1); ?>");
+background-image: url("<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/gradient.gif',1); ?>");
 background-repeat: repeat-x;
 }
 */
@@ -1724,7 +1728,7 @@ li.cal_event       { border: none; list-style-type: none; }
 /* ============================================================================== */
 
 .ui-widget { font-family: Verdana,Arial,sans-serif; font-size: 0.9em; }
-.ui-autocomplete-loading { background: white url(<?php echo dol_buildpath($path.'/theme/auguria/img/working.gif',1) ?>) right center no-repeat; }
+.ui-autocomplete-loading { background: white url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/working.gif',1) ?>) right center no-repeat; }
 
 
 /* ============================================================================== */
@@ -1732,12 +1736,12 @@ li.cal_event       { border: none; list-style-type: none; }
 /* ============================================================================== */
 
 .editkey_textarea, .editkey_ckeditor, .editkey_string, .editkey_email, .editkey_numeric, .editkey_select, .editkey_autocomplete {
-	background: url(<?php echo dol_buildpath($path.'/theme/auguria/img/edit.png',1) ?>) right top no-repeat;
+	background: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/edit.png',1) ?>) right top no-repeat;
 	cursor: pointer;
 }
 
 .editkey_datepicker {
-	background: url(<?php echo dol_buildpath($path.'/theme/auguria/img/calendar.png',1) ?>) right center no-repeat;
+	background: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/calendar.png',1) ?>) right center no-repeat;
 	cursor: pointer;
 }
 
@@ -2000,7 +2004,7 @@ div.tablelines {
 div.thead {
 	height: 24px;
 	background: #7699A9;
-	background-image: url(<?php echo dol_buildpath($path.'/theme/auguria/img/menus/trtitle.png',1); ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/trtitle.png',1); ?>);
 	background-repeat: repeat-x;
 	color: #FFFFFF;
 	font-family: <?php print $fontlist ?>;
diff --git a/htdocs/theme/bureau2crea/style.css.php b/htdocs/theme/bureau2crea/style.css.php
index 1a2cd4fdcff..6f806f4594f 100644
--- a/htdocs/theme/bureau2crea/style.css.php
+++ b/htdocs/theme/bureau2crea/style.css.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2004-2010	Laurent Destailleur  <eldy@users.sourceforge.net>
+/* Copyright (C) 2004-2013	Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2006		Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2007-2010	Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2011		Philippe Grand       <philippe.grand@atoo-net.com>
@@ -60,6 +60,10 @@ $fontsizesmaller=empty($conf->browser->phone)?'11':'11';
 $fontlist='arial,tahoma,verdana,helvetica';
 //$fontlist='Verdana,Helvetica,Arial,sans-serif';
 
+$path='';    			// This value may be used in future for external module to overwrite theme
+$theme='bureau2crea';	// Value of theme
+if (! empty($conf->global->MAIN_OVERWRITE_THEME_RES)) { $path='/'.$conf->global->MAIN_OVERWRITE_THEME_RES; $theme=$conf->global->MAIN_OVERWRITE_THEME_RES; }
+
 ?>
 
 /* ============================================================================== */
@@ -139,8 +143,11 @@ textarea:disabled {
 	background:#ddd;
 }
 
+
+input[type=checkbox] { background-color: transparent; border: none; box-shadow: none; }
+input[type=image] { background-color: transparent; border: none; box-shadow: none; }
 input.button[type=submit] {
-	background-image: url(<?php echo DOL_URL_ROOT.'/theme/bureau2crea/img/bg_btnGreen.jpg' ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/bg_btnGreen.jpg',1); ?>);
     display: block;
     height: 18px;
     line-height: 16px;
@@ -157,7 +164,7 @@ input.button[type=submit] {
 .button {
     font-family: <?php print $fontlist ?>;
 	border: 0px;
-	background-image: url(<?php echo DOL_URL_ROOT.'/theme/bureau2crea/img/button_bg.png' ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/button_bg.png',1); ?>);
 	background-position: bottom;
     padding: 0px 2px 0px 2px;
     margin: 0px 0px 0px 0px;
@@ -166,7 +173,7 @@ input.button[type=submit] {
     font-family: <?php print $fontlist ?>;
 	color: #222244;
 	border: 0px;
-	background-image: url(<?php echo DOL_URL_ROOT.'/theme/bureau2crea/img/button_bg.png' ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/button_bg.png',1); ?>);
 	background-position: bottom;
     padding: 0px 2px 0px 2px;
     margin: 0px 0px 0px 0px;
@@ -174,7 +181,7 @@ input.button[type=submit] {
 .buttonajax {
     font-family: <?php print $fontlist ?>;
 	border: 0px;
-	background-image: url(<?php echo DOL_URL_ROOT.'/theme/bureau2crea/img/button_bg.png' ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/button_bg.png',1); ?>);
 	background-position: bottom;
     padding: 0px 0px 0px 0px;
     margin: 0px 0px 0px 0px;
@@ -313,7 +320,7 @@ div.tmenu {
     padding: 0px;
     margin: 5px 0px 10px 0px;
     font-size: 13px;
-    background-image : url(<?php echo DOL_URL_ROOT.'/theme/bureau2crea/img/bg_mainNav.jpg' ?>);
+    background-image : url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/bg_mainNav.jpg',1); ?>);
     background-repeat: no-repeat;
     background-color: #996644;
     height: 22px;
@@ -338,56 +345,56 @@ div.mainmenu {
 
 /*
 div.mainmenu.home{
-	background-image: url(<?php echo DOL_URL_ROOT.'/theme/bureau2crea/img/menus/home.png' ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/home.png',1); ?>);
 }
 
 div.mainmenu.companies {
-	background-image: url(<?php echo DOL_URL_ROOT.'/theme/bureau2crea/img/menus/company.png' ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/company.png',1); ?>);
 }
 
 div.mainmenu.products {
-	background-image: url(<?php echo DOL_URL_ROOT.'/theme/bureau2crea/img/menus/products.png' ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/products.png',1); ?>);
 	margin-left: 10px;
 }
 
 div.mainmenu.commercial {
-	background-image: url(<?php echo DOL_URL_ROOT.'/theme/bureau2crea/img/menus/commercial.png' ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/commercial.png',1); ?>);
 }
 
 div.mainmenu.accountancy {
-	background-image: url(<?php echo DOL_URL_ROOT.'/theme/bureau2crea/img/menus/money.png' ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/money.png',1); ?>);
 }
 
 div.mainmenu.bank {
-    background-image: url(<?php echo DOL_URL_ROOT.'/theme/bureau2crea/img/menus/bank.png' ?>);
+    background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/bank.png',1); ?>);
 }
 
 div.mainmenu.project {
-	background-image: url(<?php echo DOL_URL_ROOT.'/theme/bureau2crea/img/menus/project.png' ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/project.png',1); ?>);
 }
 
 div.mainmenu.tools {
-	background-image: url(<?php echo DOL_URL_ROOT.'/theme/bureau2crea/img/menus/tools.png' ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/tools.png',1); ?>);
 }
 
 div.mainmenu.members {
-	background-image: url(<?php echo DOL_URL_ROOT.'/theme/bureau2crea/img/menus/members.png' ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/members.png',1); ?>);
 }
 
 div.mainmenu.shop {
-	background-image: url(<?php echo DOL_URL_ROOT.'/theme/bureau2crea/img/menus/shop.png' ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/shop.png',1); ?>);
 }
 
 div.mainmenu.agenda {
-	background-image: url(<?php echo DOL_URL_ROOT.'/theme/bureau2crea/img/menus/agenda.png' ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/agenda.png',1); ?>);
 }
 
 div.mainmenu.ecm {
-	background-image: url(<?php echo DOL_URL_ROOT.'/theme/bureau2crea/img/menus/ecm.png' ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/ecm.png',1); ?>);
 }
 
 div.mainmenu.cashdesk {
-	background-image: url(<?php echo DOL_URL_ROOT.'/theme/bureau2crea/img/menus/pointofsale.png' ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/pointofsale.png',1); ?>);
 }
 */
 <?php
@@ -423,7 +430,7 @@ foreach($mainmenuusedarray as $val)
 	{
 		if (file_exists($dirroot."/".$val."/img/".$val.".png"))
 		{
-			$url=DOL_URL_ROOT.'/'.$val.'/img/'.$val.'.png';
+			$url=dol_buildpath($path.'/'.$val.'/img/'.$val.'.png',1);
 			$found=1;
 			break;
 		}
@@ -431,7 +438,7 @@ foreach($mainmenuusedarray as $val)
 	// Img file not found
 	if (! $found && $generic <= 4)
 	{
-		$url=DOL_URL_ROOT."/theme/bureau2crea/img/menus/generic".$generic.".png";
+		$url=dol_buildpath($path.'/theme/'.$theme.'/img/menus/generic'.$generic.'.png',1);
 		$found=1;
 		$generic++;
 	}
@@ -506,7 +513,7 @@ li.tmenu .tmenusel, li.tmenusel .tmenusel {
 }
 
 li.tmenusel {
-    background-image : url(<?php echo DOL_URL_ROOT.'/theme/bureau2crea/img/bg_tmenusel_btnD.jpg' ?>);
+    background-image : url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/bg_tmenusel_btnD.jpg',1); ?>);
     background-position: right;
 }
 
@@ -652,7 +659,7 @@ div.blockvmenupair
 	border-spacing: 0px;
 	padding: 0px;
 	width: 100%;
-    background-image: url(<?php echo DOL_URL_ROOT.'/theme/bureau2crea/img/bg_leftCategorie.jpg' ?>);
+    background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/bg_leftCategorie.jpg',1); ?>);
     background-position: top right;
     background-repeat: no-repeat;
 
@@ -663,7 +670,7 @@ div.blockvmenuimpair
 	border-spacing: 0px;
 	padding: 0px;
 	width: 100%;
-    background-image: url(<?php echo DOL_URL_ROOT.'/theme/bureau2crea/img/bg_leftCategorie.jpg' ?>);
+    background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/bg_leftCategorie.jpg',1); ?>);
     background-position: top right;
     background-repeat: no-repeat;
 
@@ -708,7 +715,7 @@ div.blockvmenusearch
 	margin: 3px 0px 15px 0px;
 	padding: 25px 0px 2px 2px;
 	width: 180px;
-    background-image: url(<?php echo DOL_URL_ROOT.'/theme/bureau2crea/img/bg_leftMenu.jpg' ?>);
+    background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/bg_leftMenu.jpg',1); ?>);
     background-position: top right;
     background-repeat: no-repeat;
 }
@@ -743,7 +750,7 @@ div.blockvmenubookmarks
 	border-spacing: 0px;
 	padding: 0px;
 	width: 100%;
-    background-image: url(<?php echo DOL_URL_ROOT.'/theme/bureau2crea/img/bg_leftCategorie.jpg' ?>);
+    background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/bg_leftCategorie.jpg',1); ?>);
     background-position: top right;
     background-repeat: no-repeat;
     margin-bottom: 15px;
@@ -841,7 +848,7 @@ td.photo {
 /* ============================================================================== */
 
 .toolbar {
-    background-image: url(<?php echo DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/tmenu2.png' ?>) !important;
+    background-image: url(<?php echo dol_buildpath($path.'/theme/'.$conf->theme.'/img/tmenu2.png',1); ?>) !important;
     background-repeat: repeat-x !important;
     border: 1px solid #BBB !important;
 }
@@ -1044,7 +1051,7 @@ div.tabs {
     margin: 0px 0px 10px 0px;
     text-align: left;
     width: 100%;
-    background-image: url(<?php echo DOL_URL_ROOT.'/theme/bureau2crea/img/bg_navHorizontal.jpg' ?>);
+    background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/bg_navHorizontal.jpg',1); ?>);
     height: 25px;
     background-repeat: repeat-x;
     background-position: left;
@@ -1093,7 +1100,7 @@ div.tabs a.tab#active {
 
 div.tabs a.tab span {
 	padding: 0px 10px 0px 10px;
-    background-image: url(<?php echo DOL_URL_ROOT.'/theme/bureau2crea/img/bg_ssmenu_btnG.jpg' ?>);
+    background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/bg_ssmenu_btnG.jpg',1); ?>);
     background-position: left;
     background-repeat: no-repeat;
     display: block;
@@ -1102,7 +1109,7 @@ div.tabs a.tab span {
 }
 
 div.tabs a.tab#active span {
-    background-image: url(<?php echo DOL_URL_ROOT.'/theme/bureau2crea/img/bg_ssmenusel_btnG.jpg' ?>);
+    background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/bg_ssmenusel_btnG.jpg',1); ?>);
 }
 
 div.tabs a.tab:hover {
@@ -1120,7 +1127,7 @@ div.tabs a.tab:hover {
 div.tabBar {
     color: #234046;
     margin: 0px 0px 10px 0px;
-    background: #dee7ec url(<?php echo DOL_URL_ROOT.'/theme/bureau2crea/img/tab_background.png' ?>) repeat-x;
+    background: #dee7ec url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/tab_background.png',1); ?>) repeat-x;
 }
 
 div.tabsAction {
@@ -1241,7 +1248,7 @@ span.tabspan {
 .butAction, .butAction:link, .butAction:visited, .butAction:hover, .butAction:active, .butActionDelete, .butActionDelete:link, .butActionDelete:visited, .butActionDelete:hover, .butActionDelete:active {
 	font-family:"Trebuchet MS",Arial,Helvetica,sans-serif;
 	font-weight: bold;
-	background: url(<?php echo DOL_URL_ROOT.'/theme/bureau2crea/img/bg_btnBlue.jpg' ?>) repeat-x;
+	background: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/bg_btnBlue.jpg',1); ?>) repeat-x;
 	color: #FFF !important;
 	padding: 0px 10px 0px 10px;
 	margin: 0px 10px 0px 10px;
@@ -1259,7 +1266,7 @@ span.tabspan {
 }
 
 .butActionDelete    {
-	background: url(<?php echo DOL_URL_ROOT.'/theme/bureau2crea/img/bg_btnRed.jpg' ?>) repeat-x !important;
+	background: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/bg_btnRed.jpg',1); ?>) repeat-x !important;
     color: #FFF;
 }
 
@@ -1272,7 +1279,7 @@ span.tabspan {
 .butActionRefused {
 	font-family:"Trebuchet MS",Arial,Helvetica,sans-serif;
 	font-weight: bold;
-	background: url(<?php echo DOL_URL_ROOT.'/theme/bureau2crea/img/bg_btnBlue.jpg' ?>) repeat-x;
+	background: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/bg_btnBlue.jpg',1); ?>) repeat-x;
 	color: #AAA !important;
 	padding: 0px 10px 0px 10px;
 	margin: 0px 10px 0px 10px;
@@ -1307,7 +1314,7 @@ span.butAction, span.butActionDelete {
 
 /*
 #undertopmenu {
-background-image: url("<?php echo DOL_URL_ROOT.'/theme/bureau2crea/img/gradient.gif' ?>");
+background-image: url("<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/gradient.gif',1); ?>");
 background-repeat: repeat-x;
 }
 */
@@ -1414,7 +1421,7 @@ table.nobordernopadding td {
 /* For lists */
 
 table.liste {
-    /*background-image: url(<?php echo DOL_URL_ROOT.'/theme/bureau2crea/img/bg_centerBlock-title.jpg' ?>);*/
+    /*background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/bg_centerBlock-title.jpg',1); ?>);*/
     background-repeat: no-repeat;
     background-position: top right;
     vertical-align: text-top;
@@ -1425,7 +1432,7 @@ padding: 0px 5px;
 }
 
 table.noborder {
-    /*background-image: url(<?php echo DOL_URL_ROOT.'/theme/bureau2crea/img/bg_centerBlock-title.jpg' ?>);*/
+    /*background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/bg_centerBlock-title.jpg',1); ?>);*/
     background-repeat: no-repeat;
     background-position: top right;
     vertical-align: text-top;
@@ -1444,7 +1451,7 @@ tr.liste_titre {
 }
 
 tr.liste_titre {
-    background-image: url(<?php echo DOL_URL_ROOT.'/theme/bureau2crea/img/bg_centerBlock-title.jpg' ?>);
+    background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/bg_centerBlock-title.jpg',1); ?>);
     background-position: top right;
 }
 
@@ -1453,7 +1460,7 @@ th.liste_titre_sel, td.liste_titre_sel, th.liste_titre {
 }
 
 tr.liste_titre {
-    background-image: url(<?php echo DOL_URL_ROOT.'/theme/bureau2crea/img/bg_centerBlock-title2.jpg' ?>);
+    background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/bg_centerBlock-title2.jpg',1); ?>);
 }
 
 tr.liste_total {
@@ -1517,7 +1524,7 @@ input.liste_titre {
 tr.liste_total td {
 border-top: 1px solid #DDDDDD;
 background: #F0F0F0;
-/* background-image: url(<?php echo DOL_URL_ROOT.'/theme/login_background.png' ?>); */
+/* background-image: url(<?php echo dol_buildpath($path.'/theme/login_background.png',1); ?>); */
 background-repeat: repeat-x;
 color: #332266;
 font-weight: normal;
@@ -1580,7 +1587,7 @@ tr.pair td.nohover {
 tr.box_titre {
 	height: 24px;
 	background: #7699A9;
-	background-image: url(<?php echo DOL_URL_ROOT.'/theme/bureau2crea/img/menus/trtitle.png' ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/trtitle.png',1); ?>);
 	background-repeat: repeat-x;
 	color: #FFFFFF;
 	font-family: <?php print $fontlist ?>, sans-serif;
@@ -1892,7 +1899,7 @@ li.cal_event       { border: none; list-style-type: none; }
 /* ============================================================================== */
 
 .ui-widget { font-family: Verdana,Arial,sans-serif; font-size: 0.9em; }
-.ui-autocomplete-loading { background: white url(<?php echo DOL_URL_ROOT.'/theme/bureau2crea/img/working.gif' ?>) right center no-repeat; }
+.ui-autocomplete-loading { background: white url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/working.gif',1); ?>) right center no-repeat; }
 
 
 /* ============================================================================== */
@@ -1900,12 +1907,12 @@ li.cal_event       { border: none; list-style-type: none; }
 /* ============================================================================== */
 
 .editkey_textarea, .editkey_ckeditor, .editkey_string, .editkey_email, .editkey_numeric, .editkey_select, .editkey_autocomplete {
-	background: url(<?php echo dol_buildpath($path.'/theme/bureau2crea/img/edit.png',1) ?>) right top no-repeat;
+	background: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/edit.png',1) ?>) right top no-repeat;
 	cursor: pointer;
 }
 
 .editkey_datepicker {
-	background: url(<?php echo dol_buildpath($path.'/theme/bureau2crea/img/calendar.png',1) ?>) right center no-repeat;
+	background: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/calendar.png',1) ?>) right center no-repeat;
 	cursor: pointer;
 }
 
@@ -2101,7 +2108,7 @@ span.cke_skin_kama { padding: 0 !important; }
 a.cke_dialog_ui_button
 {
     font-family: <?php print $fontlist ?> !important;
-	background-image: url(<?php echo DOL_URL_ROOT.'/theme/bureau2crea/img/button_bg.png' ?>) !important;
+	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/button_bg.png',1); ?>) !important;
 	background-position: bottom !important;
     border: 1px solid #ACBCBB !important;
 	padding: 0.1em 0.7em !important;
@@ -2189,7 +2196,7 @@ div#parameterBox {
     height: auto;
     border: 1px solid #666;
     border-top: 2px solid #842F00;
-    background-image: url(<?php echo DOL_URL_ROOT.'/theme/bureau2crea/img/bg_connectionBox.jpg' ?>);
+    background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/bg_connectionBox.jpg',1); ?>);
     background-repeat: no-repeat;
     background-position: top center;
     }
diff --git a/htdocs/theme/cameleo/style.css.php b/htdocs/theme/cameleo/style.css.php
index 2e2f03920c5..c546b606e94 100644
--- a/htdocs/theme/cameleo/style.css.php
+++ b/htdocs/theme/cameleo/style.css.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2004-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
+/* Copyright (C) 2004-2013 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C)      2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2007-2011 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2010-2011 Herve Prot           <herve.prot@symeos.com>
@@ -60,6 +60,9 @@ $fontsizesmaller=empty($conf->browser->phone)?'11':'11';
 $fontlist='arial,tahoma,verdana,helvetica';
 //$fontlist='Verdana,Helvetica,Arial,sans-serif';
 
+$path='';    		// This value may be used in future for external module to overwrite theme
+$theme='cameleo';	// Value of theme
+if (! empty($conf->global->MAIN_OVERWRITE_THEME_RES)) { $path='/'.$conf->global->MAIN_OVERWRITE_THEME_RES; $theme=$conf->global->MAIN_OVERWRITE_THEME_RES; }
 
 ?>
 
@@ -71,7 +74,7 @@ body {
 <?php if (GETPOST("optioncss") == 'print') {  ?>
 	background-color: #FFFFFF;
 <?php } else { ?>
-	/*background: #ffffff url(<?php echo DOL_URL_ROOT.'/theme/cameleo/img/headbg2.jpg' ?>) 0 0 no-repeat;*/
+	/*background: #ffffff url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/headbg2.jpg',1); ?>) 0 0 no-repeat;*/
 <?php } ?>
 	color: #101010;
 	font-size: <?php print $fontsize ?>px;
@@ -108,7 +111,8 @@ input:disabled {
 textarea:disabled {
 	background:#ddd;
 }
-
+input[type=checkbox] { background-color: transparent; border: none; box-shadow: none; }
+input[type=image] { background-color: transparent; border: none; box-shadow: none; }
 input.button[type=submit] {
 	background: #A51B00;
 	-moz-border-radius:8px;
@@ -135,7 +139,7 @@ input.button[type=submit] {
 
 .button {
     font-family: <?php print $fontlist ?>;
-	background-image: url(<?php echo DOL_URL_ROOT.'/theme/cameleo/img/button_bg.png' ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/button_bg.png',1); ?>);
 	background-position: bottom;
     border: 1px solid #ACBCBB;
     padding: 0px 2px 0px 2px;
@@ -144,7 +148,7 @@ input.button[type=submit] {
 .button:focus  {
     font-family: <?php print $fontlist ?>;
 	color: #222244;
-	background-image: url(<?php echo DOL_URL_ROOT.'/theme/cameleo/img/button_bg.png' ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/button_bg.png',1); ?>);
 	background-position: bottom;
     border: 1px solid #ACBCBB;
     padding: 0px 2px 0px 2px;
@@ -153,7 +157,7 @@ input.button[type=submit] {
 .buttonajax {
     font-family: <?php print $fontlist ?>;
 	border: 0px;
-	background-image: url(<?php echo DOL_URL_ROOT.'/theme/cameleo/img/button_bg.png' ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/button_bg.png',1); ?>);
 	background-position: bottom;
     padding: 0px 0px 0px 0px;
     margin: 0px 0px 0px 0px;
@@ -280,7 +284,7 @@ div.tmenu {
     font-weight: normal;
     height: 47px;
     background: #FFF;
-    background-image: url(<?php echo DOL_URL_ROOT.'/theme/cameleo/img/bg_tmenu.jpg' ?>);
+    background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/bg_tmenu.jpg',1); ?>);
     background-position: center bottom;
     border-bottom: 2px solid #A51B00;
     color: #000;
@@ -403,43 +407,43 @@ div.mainmenu {
 <?php if (empty($conf->browser->phone)) { ?>
 
 div.mainmenu.agenda {
-	background-image: url(<?php echo DOL_URL_ROOT.'/theme/cameleo/img/menus/agenda.png' ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/agenda.png',1); ?>);
 }
 
 div.mainmenu.cashdesk {
-	background-image: url(<?php echo DOL_URL_ROOT.'/theme/cameleo/img/menus/pointofsale.png' ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/pointofsale.png',1); ?>);
 }
 
 div.mainmenu.accountancy {
-	background-image: url(<?php echo DOL_URL_ROOT.'/theme/cameleo/img/menus/money.png' ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/money.png',1); ?>);
 }
 
 div.mainmenu.bank {
-    background-image: url(<?php echo DOL_URL_ROOT.'/theme/cameleo/img/menus/bank.png' ?>);
+    background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/bank.png',1); ?>);
 }
 
 div.mainmenu.companies {
-	background-image: url(<?php echo DOL_URL_ROOT.'/theme/cameleo/img/menus/company.png' ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/company.png',1); ?>);
 }
 
 div.mainmenu.commercial {
-	background-image: url(<?php echo DOL_URL_ROOT.'/theme/cameleo/img/menus/commercial.png' ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/commercial.png',1); ?>);
 }
 
 div.mainmenu.externalsite {
-	background-image: url(<?php echo dol_buildpath($path.'/theme/eldy/img/menus/externalsite.png',1) ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/theme/eldy/img/menus/externalsite.png',1); ?>);
 }
 
 div.mainmenu.ftp {
-    background-image: url(<?php echo DOL_URL_ROOT.'/theme/cameleo/img/menus/tools.png' ?>);
+    background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/tools.png',1); ?>);
 }
 
 div.mainmenu.ecm {
-	background-image: url(<?php echo DOL_URL_ROOT.'/theme/cameleo/img/menus/ecm.png' ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/ecm.png',1); ?>);
 }
 
 div.mainmenu.home{
-	background-image: url(<?php echo DOL_URL_ROOT.'/theme/cameleo/img/menus/home.png' ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/home.png',1); ?>);
 }
 
 div.mainmenu.gravatar {
@@ -449,28 +453,28 @@ div.mainmenu.geopipmaxmind {
 }
 
 div.mainmenu.members {
-	background-image: url(<?php echo DOL_URL_ROOT.'/theme/cameleo/img/menus/members.png' ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/members.png',1); ?>);
 }
 
 div.mainmenu.products {
-	background-image: url(<?php echo DOL_URL_ROOT.'/theme/cameleo/img/menus/products.png' ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/products.png',1); ?>);
 	margin-left: 10px;
 }
 
 div.mainmenu.project {
-	background-image: url(<?php echo DOL_URL_ROOT.'/theme/cameleo/img/menus/project.png' ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/project.png',1); ?>);
 }
 
 div.mainmenu.tools {
-	background-image: url(<?php echo DOL_URL_ROOT.'/theme/cameleo/img/menus/tools.png' ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/tools.png',1); ?>);
 }
 
 div.mainmenu.shop {
-	background-image: url(<?php echo DOL_URL_ROOT.'/theme/cameleo/img/menus/shop.png' ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/shop.png',1); ?>);
 }
 
 div.mainmenu.google {
-	background-image: url(<?php echo DOL_URL_ROOT.'/theme/cameleo/img/menus/globe.png' ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/globe.png',1); ?>);
 }
 
 <?php
@@ -511,7 +515,7 @@ foreach($mainmenuusedarray as $val)
 	// Img file not found
 	if (! $url && $generic <= 4)
 	{
-		$url=DOL_URL_ROOT."/theme/cameleo/img/menus/generic".$generic.".png";
+		$url=dol_buildpath($path.'/theme/'.$theme.'/img/menus/generic'.$generic.'.png',1);
 		$generic++;
 	}
 	if ($url)
@@ -667,7 +671,7 @@ div.blockvmenupair
 	border-spacing: 0px;
 	padding: 0px;
 	width: 100%;
-    background-image: url(<?php echo DOL_URL_ROOT.'/theme/cameleo/img/bg_leftCategorie2.jpg' ?>);
+    background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/bg_leftCategorie2.jpg',1); ?>);
     background-position: top right;
     background-repeat: no-repeat;
 
@@ -679,7 +683,7 @@ div.blockvmenuimpair
 	border-spacing: 0px;
 	padding: 0px;
 	width: 100%;
-    background-image: url(<?php echo DOL_URL_ROOT.'/theme/cameleo/img/bg_leftCategorie2.jpg' ?>);
+    background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/bg_leftCategorie2.jpg',1); ?>);
     background-position: top right;
     background-repeat: no-repeat;
 
@@ -732,7 +736,7 @@ div.blockvmenusearch
     margin: 3px 0px 15px 0px;
     padding: 25px 0px 2px 2px;
     width: 200px;
-    background-image: url(<?php echo DOL_URL_ROOT.'/theme/cameleo/img/bg_leftMenu.jpg' ?>);
+    background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/bg_leftMenu.jpg',1); ?>);
     background-position: top right;
     background-repeat: no-repeat;
 }
@@ -768,7 +772,7 @@ div.blockvmenubookmarks
 	border-spacing: 0px;
 	padding: 0px;
 	width: 100%;
-    background-image: url(<?php echo DOL_URL_ROOT.'/theme/cameleo/img/bg_leftCategorie.jpg' ?>);
+    background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/bg_leftCategorie.jpg',1); ?>);
     background-position: top left;
     background-repeat: no-repeat;
     margin-bottom: 15px;
@@ -874,7 +878,7 @@ td.photo {
 /* ============================================================================== */
 
 .toolbar {
-    background-image: url(<?php echo DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/tmenu2.png' ?>) !important;
+    background-image: url(<?php echo dol_buildpath($path.'/theme/'.$conf->theme.'/img/tmenu2.png',1); ?>) !important;
     background-repeat: repeat-x !important;
     border: 1px solid #BBB !important;
 }
@@ -1077,7 +1081,7 @@ div.tabs {
     text-align: left;
     vertical-align: bottom;
     width: 100%;
-    background-image: url(<?php echo DOL_URL_ROOT.'/theme/cameleo/img/bg_tmenu.jpg' ?>);
+    background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/bg_tmenu.jpg',1); ?>);
     height: 24px;
     border-bottom: 2px solid #A51B00;
     background-repeat: repeat-x;
@@ -1172,7 +1176,7 @@ div.tabBar {
     border-bottom: 1px solid #555555;
     border-left: 1px solid #D0D0D0;
     border-top: 1px solid #D8D8D8;
-    /*background: url(<?php echo DOL_URL_ROOT.'/theme/cameleo/img/tab_background.png' ?>) repeat-x;*/
+    /*background: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/tab_background.png',1); ?>) repeat-x;*/
     background: #FEF4AE; /* old browsers */
 }
 
@@ -1213,7 +1217,7 @@ span.tabspan {
 .butAction:link, .butAction:visited, .butAction:hover, .butAction:active, .butActionDelete, .butActionRefused, .butActionDelete:link, .butActionDelete:visited, .butActionDelete:hover, .butActionDelete:active {
 	font-family:"Trebuchet MS",Arial,Helvetica,sans-serif;
 	font-weight: bold;
-	/*background: url(<?php echo DOL_URL_ROOT.'/theme/bureau2crea/img/bg_btnBlue.jpg' ?>) repeat-x;*/
+	/*background: url(<?php echo dol_buildpath($path.'/theme/bureau2crea/img/bg_btnBlue.jpg',1); ?>) repeat-x;*/
         background: #A81E00;
         -moz-border-radius:8px;
         border-radius:8px;
@@ -1277,7 +1281,7 @@ span.butAction, span.butActionDelete {
 
 /*
 #undertopmenu {
-background-image: url("<?php echo DOL_URL_ROOT.'/theme/cameleo/img/gradient.gif' ?>");
+background-image: url("<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/gradient.gif',1); ?>");
 background-repeat: repeat-x;
 }
 */
@@ -1331,7 +1335,7 @@ border-left: 1px solid #000000;
 /* Main boxes */
 
 table.noborder {
-    background: #FFF url(<?php echo DOL_URL_ROOT.'/theme/cameleo/img/bg_liste_titremenu.jpg' ?>);
+    background: #FFF url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/bg_liste_titremenu.jpg',1); ?>);
     background-repeat: repeat-x;
     background-position: top right;
     vertical-align: text-top;
@@ -1374,7 +1378,7 @@ padding: 0px 0px !important;
 /* For lists */
 
 table.liste {
-background-image: url(<?php echo DOL_URL_ROOT.'/theme/cameleo/img/bg_liste_titremenu.jpg' ?>);
+background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/bg_liste_titremenu.jpg',1); ?>);
 background-repeat: repeat-x;
 background-position: top right;
     vertical-align: text-top;
@@ -1424,7 +1428,7 @@ th.liste_titre_sel, td.liste_titre_sel
 
 input.liste_titre {
 background: #FFF;
-/*background-image: url(<?php echo DOL_URL_ROOT.'/theme/cameleo/img/bg_centerBlock-title.jpg' ?>);
+/*background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/bg_centerBlock-title.jpg',1); ?>);
 background-repeat: no-repeat;
 background-position: top right;*/
 border: 0px;
@@ -1433,7 +1437,7 @@ border: 0px;
 tr.liste_total td {
 border-top: 1px solid #DDDDDD;
 background: #F0F0F0;
-/* background-image: url(<?php echo DOL_URL_ROOT.'/theme/login_background.png' ?>); */
+/* background-image: url(<?php echo dol_buildpath($path.'/theme/login_background.png',1); ?>); */
 background-repeat: repeat-x;
 color: #332266;
 font-weight: normal;
@@ -1823,7 +1827,7 @@ li.cal_event       { border: none; list-style-type: none; }
 /*  Ajax - Liste deroulante de l'autocompletion                                   */
 /* ============================================================================== */
 
-.ui-autocomplete-loading { background: white url(<?php echo DOL_URL_ROOT.'/theme/cameleo/img/working.gif' ?>) right center no-repeat; }
+.ui-autocomplete-loading { background: white url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/working.gif',1); ?>) right center no-repeat; }
 .ui-autocomplete {
 	       position:absolute;
 	       width:auto;
@@ -1853,12 +1857,12 @@ li.cal_event       { border: none; list-style-type: none; }
 /* ============================================================================== */
 
 .editkey_textarea, .editkey_ckeditor, .editkey_string, .editkey_email, .editkey_numeric, .editkey_select, .editkey_autocomplete {
-	background: url(<?php echo dol_buildpath($path.'/theme/cameleo/img/edit.png',1) ?>) right top no-repeat;
+	background: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/edit.png',1) ?>) right top no-repeat;
 	cursor: pointer;
 }
 
 .editkey_datepicker {
-	background: url(<?php echo dol_buildpath($path.'/theme/cameleo/img/calendar.png',1) ?>) right center no-repeat;
+	background: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/calendar.png',1) ?>) right center no-repeat;
 	cursor: pointer;
 }
 
@@ -2052,7 +2056,7 @@ span.cke_skin_kama { padding: 0 !important; }
 a.cke_dialog_ui_button
 {
     font-family: <?php print $fontlist ?> !important;
-	background-image: url(<?php echo DOL_URL_ROOT.'/theme/cameleo/img/button_bg.png' ?>) !important;
+	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/button_bg.png',1); ?>) !important;
 	background-position: bottom !important;
     border: 1px solid #ACBCBB !important;
 	padding: 0.1em 0.7em !important;
@@ -2204,7 +2208,7 @@ div.ecmjqft {
 /* Core Styles */
 .ecmjqft LI.directory { font-weight:normal; background: url(<?php echo dol_buildpath($path.'/theme/common/treemenu/folder2.png',1); ?>) left top no-repeat; }
 .ecmjqft LI.expanded { font-weight:normal; background: url(<?php echo dol_buildpath($path.'/theme/common/treemenu/folder2-expanded.png',1); ?>) left top no-repeat; }
-.ecmjqft LI.wait { font-weight:normal; background: url(<?php echo dol_buildpath('/theme/cameleo/img/working.gif',1); ?>) left top no-repeat; }
+.ecmjqft LI.wait { font-weight:normal; background: url(<?php echo dol_buildpath('/theme/'.$theme.'/img/working.gif',1); ?>) left top no-repeat; }
 
 
 
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index e0abb1e71fc..c3e3d58d5e6 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2004-2012	Laurent Destailleur		<eldy@users.sourceforge.net>
+/* Copyright (C) 2004-2013	Laurent Destailleur		<eldy@users.sourceforge.net>
  * Copyright (C) 2006		Rodolphe Quiedeville	<rodolphe@quiedeville.org>
  * Copyright (C) 2007-2012	Regis Houssin			<regis.houssin@capnetworks.com>
  * Copyright (C) 2011		Philippe Grand			<philippe.grand@atoo-net.com>
@@ -59,12 +59,14 @@ $langs->load("main",0,1);
 $right=($langs->trans("DIRECTION")=='rtl'?'left':'right');
 $left=($langs->trans("DIRECTION")=='rtl'?'right':'left');
 
-$path='';    // This value may be used in future for external module to overwrite theme
+$path='';    	// This value may be used in future for external module to overwrite theme
+$theme='eldy';	// Value of theme
+if (! empty($conf->global->MAIN_OVERWRITE_THEME_RES)) { $path='/'.$conf->global->MAIN_OVERWRITE_THEME_RES; $theme=$conf->global->MAIN_OVERWRITE_THEME_RES; }
 
 // Define image path files
 $fontlist='arial,tahoma,verdana,helvetica';    //$fontlist='Verdana,Helvetica,Arial,sans-serif';
-$img_head=dol_buildpath($path.'/theme/eldy/img/headbg2.jpg',1);
-$img_button=dol_buildpath($path.'/theme/eldy/img/button_bg.png',1);
+$img_head=dol_buildpath($path.'/theme/'.$theme.'/img/headbg2.jpg',1);
+$img_button=dol_buildpath($path.'/theme/'.$theme.'/img/button_bg.png',1);
 
 // Define reference colors
 // Example: Light grey: $colred=235;$colgreen=235;$colblue=235;
@@ -246,6 +248,8 @@ input.removedfile {
 textarea:disabled {
 	background:#ddd;
 }
+input[type=checkbox] { background-color: transparent; border: none; box-shadow: none; }
+input[type=image] { background-color: transparent; border: none; box-shadow: none; }
 .button {
     font-family: <?php print $fontlist ?>;
 	background-image: url(<?php echo $img_button ?>);
@@ -438,12 +442,12 @@ div.tmenudiv {
     /*    background-image: -webkit-linear-gradient(bottom, rgb(<?php echo $colorback1; ?>) 40%, rgb(<?php echo $colorback2; ?>) 60%, rgb(<?php echo $colorback1; ?>) 100%);*/
     /*    background-image: -ms-linear-gradient(bottom, rgb(<?php echo $colorback1; ?>) 75%, rgb(<?php echo $colorback2; ?>) 100%);*/
     /*    background-image: linear-gradient(bottom, rgb(<?php echo $colorback1; ?>) 75%, rgb(<?php echo $colorback2; ?>) 100%); */
-	background: url(<?php echo DOL_URL_ROOT.'/theme/eldy/img/nav-overlay3.png' ?>) 50% 0% repeat-x;
+	background: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/nav-overlay3.png',1); ?>) 50% 0% repeat-x;
     border-bottom: 1px solid rgb(<?php echo $colorback2; ?>);
 	box-shadow: 0 0 6px rgba(0, 0, 0, .4) !important;
 <?php } else { ?>
     border-bottom: 1px solid #DDDDDD;
-	background-image: url(<?php echo DOL_URL_ROOT.'/theme/eldy/img/tmenu2.jpg' ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/tmenu2.jpg',1); ?>);
     background-position:top;
     background-repeat:repeat-x;
 <?php } ?>
@@ -503,7 +507,7 @@ ul.tmenu {	/* t r b l */
     margin: 0px 0px 0px 0px;
 	list-style: none;
     height: <?php print $heightmenu; ?>px;
-    background: url(<?php echo DOL_URL_ROOT.'/theme/eldy/img/nav-overlay3.png' ?>) 0 0 repeat-x !important;
+    background: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/nav-overlay3.png',1); ?>) 0 0 repeat-x !important;
 }
 li.tmenu, li.tmenusel {
 	<?php print $minwidthtmenu?'min-width: '.$minwidthtmenu.'px;':''; ?>
@@ -524,7 +528,7 @@ li.tmenu:hover, li.tmenusel {
     /*    background-image: -webkit-linear-gradient(bottom, rgb(<?php echo $colorback1; ?>) 40%, rgb(<?php echo $colorback2; ?>) 60%, rgb(<?php echo $colorback1; ?>) 100%); */
     /*    background-image: -ms-linear-gradient(bottom, rgb(<?php echo $colorback1; ?>) 75%, rgb(<?php echo $colorback2; ?>) 100%);*/
     /*    background-image: linear-gradient(bottom, rgb(<?php echo $colorback1; ?>) 75%, rgb(<?php echo $colorback2; ?>) 100%); */
-	background: url(<?php echo DOL_URL_ROOT.'/theme/eldy/img/nav-overlay3.png' ?>) 50% 0 repeat-x;
+	background: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/nav-overlay3.png',1); ?>) 50% 0 repeat-x;
 <?php } ?>
 }
 div.tmenuleft
@@ -532,7 +536,7 @@ div.tmenuleft
 	width: 5px;
 	float: <?php print $left; ?>;
     height: <?php print $heightmenu+4; ?>px;
-	background: url(<?php echo DOL_URL_ROOT.'/theme/eldy/img/menutab-r.png' ?>) 0 0 no-repeat;
+	background: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menutab-r.png',1); ?>) 0 0 no-repeat;
 	margin-top: -4px;
 }
 div.tmenucenter
@@ -562,54 +566,54 @@ div.mainmenu {
 <?php if (empty($conf->browser->phone)) { ?>
 
 div.mainmenu.home{
-	background-image: url(<?php echo dol_buildpath($path.'/theme/eldy/img/menus/home.png',1) ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/home.png',1) ?>);
 	background-position-x: middle;
 }
 
 div.mainmenu.accountancy {
-	background-image: url(<?php echo dol_buildpath($path.'/theme/eldy/img/menus/money.png',1) ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/money.png',1) ?>);
 }
 
 div.mainmenu.agenda {
-	background-image: url(<?php echo dol_buildpath($path.'/theme/eldy/img/menus/agenda.png',1) ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/agenda.png',1) ?>);
 }
 
 div.mainmenu.bank {
-    background-image: url(<?php echo dol_buildpath($path.'/theme/eldy/img/menus/bank.png',1) ?>);
+    background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/bank.png',1) ?>);
 }
 
 div.mainmenu.bookmark {
 }
 
 div.mainmenu.cashdesk {
-	background-image: url(<?php echo dol_buildpath($path.'/theme/eldy/img/menus/pointofsale.png',1) ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/pointofsale.png',1) ?>);
 }
 
 div.mainmenu.click2dial {
 }
 
 div.mainmenu.companies {
-	background-image: url(<?php echo dol_buildpath($path.'/theme/eldy/img/menus/members.png',1) ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/members.png',1) ?>);
 }
 
 div.mainmenu.contacts {
-	background-image: url(<?php echo dol_buildpath($path.'/theme/eldy/img/menus/stethoscope.png',1) ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/stethoscope.png',1) ?>);
 }
 
 div.mainmenu.commercial {
-	background-image: url(<?php echo dol_buildpath($path.'/theme/eldy/img/menus/commercial.png',1) ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/commercial.png',1) ?>);
 }
 
 div.mainmenu.ecm {
-	background-image: url(<?php echo dol_buildpath($path.'/theme/eldy/img/menus/ecm.png',1) ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/ecm.png',1) ?>);
 }
 
 div.mainmenu.externalsite {
-	background-image: url(<?php echo dol_buildpath($path.'/theme/eldy/img/menus/externalsite.png',1) ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/externalsite.png',1) ?>);
 }
 
 div.mainmenu.ftp {
-    background-image: url(<?php echo dol_buildpath($path.'/theme/eldy/img/menus/tools.png',1) ?>);
+    background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/tools.png',1) ?>);
 }
 
 div.mainmenu.gravatar {
@@ -619,38 +623,38 @@ div.mainmenu.geopipmaxmind {
 }
 
 div.mainmenu.holiday {
-	background-image: url(<?php echo dol_buildpath($path.'/theme/eldy/img/menus/holiday.png',1) ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/holiday.png',1) ?>);
 }
 
 div.mainmenu.members {
-	background-image: url(<?php echo dol_buildpath($path.'/theme/eldy/img/menus/members.png',1) ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/members.png',1) ?>);
 }
 
 div.mainmenu.paypal {
 }
 
 div.mainmenu.products {
-	background-image: url(<?php echo dol_buildpath($path.'/theme/eldy/img/menus/products.png',1) ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/products.png',1) ?>);
 	margin-left: 10px;
 }
 
 div.mainmenu.project {
-	background-image: url(<?php echo dol_buildpath($path.'/theme/eldy/img/menus/project.png',1) ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/project.png',1) ?>);
 }
 
 div.mainmenu.tools {
-	background-image: url(<?php echo dol_buildpath($path.'/theme/eldy/img/menus/tools.png',1) ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/tools.png',1) ?>);
 }
 
 div.mainmenu.shop {
-	background-image: url(<?php echo dol_buildpath($path.'/theme/eldy/img/menus/shop.png',1) ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/shop.png',1) ?>);
 }
 
 div.mainmenu.webservices {
 }
 
 div.mainmenu.google {
-	background-image: url(<?php echo dol_buildpath($path.'/theme/eldy/img/menus/globe.png',1) ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/globe.png',1) ?>);
 }
 
 
@@ -693,7 +697,7 @@ foreach($mainmenuusedarray as $val)
 	// Img file not found
 	if (! $found)
 	{
-		$url=dol_buildpath($path.'/theme/eldy/img/menus/generic'.$generic.".png",1);
+		$url=dol_buildpath($path.'/theme/'.$theme.'/img/menus/generic'.$generic.".png",1);
 		$found=1;
 		if ($generic < 4) $generic++;
 		print "/* A mainmenu entry but img file ".$val.".png not found, so we use a generic one */\n";
@@ -867,7 +871,7 @@ div.blockvmenupair, div.blockvmenuimpair, div.blockvmenubookmarks
     background-image: -ms-linear-gradient(bottom, rgb(<?php echo $colorbacktab2; ?>) 0px, rgb(<?php echo $colorbacktab1; ?>) 8px);
     background-image: linear-gradient(bottom, rgb(<?php echo $colorbacktab2; ?>) 0px, rgb(<?php echo $colorbacktab1; ?>) 8px);
 <?php } else { ?>
-	background-image: url(<?php echo DOL_URL_ROOT.'/theme/eldy/img/tmenu.jpg' ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/tmenu.jpg',1); ?>);
     background-position:top;
     background-repeat:repeat-x;
 <?php } ?>
@@ -1020,7 +1024,7 @@ td.photo {
     background-image: -ms-linear-gradient(bottom, rgb(<?php echo '240,240,240'; ?>) 15%, rgb(<?php echo '255,255,255'; ?>) 100%) !important;
     background-image: linear-gradient(bottom, rgb(<?php echo '240,240,240'; ?>) 15%, rgb(<?php echo '255,255,255'; ?>) 100%) !important;
 <?php } else { ?>
-    background-image: url(<?php echo DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/tmenu2.jpg' ?>) !important;
+    background-image: url(<?php echo dol_buildpath($path.'/theme/'.$conf->theme.'/img/tmenu2.jpg',1); ?>) !important;
     background-repeat: repeat-x !important;
 <?php } ?>
     border: 1px solid #CCC !important;
@@ -1275,7 +1279,7 @@ div.tabBar {
 	background-image: -ms-linear-gradient(bottom, rgb(<?php echo $colorbacktabcard1; ?>) 25%, rgb(<?php echo $colorbacktabcard2; ?>) 100%);
 	background-image: linear-gradient(bottom, rgb(<?php echo $colorbacktabcard1; ?>) 25%, rgb(<?php echo $colorbacktabcard2; ?>) 100%);
 <?php } else { ?>
-	background: #dee7ec url(<?php echo DOL_URL_ROOT.'/theme/eldy/img/tab_background.png' ?>) repeat-x;
+	background: #dee7ec url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/tab_background.png',1); ?>) repeat-x;
 <?php } ?>
     -moz-box-shadow: 4px 4px 4px #CCC;
     -webkit-box-shadow: 4px 4px 4px #CCC;
@@ -1440,7 +1444,7 @@ span.butAction, span.butActionDelete {
 }
 
 #undertopmenu {
-	/*	background-image: url("<?php echo dol_buildpath($path.'/theme/eldy/img/gradient.gif',1) ?>"); */
+	/*	background-image: url("<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/gradient.gif',1) ?>"); */
 	background-repeat: repeat-x;
 	margin-top: 0px;
 }
@@ -1603,7 +1607,7 @@ div.liste_titre, tr.liste_titre, tr.liste_titre_sel
 	background-image: linear-gradient(bottom, rgb(<?php echo $colorbacktitle1; ?>) 15%, rgb(<?php echo $colorbacktitle2; ?>) 100%);
 <?php } else { ?>
 	background: #7699A9;
-	background-image: url(<?php echo DOL_URL_ROOT.'/theme/eldy/img/liste_titre2.png' ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/liste_titre2.png',1); ?>);
 <?php } ?>
     color: #<?php echo $colortextmain; ?>;
     font-family: <?php print $fontlist ?>;
@@ -1740,7 +1744,7 @@ tr.box_titre {
     background-image: -ms-linear-gradient(bottom, rgb(<?php echo $colorbacktitle1; ?>) 15%, rgb(<?php echo $colorbacktitle2; ?>) 100%);
     background-image: linear-gradient(bottom, rgb(<?php echo $colorbacktitle1; ?>) 15%, rgb(<?php echo $colorbacktitle2; ?>) 100%);
 <?php } else { ?>
-	background-image: url(<?php echo DOL_URL_ROOT.'/theme/eldy/img/liste_titre2.png' ?>);
+	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/liste_titre2.png',1); ?>);
 <?php } ?>
     background-repeat: repeat-x;
     color: #<?php echo $colortextmain; ?>;
@@ -1866,7 +1870,7 @@ border: 0px;
 
 .logo_setup
 {
-	content:url(<?php echo dol_buildpath($path.'/theme/eldy/img/logo_setup.svg',1) ?>);
+	content:url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/logo_setup.svg',1) ?>);
 }
 
 div.titre {
@@ -2103,7 +2107,7 @@ li.cal_event       { border: none; list-style-type: none; }
 /*  Ajax - Liste deroulante de l'autocompletion                                   */
 /* ============================================================================== */
 
-.ui-autocomplete-loading { background: white url(<?php echo dol_buildpath($path.'/theme/eldy/img/working.gif',1) ?>) right center no-repeat; }
+.ui-autocomplete-loading { background: white url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/working.gif',1) ?>) right center no-repeat; }
 .ui-autocomplete {
 	       position:absolute;
 	       width:auto;
@@ -2133,12 +2137,12 @@ li.cal_event       { border: none; list-style-type: none; }
 /* ============================================================================== */
 
 .editkey_textarea, .editkey_ckeditor, .editkey_string, .editkey_email, .editkey_numeric, .editkey_select, .editkey_autocomplete {
-	background: url(<?php echo dol_buildpath($path.'/theme/eldy/img/edit.png',1) ?>) right top no-repeat;
+	background: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/edit.png',1) ?>) right top no-repeat;
 	cursor: pointer;
 }
 
 .editkey_datepicker {
-	background: url(<?php echo dol_buildpath($path.'/theme/eldy/img/calendar.png',1) ?>) right center no-repeat;
+	background: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/calendar.png',1) ?>) right center no-repeat;
 	cursor: pointer;
 }
 
@@ -2458,7 +2462,7 @@ div.ecmjqft {
 /* Core Styles */
 .ecmjqft LI.directory { font-weight:normal; background: url(<?php echo dol_buildpath($path.'/theme/common/treemenu/folder2.png',1); ?>) left top no-repeat; }
 .ecmjqft LI.expanded { font-weight:normal; background: url(<?php echo dol_buildpath($path.'/theme/common/treemenu/folder2-expanded.png',1); ?>) left top no-repeat; }
-.ecmjqft LI.wait { font-weight:normal; background: url(<?php echo dol_buildpath('/theme/eldy/img/working.gif',1); ?>) left top no-repeat; }
+.ecmjqft LI.wait { font-weight:normal; background: url(<?php echo dol_buildpath('/theme/'.$theme.'/img/working.gif',1); ?>) left top no-repeat; }
 
 
 /* ============================================================================== */
diff --git a/scripts/user/sync_groups_ldap2dolibarr.php b/scripts/user/sync_groups_ldap2dolibarr.php
index c19999c755f..fd92086e77f 100755
--- a/scripts/user/sync_groups_ldap2dolibarr.php
+++ b/scripts/user/sync_groups_ldap2dolibarr.php
@@ -174,10 +174,11 @@ if ($result >= 0)
 			$userList = array();
 			$userIdList = array();
 			foreach($ldapgroup[$conf->global->LDAP_GROUP_FIELD_GROUPMEMBERS] as $key => $userdn) {
-				if($key == 'count') continue;
+				if($key === 'count') continue;
 				if(empty($userList[$userdn])) { // Récupération de l'utilisateur
 					$userFilter = explode(',', $userdn);
 					$userKey = $ldap->getAttributeValues('('.$userFilter[0].')', $conf->global->LDAP_KEY_USERS);
+					if(!is_array($userKey)) continue;
 					
 					$fuser = new User($db);
 					
@@ -187,7 +188,7 @@ if ($result >= 0)
 						$fuser->fetch('',$userKey[0]); // Chargement du user concerné par le login
 					}
 					
-					$userList[$userdn] = &$fuser;
+					$userList[$userdn] = $fuser;
 				} else {
 					$fuser = &$userList[$userdn];
 				}
@@ -195,12 +196,18 @@ if ($result >= 0)
 				$userIdList[$userdn] = $fuser->id;
 				
 				// Ajout de l'utilisateur dans le groupe
-				if(!in_array($fuser->id, array_keys($group->members))) $fuser->SetInGroup($group->id, $group->entity);
+				if(!in_array($fuser->id, array_keys($group->members))) {
+					$fuser->SetInGroup($group->id, $group->entity);
+					echo $fuser->login.' added'."\n";
+				}
 			}
 			
 			// 2 - Suppression des utilisateurs du groupe Dolibarr qui ne sont plus dans le groupe LDAP
-			foreach ($group->members as $user_id => $infos) {
-				if(!in_array($user_id, $userIdList)) $fuser->RemoveFromGroup($group->id, $group->entity);
+			foreach ($group->members as $guser) {
+				if(!in_array($guser->id, $userIdList)) {
+					$guser->RemoveFromGroup($group->id, $group->entity);
+					echo $guser->login.' removed'."\n";
+				}
 			}
 		}
 
diff --git a/test/phpunit/AllTests.php b/test/phpunit/AllTests.php
index c6f54d70428..cb79a262feb 100644
--- a/test/phpunit/AllTests.php
+++ b/test/phpunit/AllTests.php
@@ -141,8 +141,17 @@ class AllTests
         require_once dirname(__FILE__).'/CategorieTest.php';
         $suite->addTestSuite('CategorieTest');
 
-        require_once dirname(__FILE__).'/WebservicesTest.php';
-        $suite->addTestSuite('WebservicesTest');
+        require_once dirname(__FILE__).'/WebservicesInvoices.php';
+        $suite->addTestSuite('WebservicesInvoices');
+        require_once dirname(__FILE__).'/WebservicesOrders.php';
+        $suite->addTestSuite('WebservicesOrders');
+        require_once dirname(__FILE__).'/WebservicesOther.php';
+        $suite->addTestSuite('WebservicesOther');
+        require_once dirname(__FILE__).'/WebservicesThirparty.php';
+        $suite->addTestSuite('WebservicesThirdparty');
+        require_once dirname(__FILE__).'/WebservicesUserTest.php';
+        $suite->addTestSuite('WebservicesUserTest');
+
         require_once dirname(__FILE__).'/ExportTest.php';
         $suite->addTestSuite('ExportTest');
         require_once dirname(__FILE__).'/ImportTest.php';
diff --git a/test/phpunit/WebservicesTest.php b/test/phpunit/WebservicesInvoicesTest.php
similarity index 62%
rename from test/phpunit/WebservicesTest.php
rename to test/phpunit/WebservicesInvoicesTest.php
index bdcc1f2eb85..abf91d044f5 100755
--- a/test/phpunit/WebservicesTest.php
+++ b/test/phpunit/WebservicesInvoicesTest.php
@@ -47,7 +47,7 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class WebservicesTest extends PHPUnit_Framework_TestCase
+class WebservicesInvoicesTest extends PHPUnit_Framework_TestCase
 {
 	protected $savconf;
 	protected $savuser;
@@ -116,67 +116,64 @@ class WebservicesTest extends PHPUnit_Framework_TestCase
     	print __METHOD__."\n";
     }
 
-    /**
-     * testWSVersion
-     *
-     * @return int
-     */
-    public function testWSGetVersions()
-    {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
-
-        $WS_DOL_URL = DOL_MAIN_URL_ROOT.'/webservices/server_other.php';
-        //$WS_DOL_URL = 'http://localhost:8080/';   // If not a page, should end with /
-        $WS_METHOD  = 'getVersions';
-        $ns='http://www.dolibarr.org/ns/';
-
-
-        // Set the WebService URL
-        print __METHOD__."Create nusoap_client for URL=".$WS_DOL_URL."\n";
-        $soapclient = new nusoap_client($WS_DOL_URL);
-        if ($soapclient)
-        {
-            $soapclient->soap_defencoding='UTF-8';
-            $soapclient->decodeUTF8(false);
-        }
-
-        // 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
-        if ($WS_METHOD)
-        {
-            $parameters = array('authentication'=>$authentication);
-            print __METHOD__."Call method ".$WS_METHOD."\n";
-            $result = $soapclient->call($WS_METHOD,$parameters,$ns,'');
-            if (! $result)
-            {
-                //var_dump($soapclient);
-                //print_r($soapclient);
-                print $soapclient->error_str;
-                print "<br>\n\n";
-                print $soapclient->request;
-                print "<br>\n\n";
-                print $soapclient->response;
-                exit;
-            }
-        }
-
-        print __METHOD__." result=".$result."\n";
-        $this->assertEquals('OK',$result['result']['result_code']);
-
-		return $result;
+
+    /**
+     * testWSInvoices_xxx
+     *
+     * @return int
+     */
+    public function testWSInvoices_xxx()
+    {
+    	global $conf,$user,$langs,$db;
+    	$conf=$this->savconf;
+    	$user=$this->savuser;
+    	$langs=$this->savlangs;
+    	$db=$this->savdb;
+
+    	$WS_DOL_URL = DOL_MAIN_URL_ROOT.'/webservices/server_invoice.php';
+    	$WS_METHOD  = 'xxx';
+    	$ns='http://www.dolibarr.org/ns/';
+
+    	// Set the WebService URL
+    	print __METHOD__."Create nusoap_client for URL=".$WS_DOL_URL."\n";
+    	$soapclient = new nusoap_client($WS_DOL_URL);
+    	if ($soapclient)
+    	{
+    		$soapclient->soap_defencoding='UTF-8';
+    		$soapclient->decodeUTF8(false);
+    	}
+
+    	// 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
+    	if ($WS_METHOD)
+    	{
+    		$parameters = array('authentication'=>$authentication);
+    		print __METHOD__."Call method ".$WS_METHOD."\n";
+    		$result = $soapclient->call($WS_METHOD,$parameters,$ns,'');
+    		if (! $result)
+    		{
+    			//var_dump($soapclient);
+    			print $soapclient->error_str;
+    			print "<br>\n\n";
+    			print $soapclient->request;
+    			print "<br>\n\n";
+    			print $soapclient->response;
+    			exit;
+    		}
+    	}
+
+    	print __METHOD__." result=".$result."\n";
+    	//$this->assertEquals('OK',$result['result']['result_code']);
+
+    	return $result;
     }
 
-
 }
 ?>
\ No newline at end of file
diff --git a/test/phpunit/WebservicesOrdersTest.php b/test/phpunit/WebservicesOrdersTest.php
new file mode 100755
index 00000000000..2df89cce462
--- /dev/null
+++ b/test/phpunit/WebservicesOrdersTest.php
@@ -0,0 +1,357 @@
+<?php
+/* Copyright (C) 2010 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/WebservicesTest.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/date.lib.php';
+require_once(NUSOAP_PATH.'/nusoap.php');        // Include SOAP
+
+
+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 WebservicesOrdersTest extends PHPUnit_Framework_TestCase
+{
+	protected $savconf;
+	protected $savuser;
+	protected $savlangs;
+	protected $savdb;
+
+	/**
+	 * Constructor
+	 * We save global variables into local variables
+	 *
+	 * @return DateLibTest
+	 */
+	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";
+    }
+
+
+    /**
+     * testWSOrder_xxx
+     *
+     * @return int
+     */
+    public function testWSOrder_xxx()
+    {
+    	global $conf,$user,$langs,$db;
+    	$conf=$this->savconf;
+    	$user=$this->savuser;
+    	$langs=$this->savlangs;
+    	$db=$this->savdb;
+
+    	$WS_DOL_URL = DOL_MAIN_URL_ROOT.'/webservices/server_order.php';
+    	$WS_METHOD  = 'xxx';
+    	$ns='http://www.dolibarr.org/ns/';
+
+    	// Set the WebService URL
+    	print __METHOD__."Create nusoap_client for URL=".$WS_DOL_URL."\n";
+    	$soapclient = new nusoap_client($WS_DOL_URL);
+    	if ($soapclient)
+    	{
+    		$soapclient->soap_defencoding='UTF-8';
+    		$soapclient->decodeUTF8(false);
+    	}
+
+    	// 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
+    	if ($WS_METHOD)
+    	{
+    		$parameters = array('authentication'=>$authentication);
+    		print __METHOD__."Call method ".$WS_METHOD."\n";
+    		$result = $soapclient->call($WS_METHOD,$parameters,$ns,'');
+    		if (! $result)
+    		{
+    			//var_dump($soapclient);
+    			print $soapclient->error_str;
+    			print "<br>\n\n";
+    			print $soapclient->request;
+    			print "<br>\n\n";
+    			print $soapclient->response;
+    			exit;
+    		}
+    	}
+
+    	print __METHOD__." result=".$result."\n";
+    	//$this->assertEquals('OK',$result['result']['result_code']);
+
+    	return $result;
+    }
+
+
+
+    /**
+     * testWSOther_GetVersions
+     *
+     * @return int
+     */
+    public function testWSOther_GetVersions()
+    {
+    	global $conf,$user,$langs,$db;
+    	$conf=$this->savconf;
+    	$user=$this->savuser;
+    	$langs=$this->savlangs;
+    	$db=$this->savdb;
+
+    	$WS_DOL_URL = DOL_MAIN_URL_ROOT.'/webservices/server_other.php';
+    	$WS_METHOD  = 'getVersions';
+    	$ns='http://www.dolibarr.org/ns/';
+
+    	// Set the WebService URL
+    	print __METHOD__."Create nusoap_client for URL=".$WS_DOL_URL."\n";
+    	$soapclient = new nusoap_client($WS_DOL_URL);
+    	if ($soapclient)
+    	{
+    		$soapclient->soap_defencoding='UTF-8';
+    		$soapclient->decodeUTF8(false);
+    	}
+
+    	// 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
+    	if ($WS_METHOD)
+    	{
+    		$parameters = array('authentication'=>$authentication);
+    		print __METHOD__."Call method ".$WS_METHOD."\n";
+    		$result = $soapclient->call($WS_METHOD,$parameters,$ns,'');
+    		if (! $result)
+    		{
+    			//var_dump($soapclient);
+    			print $soapclient->error_str;
+    			print "<br>\n\n";
+    			print $soapclient->request;
+    			print "<br>\n\n";
+    			print $soapclient->response;
+    			exit;
+    		}
+    	}
+
+    	print __METHOD__." result=".$result."\n";
+    	$this->assertEquals('OK',$result['result']['result_code']);
+
+    	return $result;
+    }
+
+
+    /**
+     * testWSThirdparty
+     *
+     * @return int
+     */
+    public function testWSThirdparty()
+    {
+    	global $conf,$user,$langs,$db;
+    	$conf=$this->savconf;
+    	$user=$this->savuser;
+    	$langs=$this->savlangs;
+    	$db=$this->savdb;
+
+    	$WS_DOL_URL = DOL_MAIN_URL_ROOT.'/webservices/server_thirdparty.php';
+    	$WS_METHOD  = 'xxx';
+    	$ns='http://www.dolibarr.org/ns/';
+
+    	// Set the WebService URL
+    	print __METHOD__."Create nusoap_client for URL=".$WS_DOL_URL."\n";
+    	$soapclient = new nusoap_client($WS_DOL_URL);
+    	if ($soapclient)
+    	{
+    		$soapclient->soap_defencoding='UTF-8';
+    		$soapclient->decodeUTF8(false);
+    	}
+
+    	// 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
+    	if ($WS_METHOD)
+    	{
+    		$parameters = array('authentication'=>$authentication);
+    		print __METHOD__."Call method ".$WS_METHOD."\n";
+    		$result = $soapclient->call($WS_METHOD,$parameters,$ns,'');
+    		if (! $result)
+    		{
+    			//var_dump($soapclient);
+    			print $soapclient->error_str;
+    			print "<br>\n\n";
+    			print $soapclient->request;
+    			print "<br>\n\n";
+    			print $soapclient->response;
+    			exit;
+    		}
+    	}
+
+    	print __METHOD__." result=".$result."\n";
+    	//$this->assertEquals('OK',$result['result']['result_code']);
+
+    	return $result;
+    }
+
+
+    /**
+     * testWSUser
+     *
+     * @return int
+     */
+    public function testWSUser()
+    {
+    	global $conf,$user,$langs,$db;
+    	$conf=$this->savconf;
+    	$user=$this->savuser;
+    	$langs=$this->savlangs;
+    	$db=$this->savdb;
+
+    	$WS_DOL_URL = DOL_MAIN_URL_ROOT.'/webservices/server_user.php';
+    	$WS_METHOD  = 'xxx';
+    	$ns='http://www.dolibarr.org/ns/';
+
+    	// Set the WebService URL
+    	print __METHOD__."Create nusoap_client for URL=".$WS_DOL_URL."\n";
+    	$soapclient = new nusoap_client($WS_DOL_URL);
+    	if ($soapclient)
+    	{
+    		$soapclient->soap_defencoding='UTF-8';
+    		$soapclient->decodeUTF8(false);
+    	}
+
+    	// 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
+    	if ($WS_METHOD)
+    	{
+    		$parameters = array('authentication'=>$authentication);
+    		print __METHOD__."Call method ".$WS_METHOD."\n";
+    		$result = $soapclient->call($WS_METHOD,$parameters,$ns,'');
+    		if (! $result)
+    		{
+    			//var_dump($soapclient);
+    			print $soapclient->error_str;
+    			print "<br>\n\n";
+    			print $soapclient->request;
+    			print "<br>\n\n";
+    			print $soapclient->response;
+    			exit;
+    		}
+    	}
+
+    	print __METHOD__." result=".$result."\n";
+    	//$this->assertEquals('OK',$result['result']['result_code']);
+
+    	return $result;
+    }
+
+}
+?>
\ No newline at end of file
diff --git a/test/phpunit/WebservicesOtherTest.php b/test/phpunit/WebservicesOtherTest.php
new file mode 100755
index 00000000000..56812985008
--- /dev/null
+++ b/test/phpunit/WebservicesOtherTest.php
@@ -0,0 +1,179 @@
+<?php
+/* Copyright (C) 2010 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/WebservicesTest.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/date.lib.php';
+require_once(NUSOAP_PATH.'/nusoap.php');        // Include SOAP
+
+
+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 WebservicesOtherTest extends PHPUnit_Framework_TestCase
+{
+	protected $savconf;
+	protected $savuser;
+	protected $savlangs;
+	protected $savdb;
+
+	/**
+	 * Constructor
+	 * We save global variables into local variables
+	 *
+	 * @return DateLibTest
+	 */
+	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";
+    }
+
+
+    /**
+     * testWSOther_GetVersions
+     *
+     * @return int
+     */
+    public function testWSOther_GetVersions()
+    {
+    	global $conf,$user,$langs,$db;
+    	$conf=$this->savconf;
+    	$user=$this->savuser;
+    	$langs=$this->savlangs;
+    	$db=$this->savdb;
+
+    	$WS_DOL_URL = DOL_MAIN_URL_ROOT.'/webservices/server_other.php';
+    	$WS_METHOD  = 'getVersions';
+    	$ns='http://www.dolibarr.org/ns/';
+
+    	// Set the WebService URL
+    	print __METHOD__."Create nusoap_client for URL=".$WS_DOL_URL."\n";
+    	$soapclient = new nusoap_client($WS_DOL_URL);
+    	if ($soapclient)
+    	{
+    		$soapclient->soap_defencoding='UTF-8';
+    		$soapclient->decodeUTF8(false);
+    	}
+
+    	// 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
+    	if ($WS_METHOD)
+    	{
+    		$parameters = array('authentication'=>$authentication);
+    		print __METHOD__."Call method ".$WS_METHOD."\n";
+    		$result = $soapclient->call($WS_METHOD,$parameters,$ns,'');
+    		if (! $result)
+    		{
+    			//var_dump($soapclient);
+    			print $soapclient->error_str;
+    			print "<br>\n\n";
+    			print $soapclient->request;
+    			print "<br>\n\n";
+    			print $soapclient->response;
+    			exit;
+    		}
+    	}
+
+    	print __METHOD__." result=".$result."\n";
+    	$this->assertEquals('OK',$result['result']['result_code']);
+
+    	return $result;
+    }
+
+}
+?>
\ No newline at end of file
diff --git a/test/phpunit/WebservicesThirdpartyTest.php b/test/phpunit/WebservicesThirdpartyTest.php
new file mode 100755
index 00000000000..35c248f013c
--- /dev/null
+++ b/test/phpunit/WebservicesThirdpartyTest.php
@@ -0,0 +1,179 @@
+<?php
+/* Copyright (C) 2010 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/WebservicesTest.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/date.lib.php';
+require_once(NUSOAP_PATH.'/nusoap.php');        // Include SOAP
+
+
+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 WebservicesThirdpartyTest extends PHPUnit_Framework_TestCase
+{
+	protected $savconf;
+	protected $savuser;
+	protected $savlangs;
+	protected $savdb;
+
+	/**
+	 * Constructor
+	 * We save global variables into local variables
+	 *
+	 * @return DateLibTest
+	 */
+	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";
+    }
+
+
+    /**
+     * testWSThirdparty_xxx
+     *
+     * @return int
+     */
+    public function testWSThirdparty_xxx()
+    {
+    	global $conf,$user,$langs,$db;
+    	$conf=$this->savconf;
+    	$user=$this->savuser;
+    	$langs=$this->savlangs;
+    	$db=$this->savdb;
+
+    	$WS_DOL_URL = DOL_MAIN_URL_ROOT.'/webservices/server_thirdparty.php';
+    	$WS_METHOD  = 'xxx';
+    	$ns='http://www.dolibarr.org/ns/';
+
+    	// Set the WebService URL
+    	print __METHOD__."Create nusoap_client for URL=".$WS_DOL_URL."\n";
+    	$soapclient = new nusoap_client($WS_DOL_URL);
+    	if ($soapclient)
+    	{
+    		$soapclient->soap_defencoding='UTF-8';
+    		$soapclient->decodeUTF8(false);
+    	}
+
+    	// 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
+    	if ($WS_METHOD)
+    	{
+    		$parameters = array('authentication'=>$authentication);
+    		print __METHOD__."Call method ".$WS_METHOD."\n";
+    		$result = $soapclient->call($WS_METHOD,$parameters,$ns,'');
+    		if (! $result)
+    		{
+    			//var_dump($soapclient);
+    			print $soapclient->error_str;
+    			print "<br>\n\n";
+    			print $soapclient->request;
+    			print "<br>\n\n";
+    			print $soapclient->response;
+    			exit;
+    		}
+    	}
+
+    	print __METHOD__." result=".$result."\n";
+    	//$this->assertEquals('OK',$result['result']['result_code']);
+
+    	return $result;
+    }
+
+}
+?>
\ No newline at end of file
diff --git a/test/phpunit/WebservicesUserTest.php b/test/phpunit/WebservicesUserTest.php
new file mode 100755
index 00000000000..c2157c0b7de
--- /dev/null
+++ b/test/phpunit/WebservicesUserTest.php
@@ -0,0 +1,179 @@
+<?php
+/* Copyright (C) 2010 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/WebservicesTest.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/date.lib.php';
+require_once(NUSOAP_PATH.'/nusoap.php');        // Include SOAP
+
+
+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 WebservicesUserTest extends PHPUnit_Framework_TestCase
+{
+	protected $savconf;
+	protected $savuser;
+	protected $savlangs;
+	protected $savdb;
+
+	/**
+	 * Constructor
+	 * We save global variables into local variables
+	 *
+	 * @return DateLibTest
+	 */
+	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";
+    }
+
+
+    /**
+     * testWSUser_xxx
+     *
+     * @return int
+     */
+    public function testWSUser_xxx()
+    {
+    	global $conf,$user,$langs,$db;
+    	$conf=$this->savconf;
+    	$user=$this->savuser;
+    	$langs=$this->savlangs;
+    	$db=$this->savdb;
+
+    	$WS_DOL_URL = DOL_MAIN_URL_ROOT.'/webservices/server_other.php';
+    	$WS_METHOD  = 'xxx';
+    	$ns='http://www.dolibarr.org/ns/';
+
+    	// Set the WebService URL
+    	print __METHOD__."Create nusoap_client for URL=".$WS_DOL_URL."\n";
+    	$soapclient = new nusoap_client($WS_DOL_URL);
+    	if ($soapclient)
+    	{
+    		$soapclient->soap_defencoding='UTF-8';
+    		$soapclient->decodeUTF8(false);
+    	}
+
+    	// 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
+    	if ($WS_METHOD)
+    	{
+    		$parameters = array('authentication'=>$authentication);
+    		print __METHOD__."Call method ".$WS_METHOD."\n";
+    		$result = $soapclient->call($WS_METHOD,$parameters,$ns,'');
+    		if (! $result)
+    		{
+    			//var_dump($soapclient);
+    			print $soapclient->error_str;
+    			print "<br>\n\n";
+    			print $soapclient->request;
+    			print "<br>\n\n";
+    			print $soapclient->response;
+    			exit;
+    		}
+    	}
+
+    	print __METHOD__." result=".$result."\n";
+    	//$this->assertEquals('OK',$result['result']['result_code']);
+
+    	return $result;
+    }
+
+}
+?>
\ No newline at end of file